Skip to content

Commit d57db28

Browse files
committed
remove special JRE/JDK Downloader Ant Task because no longer needed
1 parent cb37d05 commit d57db28

File tree

7 files changed

+1
-489
lines changed

7 files changed

+1
-489
lines changed

build/build.xml

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -145,17 +145,7 @@
145145
</target>
146146
-->
147147

148-
<target name="downloader-setup">
149-
<!-- make sure we're built -->
150-
<subant buildpath="jre" target="dist-no-test" />
151-
152-
<!-- define our special JRE downloader task -->
153-
<taskdef name="downloader"
154-
classname="Downloader"
155-
classpath="jre/downloader.jar" />
156-
</target>
157-
158-
<target name="jdk-download" depends="jdk-check, downloader-setup"
148+
<target name="jdk-download" depends="jdk-check"
159149
unless="jdk.tgz.downloaded">
160150

161151
<!-- Windows is the outlier with the .zip extension (the others are .tar.gz) -->
@@ -185,25 +175,6 @@
185175
ignoreerrors="false"
186176
usetimestamp="true" />
187177

188-
<!--
189-
<condition property="jdk.downloader"
190-
value="${target-platform}-i586.tar.gz">
191-
<equals arg1="${jdk.data.model}" arg2="32" />
192-
</condition>
193-
<condition property="jdk.downloader"
194-
value="${target-platform}-x64.tar.gz">
195-
<equals arg1="${jdk.data.model}" arg2="64" />
196-
</condition>
197-
198-
<downloader component="jdk"
199-
train="${jdk.train}"
200-
version="${jdk.version}"
201-
platform="${target-platform}${jdk.data.model}"
202-
update="${jdk.update}"
203-
build="${jdk.build}"
204-
flavor="${jdk.downloader}"
205-
path="${jdk.tgz.path}" />
206-
-->
207178
</target>
208179

209180
<!-- Set the version of Java that must be present to build. -->
@@ -328,7 +299,6 @@
328299
<target name="test" depends="build">
329300
<subant buildpath="../core" target="test"/>
330301
<subant buildpath="../java" target="test"/>
331-
<subant buildpath="jre" target="test" />
332302
</target>
333303

334304
<target name="subprojects-build">

build/jre/.classpath

Lines changed: 0 additions & 11 deletions
This file was deleted.

build/jre/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

build/jre/.project

Lines changed: 0 additions & 17 deletions
This file was deleted.

build/jre/.settings/org.eclipse.jdt.core.prefs

Lines changed: 0 additions & 10 deletions
This file was deleted.

build/jre/build.xml

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)