From 71c4b0d599ce881c5fcda137b78c39e70f48c0ca Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 23 Feb 2011 04:50:35 +0100
Subject: Use 7z instead of zip

---
 make/build-test.xml |  8 ++++----
 make/build.xml      | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'make')

diff --git a/make/build-test.xml b/make/build-test.xml
index 88fdf0a..76973c5 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -72,7 +72,7 @@
         <!-- Clean the results -->
         <delete quiet="true">
             <fileset dir="${results.test}" includes="**"/>
-            <fileset file="${build}/${test.archive.name}.zip"/>
+            <fileset file="${build}/${test.archive.name}.7z"/>
         </delete>
         <mkdir dir="${results.test}"/>
     
@@ -165,9 +165,9 @@
 
     <!-- updates / create the test results zip file -->
     <target name="test-zip-archive" depends="declare.common">
-        <zip destfile="${build}/${test.archive.name}.zip" update="true">
-            <zipfileset dir="${results.test}" prefix="${archive.name}/test-results"/>
-        </zip>
+        <archive.7z destfile="${build}/${test.archive.name}.7z"
+                    basedir="${results.test}" 
+                    includes="**" />
     </target>
 
 </project>
diff --git a/make/build.xml b/make/build.xml
index db092e2..3d08fb5 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -59,6 +59,7 @@
 
     <!-- Pull in GlueGen cpptasks build file -->
     <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
+    <import file="${gluegen.root}/make/gluegen-archivetasks.xml" />
 
     <!-- ================================================================== -->
     <!--
@@ -463,9 +464,9 @@
     </target>
 
     <target name="javadoc.zip" depends="javadoc.init">
-        <zip destfile="${build}/javadoc.zip"
-             basedir="${javadoc.root.path}"
-             includes="joal/**" />
+        <archive.7z destfile="${build}/javadoc.7z"
+                    basedir="${javadoc.root.path}"
+                    includes="joal/**" />
     </target>
 
     <target name="javadoc.public" depends="javadoc.init">
@@ -515,8 +516,7 @@
         </copy>
         <copy file="../README.txt" todir="${archive}"/>
         <copy file="../LICENSE.txt" todir="${archive}"/>
-        <delete quiet="true" file="${build}/${archive.name}.zip"/>
-        <zip destfile="${build}/${archive.name}.zip"
+        <archive.7z destfile="${build}/${archive.name}.7z"
              basedir="${build}"
              includes="${archive.name}/**" />
         <!-- Clean up after ourselves -->
-- 
cgit v1.2.3