Fix build.xml: Remove gluegen config dependency on ../build using build-temp

Fix copy2temp target and issue it before gluegen of cl-if.cfg.

Note: ${project.root}/build cannot be a hard-dependency since
      ${rootrel.build} is configurable hence
      ${project.root}/${rootrel.build}.

2 files changed, 14 insertions, 12 deletions

diff --git a/make/build.xml b/make/build.xml
index 0c50129f..694cfe9b 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -45,6 +45,7 @@
 
     <!-- This is the version of JOCL you are building -->
     <mkdir dir="${build}" />
+
     <exec dir="." executable="git" logError="true" failonerror="false" failifexecutionfails="false"
               output="${build}/localbranch.raw">
         <arg line="branch --no-color"/>
@@ -298,7 +299,7 @@
     <target name="java.generate.copy2temp">
         <copy todir="${tempdir}">
             <fileset dir="${build}"
-                     includes="gensrc/classes/**" />
+                     includes="gensrc/java/**" />
         </copy>
     </target>
 
@@ -500,6 +501,7 @@
         </gluegen>
 
         <echo message="CL..."/>
+        <antcall target="java.generate.copy2temp" inheritRefs="true" />
         <gluegen src="${stub.includes}/opencl.h"
                  outputRootDir="${build}"
                  config="${config}/cl-if.cfg"
diff --git a/make/config/cl-if.cfg b/make/config/cl-if.cfg
index 2078123a..8b5322f7 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/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
+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
 
 #ignore cl-gl interoperability functions. Interface 'CL' is pure OpenCL.
 Ignore CL_GL_.*|cl.*GL.*|.*_GL_.*