diff options
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/make/build.xml b/make/build.xml index 2fe2d69..554ba43 100644 --- a/make/build.xml +++ b/make/build.xml @@ -704,7 +704,7 @@ <!-- Build GlueGen using the generated Java files along with the - original source. --> - <!--compile gluegen-rt first--> + <!-- Compile gluegen-rt first --> <javac destdir="${classes}" includeAntRuntime="false" includes="${gluegen-rt.classes} ${jogamp.common.classes}" @@ -720,14 +720,20 @@ <classpath refid="cc_gluegen.classpath" /> </javac> - <!--compile gluegen (compile time) --> + <!-- Compile gluegen (compile time). + + Uses host.rt.jar, since we require 'com.sun.tools.doclets.Taglet', + w/o it breaks build on OSX w/ Java6 compiler. + Surprisingly it works on other platforms, which seems to pick classes + outside of the 'bootclasspath'. + --> <javac destdir="${classes}" includeAntRuntime="true" excludes="${gluegen.excludes.all} ${gluegen-rt.classes} ${java.part.android}" memoryMaximumSize="${javac.memorymax}" encoding="UTF-8" - source="${host.sourcelevel}" - target="${host.targetlevel}" + source="${target.sourcelevel}" + target="${target.targetlevel}" bootclasspath="${host.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src.java}" /> @@ -975,7 +981,8 @@ </target> <target name="tag.build" depends="init"> - <echo message='gluegen.build.number=${gluegen.build.number}${line.separator}' file="${build}/artifact.properties"/> + <echo message='gluegen.build.version=${jogamp.version}${line.separator}' file="${build}/artifact.properties"/> + <echo message='gluegen.build.number=${gluegen.build.number}${line.separator}' file="${build}/artifact.properties" append="true"/> <echo message='gluegen.build.id=${gluegen.build.id}${line.separator}' file="${build}/artifact.properties" append="true"/> <echo message='gluegen.build.branch=${gluegen.build.branch}${line.separator}' file="${build}/artifact.properties" append="true"/> <echo message='gluegen.build.commit=${gluegen.build.commit}${line.separator}' file="${build}/artifact.properties" append="true"/> |