From ec7a659422f0a61df6994d602c75881b66ebf41c Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Mon, 4 Nov 2024 18:55:20 +0000
Subject: [PATCH] Drop omero.version from zip name

---
 build.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index fa759af4840..fe2615fd462 100644
--- a/build.xml
+++ b/build.xml
@@ -241,8 +241,8 @@ To get started using Eclipse, execute "ant build-dev" and import the top-level
         depends="release-clients,release-zip">
    </target>
 
-    <target name="release-zip" description="Zip the dist directory into ${product.name}-${omero.version}.zip">
-        <zip destfile="${omero.home}/target/${product.name}-${omero.version}.zip">
+    <target name="release-zip" description="Zip the dist directory into ${product.name}.zip">
+        <zip destfile="${omero.home}/target/${product.name}.zip">
             <zipfileset dir="${dist.dir}" prefix="${product.name}-${omero.version}"/>
         </zip>
     </target>
@@ -269,19 +269,19 @@ To get started using Eclipse, execute "ant build-dev" and import the top-level
 
     </target>
 
-    <target name="release-src" description="Package the git source tree into openmicroscopy-${omero.version}.zip"
+    <target name="release-src" description="Package the git source tree into openmicroscopy.zip"
             depends="release-src-embed,release-src-git"/>
 
     <target name="release-clients" description="Zip the Java zip">
-        <zip destfile="${omero.home}/target/OMERO.java-${omero.version}.zip">
+        <zip destfile="${omero.home}/target/OMERO.java.zip">
             <zipfileset dir="${dist.dir}/lib/client"    prefix="OMERO.java-${omero.version}/libs" includes="**/*.jar"/>
             <zipfileset dir="${dist.dir}/etc" prefix="OMERO.java-${omero.version}/libs" includes="logback-cli.xml"/>
         </zip>
 
     </target>
 
-    <target name="release-tar" description="Tar the dist directory into ${product-name}-${omero.version}.tar.bz2">
-        <tar destfile="${product.name}-${omero.version}.tar.bz2" compression="bzip2">
+    <target name="release-tar" description="Tar the dist directory into ${product-name}.tar.bz2">
+        <tar destfile="${product.name}.tar.bz2" compression="bzip2">
             <zipfileset dir="${dist.dir}" prefix="${product.name}-${omero.version}"/>
         </tar>
     </target>
@@ -303,7 +303,7 @@ To get started using Eclipse, execute "ant build-dev" and import the top-level
     </target>
 
     <target name="release-training" description="Produces a zip with the examples/Training files">
-        <zip destfile="${omero.home}/target/OMERO.training-${omero.version}.zip">
+        <zip destfile="${omero.home}/target/OMERO.training.zip">
             <zipfileset dir="${omero.home}/examples/Training" prefix="OMERO.training-${omero.version}" includes="**" excludes="markup.py"/>
             <zipfileset dir="${omero.home}" prefix="OMERO.training-${omero.version}" includes="LICENSE.txt"/>
         </zip>