diff options
| author | Michael Bien <[email protected]> | 2011-02-25 23:53:23 +0100 |
|---|---|---|
| committer | Michael Bien <[email protected]> | 2011-02-25 23:53:23 +0100 |
| commit | a1c22f48aef28165b0112e3bab223fe5ea2fa4fd (patch) | |
| tree | 8ca5808874a5249ac0b93cdcdd1f01d806b471a8 /make/build-test.xml | |
| parent | 021bac51052da270b6cde326637c4c4251ba38aa (diff) | |
| parent | 5cf4eeb334ac5390b0c681da0fb17db56a143395 (diff) | |
Merge branch 'master' of github.com:sgothel/gluegen
Diffstat (limited to 'make/build-test.xml')
| -rw-r--r-- | make/build-test.xml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 222ab93..6383952 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -7,6 +7,8 @@ <property name="gluegen.root" value=".." /> <import file="gluegen-cpptasks.xml" /> + <import file="jogamp-archivetasks.xml" /> + <import file="jogamp-env.xml" /> <condition property="rootrel.build" value="build"> <not> @@ -14,7 +16,7 @@ </not> </condition> - <target name="init" depends="gluegen.properties.load.user"> + <target name="init" depends="jogamp.env.init,gluegen.properties.load.user"> <!-- Call the external config validator script to make sure the config is ok and consistent --> <ant antfile="validate-properties.xml" inheritall="true"/> @@ -88,7 +90,7 @@ <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask" classpathref="gluegen.classpath" /> - <property name="test.archive.name" value="${archive.name}-test-results"/> + <property name="test.archive.name" value="${archive.name}-test-results-${build.node.name}"/> </target> <target name="java.build" depends="java.generate"> @@ -173,7 +175,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 +368,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> |