diff options
| author | Sven Gothel <[email protected]> | 2011-02-24 00:10:48 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-02-24 00:10:48 +0100 |
| commit | 5cf4eeb334ac5390b0c681da0fb17db56a143395 (patch) | |
| tree | 8ca5808874a5249ac0b93cdcdd1f01d806b471a8 /make | |
| parent | b88976ac189c8154be2a8e2b748711c85a1af421 (diff) | |
Fix archive.7z: unset property destfile.path. gluegen-archivetasks.xml -> jogamp-archivetasks.xml
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-test.xml | 2 | ||||
| -rw-r--r-- | make/build.xml | 2 | ||||
| -rw-r--r-- | make/jogamp-archivetasks.xml (renamed from make/gluegen-archivetasks.xml) | 10 |
3 files changed, 11 insertions, 3 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 51692bb..6383952 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -7,7 +7,7 @@ <property name="gluegen.root" value=".." /> <import file="gluegen-cpptasks.xml" /> - <import file="gluegen-archivetasks.xml" /> + <import file="jogamp-archivetasks.xml" /> <import file="jogamp-env.xml" /> <condition property="rootrel.build" value="build"> diff --git a/make/build.xml b/make/build.xml index bdd9297..6e5a6ac 100644 --- a/make/build.xml +++ b/make/build.xml @@ -20,7 +20,7 @@ </fail> <import file="gluegen-cpptasks.xml" /> - <import file="gluegen-archivetasks.xml" /> + <import file="jogamp-archivetasks.xml" /> <import file="jogamp-env.xml" /> <condition property="rootrel.build" value="build"> diff --git a/make/gluegen-archivetasks.xml b/make/jogamp-archivetasks.xml index ee7501d..24309d8 100644 --- a/make/gluegen-archivetasks.xml +++ b/make/jogamp-archivetasks.xml @@ -1,10 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="GlueGen-archivetasks" basedir="."> +<project name="jogamp-archivetasks" basedir="."> + <dirname property="jogamp-archivetasks.basedir" file="${ant.file.jogamp-archivetasks}"/> + <taskdef resource="net/sf/antcontrib/antlib.xml"> + <classpath> + <pathelement location="${jogamp-archivetasks.basedir}/lib/ant-contrib-1.0b3.jar"/> + </classpath> + </taskdef> + <macrodef name="archive.7z"> <attribute name="basedir" /> <attribute name="destfile" /> <attribute name="includes" /> <sequential> + <var name="destfile.path" unset="true"/> <property name="destfile.path" location="@{destfile}"/> <!-- absolute path --> <delete file="${destfile.path}" quiet="true" failonerror="false" /> <exec executable="7z" |