diff options
| author | Sven Gothel <[email protected]> | 2015-03-23 04:05:03 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-23 04:05:03 +0100 |
| commit | b755b045fb7e3c8306f24dd645297992ab8db7f9 (patch) | |
| tree | 4be9dfb52b0e0ed91d5376ef1d770552d3252d1e /make | |
| parent | 532b8df474976b474f0cf4eb2d93588ded2ad3fe (diff) | |
Bug 1149 - Replacing PCPP w/ JCPP, allowing complete macro handling (Part-1: Cleanup / Preparation)
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-test.xml | 9 | ||||
| -rwxr-xr-x | make/jogamp-env.xml | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 624bd61..fe1aaec 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -36,6 +36,7 @@ <property name="test.junit.generation.rel" value="${test.junit.rel}/gluegen/test/junit/generation" /> <property name="test.junit.generation.dir" value="${test.base.dir}/${test.junit.generation.rel}" /> + <property name="tempdir" value="${project.root}/build-temp" /> <property name="build" location="${project.root}/${rootrel.build}" /> <property name="test.dir" value="${gluegen.root}/${rootrel.build}/test"/> <property name="results" value="${test.dir}/results" /> @@ -50,6 +51,7 @@ <property name="build_t.gen.rootrel" value="${rootrel.build}/test/build/gensrc"/> + <mkdir dir="${tempdir}" /> <mkdir dir="${test.dir}"/> <mkdir dir="${results}"/> <mkdir dir="${build_t}"/> @@ -516,6 +518,12 @@ chmod 644 ${results}/* \${line.separator} </antcall> </target> + <target name="java.generate.copy2temp"> + <copy todir="${tempdir}"> + <fileset dir="${build_t}" + includes="gensrc/classes/**" /> + </copy> + </target> <!-- @@ -546,6 +554,7 @@ chmod 644 ${results}/* \${line.separator} logLevel="WARNING"> <classpath refid="gluegen.classpath" /> </gluegen> + <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${test.junit.generation.dir}/test1-gluegen.c" outputRootDir="${build_t.gen}" diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml index 68fa098..c5bb1b0 100755 --- a/make/jogamp-env.xml +++ b/make/jogamp-env.xml @@ -236,6 +236,9 @@ <contains string="${target.sourcelevel}" substring="1.6" casesensitive="false" /> <contains string="${target.sourcelevel}" substring="1.7" casesensitive="false" /> <contains string="${target.sourcelevel}" substring="1.8" casesensitive="false" /> + <contains string="${target.sourcelevel}" substring="1.9" casesensitive="false" /> + <contains string="${target.sourcelevel}" substring="2.0" casesensitive="false" /> + <contains string="${target.sourcelevel}" substring="2.1" casesensitive="false" /> </or> </not> </condition> @@ -247,6 +250,9 @@ <contains string="${target.targetlevel}" substring="1.6" casesensitive="false" /> <contains string="${target.targetlevel}" substring="1.7" casesensitive="false" /> <contains string="${target.targetlevel}" substring="1.8" casesensitive="false" /> + <contains string="${target.targetlevel}" substring="1.9" casesensitive="false" /> + <contains string="${target.targetlevel}" substring="2.0" casesensitive="false" /> + <contains string="${target.targetlevel}" substring="2.1" casesensitive="false" /> </or> </not> </condition> |