diff options
| author | Wade Walker <[email protected]> | 2015-09-19 15:20:23 -0500 |
|---|---|---|
| committer | Wade Walker <[email protected]> | 2015-11-08 14:05:29 -0600 |
| commit | 4638f4b3fdf4c946bda0b290a83652e4db00edea (patch) | |
| tree | 7d027b893fbf1d55d578e2f156186075a092810c /make/build.xml | |
| parent | 9a90181ed1fb596275fee9ebca0f3d1093722ca9 (diff) | |
Factor out common custom C and Java code to reduce duplication
Consolidated C custom code so common functions are only defined once in
the 1.1 version, then are called from the 1.2 and 2.0 version. Pulled
common code in CLImpl up into the autogenerated implementation class and
removed the hand-written implementation (since it was left empty).
Factored custom Java code out so there was as little duplication as
possible across the three CLImpl versions, with common code for all
three versions in clImplCustomCode.java.
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/make/build.xml b/make/build.xml index b1bb7091..d08614a9 100644 --- a/make/build.xml +++ b/make/build.xml @@ -288,7 +288,7 @@ <!-- Now check for the presence of one well-known file --> <uptodate property="java.generate.skip" - targetfile="${src.generated.c}/CLAbstractImpl_JNI.c"> + targetfile="${src.generated.c}/CLImpl11_JNI.c"> <srcfiles refid="stub.includes.dependencies.fileset.1" /> <srcfiles refid="stub.includes.dependencies.fileset.2" /> <srcfiles refid="stub.includes.dependencies.fileset.3" /> @@ -553,7 +553,7 @@ <classpath refid="gluegen.classpath" /> </gluegen> - <echo message="Generating CLAbstractImpl.java, CLAbstractImpl_JNI.c, and CLProcAddressTable.java for OpenCL version 1.1"/> + <echo message="Generating CLImpl.java, CLImpl_JNI.c, and CLProcAddressTable.java for OpenCL version 1.1"/> <gluegen src="${stub.includes}/opencl.h" outputRootDir="${build}" config="${config}/cl-impl-11.cfg" @@ -568,7 +568,7 @@ <include name="${gen.includes.dir}/CL12"/> </dirset> <echo message="OpenCL stub include path for OpenCL version 1.2: ${toString:stub.includes.fileset.all.12}"/> - <echo message="Generating CLAbstractImpl.java, CLAbstractImpl_JNI.c, and CLProcAddressTable.java for OpenCL version 1.2"/> + <echo message="Generating CLImpl.java, CLImpl_JNI.c, and CLProcAddressTable.java for OpenCL version 1.2"/> <gluegen src="${stub.includes}/opencl.h" outputRootDir="${build}" config="${config}/cl-impl-12.cfg" @@ -583,7 +583,7 @@ <include name="${gen.includes.dir}/CL20"/> </dirset> <echo message="OpenCL stub include path for OpenCL version 2.0: ${toString:stub.includes.fileset.all.20}"/> - <echo message="Generating CLAbstractImpl.java, CLAbstractImpl_JNI.c, and CLProcAddressTable.java for OpenCL version 2.0"/> + <echo message="Generating CLImpl.java, CLImpl_JNI.c, and CLProcAddressTable.java for OpenCL version 2.0"/> <gluegen src="${stub.includes}/opencl.h" outputRootDir="${build}" config="${config}/cl-impl-20.cfg" |