Use JRE builds to reduce binary size

GrayNerd · May 25, 2019 · 91ed7f0 · 91ed7f0
1 parent 6fc391a
commit 91ed7f0
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/build.xml b/build.xml
@@ -117,7 +117,7 @@
 			<exec executable="get-java.sh" dir="${dir.cache}" failonerror="yes" osFamily="unix">
 				<arg line="get jre x86_64 Windows" />
 			</exec>
-			<unzip src="${dir.cache}/openjdk-${jre.version}_windows-x64_bin.zip" dest="@{dest}">
+			<unzip src="${dir.cache}/OpenJDK_${jre.version}_Windows-x86_64-jre.zip" dest="@{dest}">
 				<patternset refid="pattern.jre" />
 				<cutdirsmapper dirs="1" />
 			</unzip>
@@ -128,7 +128,7 @@
 			<exec executable="get-java.sh" dir="${dir.cache}" failonerror="yes" osFamily="unix">
 				<arg line="get jfx x86_64 Windows" />
 			</exec>
-			<unzip src="${dir.cache}/openjfx-${jfx.version}_windows-x64_bin-sdk.zip" dest="@{dest}/ext/modules">
+			<unzip src="${dir.cache}/OpenJDK_${jre.version}_Windows-x86_64-jfx.zip" dest="@{dest}/ext/modules">
 				<patternset refid="pattern.jre" />
 				<cutdirsmapper dirs="1" />
 			</unzip>
@@ -142,14 +142,14 @@
 			<exec executable="get-java.sh" dir="${dir.cache}" failonerror="yes">
 				<arg line="get jre x86_64 Darwin" />
 			</exec>
-			<untar src="${dir.cache}/openjdk-${jre.version}_osx-x64_bin.tar.gz" dest="@{dest}" compression="gzip">
+			<untar src="${dir.cache}/OpenJDK_${jre.version}_Darwin-x86_64-jre.tar.gz" dest="@{dest}" compression="gzip">
 				<patternset refid="pattern.jre" />
 				<cutdirsmapper dirs="1" />
 			</untar>
 			<exec executable="get-java.sh" dir="${dir.cache}" failonerror="yes">
 				<arg line="get jfx x86_64 Darwin" />
 			</exec>
-			<unzip src="${dir.cache}/openjfx-${jfx.version}_osx-x64_bin-sdk.zip" dest="@{dest}/jdk-${jre.version}.jdk/Contents/Home/ext/modules">
+			<unzip src="${dir.cache}/OpenJDK_${jre.version}_Darwin-x86_64-jfx.tar.gz" dest="@{dest}/jdk-${jre.version}.jdk/Contents/Home/ext/modules">
 				<patternset refid="pattern.jre" />
 				<cutdirsmapper dirs="1" />
 			</unzip>
@@ -163,14 +163,14 @@
 			<exec executable="get-java.sh" dir="${dir.cache}" failonerror="yes">
 				<arg line="get jdk x86_64 Linux" />
 			</exec>
-			<untar src="${dir.cache}/openjdk-${jre.version}_linux-x64_bin.tar.gz" dest="@{dest}" compression="gzip">
+			<untar src="${dir.cache}/OpenJDK_${jre.version}_Linux-x86_64-jre.tar.gz" dest="@{dest}" compression="gzip">
 				<patternset refid="pattern.jre" />
 				<cutdirsmapper dirs="1" />
 			</untar>
 			<exec executable="get-java.sh" dir="${dir.cache}" failonerror="yes">
 				<arg line="get jfx x86_64 Linux" />
 			</exec>
-			<unzip src="${dir.cache}/openjfx-${jfx.version}_linux-x64_bin-sdk.zip" dest="@{dest}/ext/modules">
+			<unzip src="${dir.cache}/OpenJDK_${jre.version}_Linux-x86_64-jfx.tar.gz" dest="@{dest}/ext/modules">
 				<patternset refid="pattern.jre" />
 				<cutdirsmapper dirs="1" />
 			</unzip>