summaryrefslogtreecommitdiffstats
path: root/make/build.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-02-17 01:00:03 +0100
committerSven Gothel <[email protected]>2014-02-17 01:00:03 +0100
commit4fe49b4a14196f4189318a54603f285b2cdbdc84 (patch)
treef3f6f465fc6ef05b75d2baf15ec805b23f31c886 /make/build.xml
parent52672ae306180a6247a61d08f98185dbc8009479 (diff)
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}.
Diffstat (limited to 'make/build.xml')
-rw-r--r--make/build.xml4
1 files changed, 3 insertions, 1 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"