Merge pull request ome#1134 from sbesson/12327_bftools_prefix

Add prefix to zip file produced by dist-bftools target
melissalinkert · Jun 5, 2014 · 06a453b · 06a453b
2 parents 9713454 + 6991fa7
commit 06a453b
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 36 deletions.
diff --git a/ant/toplevel.properties b/ant/toplevel.properties
@@ -115,29 +115,29 @@ ome-tools.libraries = commons-httpclient-2.0-rc2.jar \
 
 ### Bio-Formats command line tools bundle ###
 
-bftools.dir = tools
-bftools.files = bfconvert \
-                bfconvert.bat \
-                config.bat \
-                config.sh \
-                domainlist \
-                domainlist.bat \
-                formatlist \
-                formatlist.bat \
-                ijview \
-                ijview.bat \
-                logback.xml \
-                mkfake \
-                mkfake.bat \
-                omeul \
-                omeul.bat \
-                bf.bat \
-                bf.sh \
-                showinf \
-                showinf.bat \
-                tiffcomment \
-                tiffcomment.bat \
-                xmlindent \
-                xmlindent.bat \
-                xmlvalid \
-                xmlvalid.bat
+bftools.dir       = tools
+bftools.execfiles = bfconvert \
+                    domainlist \
+                    formatlist \
+                    ijview \
+                    mkfake \
+                    omeul \
+                    bf.sh \
+                    showinf \
+                    tiffcomment \
+                    xmlindent \
+                    xmlvalid
+bftools.files     = bfconvert.bat \
+                    config.bat \
+                    config.sh \
+                    domainlist.bat \
+                    formatlist.bat \
+                    ijview.bat \
+                    logback.xml \
+                    mkfake.bat \
+                    omeul.bat \
+                    bf.bat \
+                    showinf.bat \
+                    tiffcomment.bat \
+                    xmlindent.bat \
+                    xmlvalid.bat
diff --git a/ant/toplevel.xml b/ant/toplevel.xml
@@ -909,16 +909,14 @@ Type "ant -p" for a list of targets.
       </patternset>
     </zip>
     -->
-    <exec executable="zip" dir="${bftools.dir}">
-      <arg value="-r9"/>
-      <arg value="${artifact.dir}/bftools.zip"/>
-      <arg line="${bftools.files}"/>
-    </exec>
-    <exec executable="zip" dir="${artifact.dir}">
-      <arg value="-r9"/>
-      <arg value="${artifact.dir}/bftools.zip"/>
-      <arg value="bioformats_package.jar"/>
-    </exec>
+    <zip destfile="${artifact.dir}/bftools.zip">
+      <zipfileset dir="${bftools.dir}" includes="${bftools.files}"
+        prefix="bftools"/>
+      <zipfileset dir="${bftools.dir}" includes="${bftools.execfiles}"
+        prefix="bftools" filemode="751"/>
+      <zipfileset file="${package.jar}" prefix="bftools"/>
+    </zip>
+
   </target>
 
   <!-- Matlab -->