Compare revisions

Wei Liu · Wei Liu · 6fbf6d53 · 6fbf6d53 · 6fbf6d53
--- a/ant-build.xml
+++ b/ant-build.xml
 <?xml version="1.0"?>
 <project name="unimelb-mf-clients">
-    <property name="jreMacFile" value="OpenJDK17U-jre_x64_mac_hotspot_17.0.4_8.tar.gz" />
-    <property name="jreMacUrl" value="https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4%2B8/OpenJDK17U-jre_x64_mac_hotspot_17.0.4_8.tar.gz" />
+    <property name="jre_x64_windows_file" value="OpenJDK21U-jre_x64_windows_hotspot_21.0.4_7.zip"/>
+    <property name="jre_x64_linux_file"   value="OpenJDK21U-jre_x64_linux_hotspot_21.0.4_7.tar.gz"/>
+    <property name="jre_x64_mac_file"     value="OpenJDK21U-jre_x64_mac_hotspot_21.0.4_7.tar.gz"/>
+    <property name="jre_aarch64_mac_file" value="OpenJDK21U-jre_aarch64_mac_hotspot_21.0.4_7.tar.gz"/>
+    
+    <property name="jre_x64_windows_url"  value="https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_windows_hotspot_21.0.4_7.zip"/>
+    <property name="jre_x64_linux_url"    value="https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_linux_hotspot_21.0.4_7.tar.gz"/>
+    <property name="jre_x64_mac_url"      value="https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_mac_hotspot_21.0.4_7.tar.gz"/>
+    <property name="jre_aarch64_mac_url"  value="https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.4_7.tar.gz"/>
+    
+    <property name="jre_dir_name" value="jdk-21.0.4+7-jre" />

-    <property name="jreWindowsFile" value="OpenJDK17U-jre_x64_windows_hotspot_17.0.4_8.zip" />
-    <property name="jreWindowsUrl" value="https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4%2B8/OpenJDK17U-jre_x64_windows_hotspot_17.0.4_8.zip" />
-
-    <property name="jreLinuxFile" value="OpenJDK17U-jre_x64_linux_hotspot_17.0.4_8.tar.gz" />
-    <property name="jreLinuxUrl" value="https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4%2B8/OpenJDK17U-jre_x64_linux_hotspot_17.0.4_8.tar.gz" />
-
-    <property name="jreDirName" value="jdk-17.0.4+8-jre" />
    <property name="tempDir" value="${projectBuildDir}/temp" />
    <property name="distDir" value="${projectBuildDir}/dist" />

@@ -19,49 +21,64 @@
    	<mkdir dir="${projectLibDir}"/>
    	<copy file="${project.build.directory}/${projectArtifactId}-${projectVersion}-jar-with-dependencies.jar" toFile="${projectLibDir}/${projectArtifactId}.jar"/>
    </target>
-    <target name="pkgMac" depends="init">
-        <echo message="downloading Java Runtime for Mac OS..." />
-        <get src="${jreMacUrl}" dest="${tempDir}" />
-        <untar src="${tempDir}/${jreMacFile}" dest="${tempDir}" compression="gzip" />
-        <delete file="${tempDir}/${jreMacFile}" />
-        <tar longfile="gnu" destfile="${distDir}/${projectArtifactId}-${projectVersion}-mac-x64.tar">
-            <tarfileset dir="${tempDir}/${jreDirName}/Contents/Home" includes="bin/**/*" prefix="${projectArtifactId}-${projectVersion}/jre" filemode="755" />
-            <tarfileset dir="${tempDir}/${jreDirName}/Contents/Home" excludes="bin/**/*" prefix="${projectArtifactId}-${projectVersion}/jre" filemode="644" />
-            <tarfileset dir="${projectLibDir}" prefix="${projectArtifactId}-${projectVersion}/lib" filemode="644" />
-            <tarfileset dir="${projectBaseDir}/src/main/scripts/unix" prefix="${projectArtifactId}-${projectVersion}/bin/unix" filemode="755" />
-        </tar>
-        <gzip destfile="${distDir}/${projectArtifactId}-${projectVersion}-mac-x64.tar.gz" src="${distDir}/${projectArtifactId}-${projectVersion}-mac-x64.tar" />
-        <delete file="${distDir}/${projectArtifactId}-${projectVersion}-mac-x64.tar" />
-        <delete dir="${tempDir}/${jreDirName}" />
-    </target>
-    <target name="pkgWindows" depends="init">
-        <echo message="downloading Java Runtime for Windows..." />
-        <get src="${jreWindowsUrl}" dest="${tempDir}" />
-        <unzip src="${tempDir}/${jreWindowsFile}" dest="${tempDir}" />
-        <delete file="${tempDir}/${jreWindowsFile}" />
+    <target name="pkg_windows_x64" depends="init">
+        <echo message="downloading Java Runtime for Windows x64..." />
+        <get src="${jre_x64_windows_url}" dest="${tempDir}" />
+        <unzip src="${tempDir}/${jre_x64_windows_file}" dest="${tempDir}" />
+        <delete file="${tempDir}/${jre_x64_windows_file}" />
        <zip destfile="${distDir}/${projectArtifactId}-${projectVersion}-windows-x64.zip">
-            <zipfileset dir="${tempDir}/${jreDirName}" includes="bin/**/*" prefix="${projectArtifactId}-${projectVersion}/jre" filemode="755" />
-            <zipfileset dir="${tempDir}/${jreDirName}" excludes="bin/**/*" prefix="${projectArtifactId}-${projectVersion}/jre" filemode="644" />
+            <zipfileset dir="${tempDir}/${jre_dir_name}" includes="bin/**/*" prefix="${projectArtifactId}-${projectVersion}/jre" filemode="755" />
+            <zipfileset dir="${tempDir}/${jre_dir_name}" excludes="bin/**/*" prefix="${projectArtifactId}-${projectVersion}/jre" filemode="644" />
            <zipfileset dir="${projectLibDir}" prefix="${projectArtifactId}-${projectVersion}/lib" filemode="644" />
            <zipfileset dir="${projectBaseDir}/src/main/scripts/windows" prefix="${projectArtifactId}-${projectVersion}/bin/windows" filemode="755" />
        </zip>
-    	<delete dir="${tempDir}/${jreDirName}" />
+        <delete dir="${tempDir}/${jre_dir_name}" />
    </target>
-    <target name="pkgLinux" depends="init">
-        <echo message="downloading Java Runtime for Linux..." />
-        <get src="${jreLinuxUrl}" dest="${tempDir}" />
-        <untar src="${tempDir}/${jreLinuxFile}" dest="${tempDir}" compression="gzip" />
-        <delete file="${tempDir}/${jreLinuxFile}" />
+    <target name="pkg_linux_x64" depends="init">
+        <echo message="downloading Java Runtime for Linux x64..." />
+        <get src="${jre_x64_linux_url}" dest="${tempDir}" />
+        <untar src="${tempDir}/${jre_x64_linux_file}" dest="${tempDir}" compression="gzip" />
+        <delete file="${tempDir}/${jre_x64_linux_file}" />
        <tar longfile="gnu" destfile="${distDir}/${projectArtifactId}-${projectVersion}-linux-x64.tar">
-            <tarfileset dir="${tempDir}/${jreDirName}" includes="bin/**/*" prefix="${projectArtifactId}-${projectVersion}/jre" filemode="755" />
-            <tarfileset dir="${tempDir}/${jreDirName}" excludes="bin/**/*" prefix="${projectArtifactId}-${projectVersion}/jre" filemode="644" />
+            <tarfileset dir="${tempDir}/${jre_dir_name}" includes="bin/**/*" prefix="${projectArtifactId}-${projectVersion}/jre" filemode="755" />
+            <tarfileset dir="${tempDir}/${jre_dir_name}" excludes="bin/**/*" prefix="${projectArtifactId}-${projectVersion}/jre" filemode="644" />
            <tarfileset dir="${projectLibDir}" prefix="${projectArtifactId}-${projectVersion}/lib" filemode="644" />
            <tarfileset dir="${projectBaseDir}/src/main/scripts/unix" prefix="${projectArtifactId}-${projectVersion}/bin/unix" filemode="755" />
        </tar>
        <gzip destfile="${distDir}/${projectArtifactId}-${projectVersion}-linux-x64.tar.gz" src="${distDir}/${projectArtifactId}-${projectVersion}-linux-x64.tar" />
        <delete file="${distDir}/${projectArtifactId}-${projectVersion}-linux-x64.tar" />
-    	<delete dir="${tempDir}/${jreDirName}" />
+        <delete dir="${tempDir}/${jre_dir_name}" />
+    </target>
+    <target name="pkg_mac_x64" depends="init">
+        <echo message="downloading Java Runtime for Mac x64 (intel)..." />
+        <get src="${jre_x64_mac_url}" dest="${tempDir}" />
+        <untar src="${tempDir}/${jre_x64_mac_file}" dest="${tempDir}" compression="gzip" />
+        <delete file="${tempDir}/${jre_x64_mac_file}" />
+        <tar longfile="gnu" destfile="${distDir}/${projectArtifactId}-${projectVersion}-mac-x64.tar">
+            <tarfileset dir="${tempDir}/${jre_dir_name}/Contents/Home" includes="bin/**/*" prefix="${projectArtifactId}-${projectVersion}/jre" filemode="755" />
+            <tarfileset dir="${tempDir}/${jre_dir_name}/Contents/Home" excludes="bin/**/*" prefix="${projectArtifactId}-${projectVersion}/jre" filemode="644" />
+            <tarfileset dir="${projectLibDir}" prefix="${projectArtifactId}-${projectVersion}/lib" filemode="644" />
+            <tarfileset dir="${projectBaseDir}/src/main/scripts/unix" prefix="${projectArtifactId}-${projectVersion}/bin/unix" filemode="755" />
+        </tar>
+        <gzip destfile="${distDir}/${projectArtifactId}-${projectVersion}-mac-x64.tar.gz" src="${distDir}/${projectArtifactId}-${projectVersion}-mac-x64.tar" />
+        <delete file="${distDir}/${projectArtifactId}-${projectVersion}-mac-x64.tar" />
+        <delete dir="${tempDir}/${jre_dir_name}" />
+    </target>
+    <target name="pkg_mac_aarch64" depends="init">
+        <echo message="downloading Java Runtime for Mac aarch64..." />
+        <get src="${jre_aarch64_mac_url}" dest="${tempDir}" />
+        <untar src="${tempDir}/${jre_aarch64_mac_file}" dest="${tempDir}" compression="gzip" />
+        <delete file="${tempDir}/${jre_aarch64_mac_file}" />
+        <tar longfile="gnu" destfile="${distDir}/${projectArtifactId}-${projectVersion}-mac-aarch64.tar">
+            <tarfileset dir="${tempDir}/${jre_dir_name}/Contents/Home" includes="bin/**/*" prefix="${projectArtifactId}-${projectVersion}/jre" filemode="755" />
+            <tarfileset dir="${tempDir}/${jre_dir_name}/Contents/Home" excludes="bin/**/*" prefix="${projectArtifactId}-${projectVersion}/jre" filemode="644" />
+            <tarfileset dir="${projectLibDir}" prefix="${projectArtifactId}-${projectVersion}/lib" filemode="644" />
+            <tarfileset dir="${projectBaseDir}/src/main/scripts/unix" prefix="${projectArtifactId}-${projectVersion}/bin/unix" filemode="755" />
+        </tar>
+        <gzip destfile="${distDir}/${projectArtifactId}-${projectVersion}-mac-aarch64.tar.gz" src="${distDir}/${projectArtifactId}-${projectVersion}-mac-aarch64.tar" />
+        <delete file="${distDir}/${projectArtifactId}-${projectVersion}-mac-aarch64.tar" />
+        <delete dir="${tempDir}/${jre_dir_name}" />
    </target>
-    <target name="package" depends="pkgMac,pkgWindows,pkgLinux">
+    <target name="packages" depends="pkg_windows_x64,pkg_linux_x64,pkg_mac_x64,pkg_mac_aarch64">
    </target>
 </project>
\ No newline at end of file
--- a/build-all.sh
+++ b/build-all.sh
-# -X option for debugging
+# -X option for debug
 # mvn clean package -X -P platform-packages
 mvn clean package -P platform-packages
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@

 	<groupId>au.edu.unimelb.mf</groupId>
 	<artifactId>unimelb-mf-clients</artifactId>
-	<version>0.8.0</version>
+	<version>0.8.1</version>
 	<packaging>jar</packaging>
 	<name>unimelb-mf-clients</name>
 	<url>https://gitlab.unimelb.edu.au/resplat-mediaflux/unimelb-mf-clients
@@ -213,7 +213,7 @@
 										<property name="projectLibDir"
 											value="${project.build.directory}/lib" />
 										<ant antfile="${project.basedir}/ant-build.xml">
-											<target name="package" />
+											<target name="packages" />
 										</ant>
 									</target>
 								</configuration>
No results found