From 85dc2b1357470d2a51a69080d33aac442eae291f Mon Sep 17 00:00:00 2001
From: Wade Walker <wwalker3@austin.rr.com>
Date: Sun, 19 Jul 2015 15:16:10 -0500
Subject: 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.
---
 make/build.xml        | 13 +------------
 make/config/cl-if.cfg | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 23 deletions(-)

(limited to 'make')

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}" />
diff --git a/make/config/cl-if.cfg b/make/config/cl-if.cfg
index 8b5322f7..2078123a 100644
--- a/make/config/cl-if.cfg
+++ b/make/config/cl-if.cfg
@@ -19,17 +19,17 @@ Extends CL CLSamplerBinding
 Extends CL CLEventBinding
 Extends CL CLPlatformBinding
 
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLContextBinding.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLProgramBinding.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLKernelBinding.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLCommandQueueBinding.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLDeviceBinding.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLMemObjBinding.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLImageBinding.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLBufferBinding.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLSamplerBinding.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLEventBinding.java
-ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/java/com/jogamp/opencl/llb/CLPlatformBinding.java
+ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLContextBinding.java
+ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLProgramBinding.java
+ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLKernelBinding.java
+ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLCommandQueueBinding.java
+ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLDeviceBinding.java
+ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLMemObjBinding.java
+ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLImageBinding.java
+ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLBufferBinding.java
+ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLSamplerBinding.java
+ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLEventBinding.java
+ExtendedInterfaceSymbolsIgnore ../build/gensrc/java/com/jogamp/opencl/llb/CLPlatformBinding.java
 
 #ignore cl-gl interoperability functions. Interface 'CL' is pure OpenCL.
 Ignore CL_GL_.*|cl.*GL.*|.*_GL_.*
-- 
cgit v1.2.3