diff options
| author | Wade Walker <[email protected]> | 2015-07-19 15:16:10 -0500 |
|---|---|---|
| committer | Wade Walker <[email protected]> | 2015-11-08 14:05:28 -0600 |
| commit | 85dc2b1357470d2a51a69080d33aac442eae291f (patch) | |
| tree | c6e9f119791db42657f2d8ec242fd218e4dbc9c3 /make/build.xml | |
| parent | 2cef8bb275deb1e003c9c4b0e911cdc0195970d7 (diff) | |
Remove copy of generated Java files to build-temp directory
This build step doesn't seem to be needed; can just read the files where
they're created in the build directory and everything works the same.
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/make/build.xml b/make/build.xml index 6f889476..5b49ad03 100644 --- a/make/build.xml +++ b/make/build.xml @@ -144,8 +144,6 @@ <property name="src.c" value="${project.root}/${rootrel.src.c}" /> <property name="src.java" value="${project.root}/${rootrel.src.java}" /> <property name="build" value="${project.root}/${rootrel.build}" /> - <property name="tempdir" value="${project.root}/build-temp" /> - <mkdir dir="${tempdir}" /> <!-- The generated source directories. --> <property name="src.generated" value="${build}/gensrc" /> @@ -301,13 +299,6 @@ </uptodate> </target> - <target name="java.generate.copy2temp"> - <copy todir="${tempdir}"> - <fileset dir="${build}" - includes="gensrc/java/**" /> - </copy> - </target> - <target name="generate.jdk7.autocloseable" if="${enable.jdk7.features}"> <echo message="Generating JDK7+ AutoCloseable"/> <copy file="${project.root}/src/com/jogamp/opencl/AutoCloseable.jtemplate" @@ -524,7 +515,6 @@ </gluegen> <echo message="Generating CL.java"/> - <antcall target="java.generate.copy2temp" inheritRefs="true" /> <gluegen src="${stub.includes}/opencl.h" outputRootDir="${build}" config="${config}/cl-if.cfg" @@ -547,7 +537,7 @@ <classpath refid="gluegen.classpath" /> </gluegen> - <echo message="Generating CLAbstractImpl.java"/> + <echo message="Generating CLAbstractImpl.java and CLProcAddressTable.java"/> <gluegen src="${stub.includes}/opencl.h" outputRootDir="${build}" config="${config}/cl-impl.cfg" @@ -945,7 +935,6 @@ <target name="clean" depends="init"> <delete includeEmptyDirs="true" quiet="true"> <fileset dir="${build}" /> - <fileset dir="${tempdir}" /> <fileset dir="${javadoc}" /> <fileset dir="${javadoc.dev}" /> <fileset dir="${gen.includes}" /> |