diff options
| author | Sven Gothel <[email protected]> | 2011-02-23 04:58:38 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-02-23 04:58:38 +0100 |
| commit | ef0ee0c8fcb794d0c81e37eee87cb5c7b281fc7a (patch) | |
| tree | 4b5aca846db717a623c00425e8d4f500365cad4f /make | |
| parent | 8a34f083d78b61bf9cbebbd6c9a5ba3653e784aa (diff) | |
Using 7z instead of zip
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 1 | ||||
| -rw-r--r-- | make/build-test.xml | 8 | ||||
| -rw-r--r-- | make/build.xml | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index d331602ff..71ee4c238 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -17,6 +17,7 @@ <!-- Pull in GlueGen cpptasks build file --> <property name="gluegen.root" value="../../gluegen" /> <import file="${gluegen.root}/make/gluegen-cpptasks.xml" /> + <import file="${gluegen.root}/make/gluegen-archivetasks.xml" /> <property name="ant-contrib.jar" value="${gluegen.root}/make/lib/ant-contrib-1.0b3.jar" /> diff --git a/make/build-test.xml b/make/build-test.xml index 50b4bcea5..e8f3b49a3 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -55,7 +55,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}" /> @@ -385,9 +385,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> <!-- ================================================================== --> diff --git a/make/build.xml b/make/build.xml index 7cac401d2..aee9509bd 100644 --- a/make/build.xml +++ b/make/build.xml @@ -149,8 +149,7 @@ <copy todir="${archive}/etc"> <fileset dir="${project.root}/etc" includes="*" /> </copy> - <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 --> @@ -326,7 +325,7 @@ </target> <target name="javadoc.zip" depends="javadoc.init"> - <zip destfile="${build}/javadoc.zip" + <archive.7z destfile="${build}/javadoc.7z" basedir="${javadoc.root.path}" includes="jogl/**" /> </target> |