Fix build.xml: Processed CL stub_includes _must_ reside in current folder (make) due to relative fileset access only!

Commit aac4c5fc4ab7c77eff3b71f518100dd182ec2c33 moved processed CL stub_includes
to 'build/includes', which would be 'nice to have'.

However, due to relative fileset restrictions, we must locate it from current folder 'make'.

Not detected, since an old 'make/includes/CL' was still around.

Using dedicated folder 'make/stub_includes.gen'.

2 files changed, 16 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
index 51a26a85..717b41b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 build
 dist
-make/stub_includes/CL
 .idea/workspace.xml
 **~
+make/stub_includes.gen
diff --git a/make/build.xml b/make/build.xml
index 76b9f0af..2b6a87aa 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -165,25 +165,31 @@
         <property name="config" value="${project.root}/make/config" />
         <property name="stub.includes" value="${project.root}/make/stub_includes" />
         <property name="stub.includes.dir" value="stub_includes" /> <!-- NOTE:  this MUST be relative for FileSet -->
+        <property name="gen.includes" value="${project.root}/make/stub_includes.gen" />
+        <property name="gen.includes.dir" value="stub_includes.gen" /> <!-- NOTE:  this MUST be relative for FileSet -->
 
         <!-- Directories used for OpenCL header file preprocessing. -->
         <property name="etc.build.dir" value="${build}/etc" />
         <property name="headers.orig" value="${stub.includes}/CL_orig" />
-        <property name="headers.dest" value="${build}/includes/CL" />
+        <property name="headers.dest" value="${gen.includes}/CL" />
 
     	<!-- The headers from which Java files are generated -->
         <dirset id="stub.includes.fileset.all" dir=".">
             <include name="${stub.includes.dir}"/>
+            <include name="${gen.includes.dir}"/>
             <include name="${stub.includes.dir}/jvm"/>
             <include name="${stub.includes.dir}/gl"/>
             <include name="${stub.includes.dir}/common"/>
         </dirset>
     	<fileset id="stub.includes.dependencies.fileset.1" dir="${stub.includes.dir}">
-            <include name="CL/**" />
+            <include name="CL_orig/**" />
             <include name="GL3/**" />
         </fileset>
-        <fileset id="stub.includes.dependencies.fileset.2" file="${gluegen.jar}" />
-        <fileset id="stub.includes.dependencies.fileset.3" dir="config">
+    	<fileset id="stub.includes.dependencies.fileset.2" dir="${gen.includes.dir}">
+            <include name="CL/**" />
+        </fileset>
+        <fileset id="stub.includes.dependencies.fileset.3" file="${gluegen.jar}" />
+        <fileset id="stub.includes.dependencies.fileset.4" dir="config">
             <include name="*.cfg" />
             <include name="*.java" />
             <include name="*.c" />
@@ -207,7 +213,7 @@
         <mkdir dir="${classes}" />
         <mkdir dir="${obj}" />
         <mkdir dir="${obj.jocl}" />
-        <mkdir dir="${build}/includes" />
+        <mkdir dir="${gen.includes}" />
 
         <property name="archive.name"        value="jocl-${jocl.version}-${os.and.arch}" />
         <property name="archive"             value="${build}/${archive.name}" />
@@ -272,6 +278,7 @@
             <srcfileset refid="stub.includes.dependencies.fileset.1" />
             <srcfileset refid="stub.includes.dependencies.fileset.2" />
             <srcfileset refid="stub.includes.dependencies.fileset.3" />
+            <srcfileset refid="stub.includes.dependencies.fileset.4" />
             <targetfileset dir=".">
                 <include name="${src.generated.java}/**/*.java" />
                 <include name="${src.generated.c}/**/*.c" />
@@ -284,6 +291,7 @@
             <srcfiles refid="stub.includes.dependencies.fileset.1" />
             <srcfiles refid="stub.includes.dependencies.fileset.2" />
             <srcfiles refid="stub.includes.dependencies.fileset.3" />
+            <srcfiles refid="stub.includes.dependencies.fileset.4" />
         </uptodate>
     </target>
 
@@ -622,6 +630,7 @@
                     <sysincludepath path="${java.includes.dir.platform}"/>
                     <sysincludepath path="${stub.includes.gluegen.cc}"/>
                     <includepath path="${stub.includes.dir}"/>
+                    <includepath path="${gen.includes.dir}"/>
                     <!-- This is for the generated headers for handwritten C code -->
                     <includepath path="${src.generated.c}" />
                     <includepath path="${src.c}"/>
@@ -898,7 +907,7 @@
         	<fileset dir="${tempdir}" />
             <fileset dir="${javadoc}" />
             <fileset dir="${javadoc.dev}" />
-            <fileset dir="${headers.dest}" />
+            <fileset dir="${gen.includes}" />
         </delete>
         <ant antfile="build-test.xml" target="clean"/>
     </target>