diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-test.xml | 9 | ||||
| -rw-r--r-- | make/build.xml | 10 | ||||
| -rw-r--r-- | make/gluegen-archivetasks.xml | 19 |
3 files changed, 29 insertions, 9 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 9e30b5b..8f54b68 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -7,6 +7,7 @@ <property name="gluegen.root" value=".." /> <import file="gluegen-cpptasks.xml" /> + <import file="gluegen-archivetasks.xml" /> <condition property="rootrel.build" value="build"> <not> @@ -173,7 +174,7 @@ <target name="junit.compile.check" depends="init"> <delete quiet="true"> <fileset dir="${build}/test/results" includes="**"/> - <fileset file="${build}/${test.archive.name}.zip"/> + <fileset file="${build}/${test.archive.name}.7z"/> </delete> <mkdir dir="${build}/test/results"/> @@ -366,9 +367,9 @@ <!-- updates / create the test results zip file --> <target name="test-zip-archive" depends="init"> - <zip destfile="${build}/${test.archive.name}.zip" update="true"> - <zipfileset dir="${build}/test/results" prefix="${archive.name}/test-results"/> - </zip> + <archive.7z destfile="${build}/${test.archive.name}.7z" + basedir="${build}/test/results" + includes="**" /> </target> </project> diff --git a/make/build.xml b/make/build.xml index aecfbe0..ed36a8d 100644 --- a/make/build.xml +++ b/make/build.xml @@ -20,6 +20,7 @@ </fail> <import file="gluegen-cpptasks.xml" /> + <import file="gluegen-archivetasks.xml" /> <condition property="rootrel.build" value="build"> <not> @@ -681,9 +682,9 @@ <classpath path="${classes}"/> <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" /> </javadoc> - <zip destfile="${build}/javadoc.zip" - basedir="${javadoc.root.path}" - includes="gluegen/**" /> + <archive.7z destfile="${build}/javadoc.7z" + basedir="${javadoc.root.path}" + includes="gluegen/**" /> </target> <!-- ================================================================== --> @@ -709,8 +710,7 @@ <copy todir="${archive}/jnlp-files"> <fileset dir="${project.root}/jnlp-files" 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 --> diff --git a/make/gluegen-archivetasks.xml b/make/gluegen-archivetasks.xml new file mode 100644 index 0000000..536441c --- /dev/null +++ b/make/gluegen-archivetasks.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="GlueGen-archivetasks" basedir="."> + <macrodef name="archive.7z"> + <attribute name="basedir" /> + <attribute name="destfile" /> + <attribute name="includes" /> + <sequential> + <delete file="@{destfile}" quiet="true" failonerror="false" /> + <exec executable="7z" + dir="@{basedir}" + spawn="false" + failifexecutionfails="true" + failonerror="true"> + <arg line="a -r @{destfile} @{includes}"/> + </exec> + </sequential> + </macrodef> +</project> + |