diff options
| -rw-r--r-- | make/build.xml | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/make/build.xml b/make/build.xml index c96e835..395fdc1 100644 --- a/make/build.xml +++ b/make/build.xml @@ -38,10 +38,10 @@ <target name="init" depends="gluegen.properties.load.user,gluegen.cpptasks.detect.os,setup-excludes-1,setup-excludes-2"> <!-- Declare all paths and user defined variables. --> - <property name="javac.bootclasspath-cdc.jar" value="lib/cdc_fp.jar" /> + <!-- property name="javac.bootclasspath-cdc.jar" value="lib/cdc_fp.jar" /--> - <!--property name="javadoc.link" value="http://download.oracle.com/javase/1.4.2/docs/api/"/--> - <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" /> + <!-- property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" /--> + <property name="javadoc.link" value="http://download.oracle.com/javase/1.5.0/docs/api/" /> <!-- The source and build directories. --> <property name="project.root" value=".." /> @@ -441,7 +441,7 @@ <!-- bootclasspath="${javac.bootclasspath-cdc.jar}"--> <javac destdir="${classes-cdc}" - source="1.4" + source="1.5" debug="true" debuglevel="source,lines,vars" includeAntRuntime="false" @@ -582,9 +582,9 @@ <property name="gluegen-rt.classes" value="com/jogamp/gluegen/runtime/**"/> <property name="jogamp.common.classes" value="com/jogamp/common/**"/> - <!--compile gluegen-rt with source=1.4 first--> + <!--compile gluegen-rt with source=1.5 first--> <javac destdir="${classes}" - source="1.4" + source="1.5" debug="true" debuglevel="source,lines,vars" includeAntRuntime="false" @@ -636,17 +636,6 @@ </filterset> </copy> - <copy file="Manifest-rt.cdc" - tofile="${build}/Manifest-rt.cdc.temp" - overwrite="true"> - <filterset> - <filter token="VERSION" value="${gluegen.version}"/> - <filter token="SCM_BRANCH" value="${gluegen.build.branch}"/> - <filter token="SCM_COMMIT" value="${gluegen.build.commit}"/> - <filter token="BASEVERSION" value="${gluegen_base_version}"/> - </filterset> - </copy> - <!-- Build the (native code) NativeLibrary support for gluegen-rt[-cdc].jar using the just-built GlueGen. --> <antcall target="c.build" inheritRefs="true" /> @@ -666,10 +655,23 @@ </jar> <!-- Build just the gluegen-rt.cdc.jar classes using the Java CDC - boot classes. --> + boot classes. + + CDC DISABLED - left as template for other configurations + <antcall target="gluegen.build.gluegen-rt.cdc" inheritRefs="true" /> - <!-- Build gluegen-rt.cdc.jar. --> + <copy file="Manifest-rt.cdc" + tofile="${build}/Manifest-rt.cdc.temp" + overwrite="true"> + <filterset> + <filter token="VERSION" value="${gluegen.version}"/> + <filter token="SCM_BRANCH" value="${gluegen.build.branch}"/> + <filter token="SCM_COMMIT" value="${gluegen.build.commit}"/> + <filter token="BASEVERSION" value="${gluegen_base_version}"/> + </filterset> + </copy> + <jar destfile="${build}/gluegen-rt.cdc.jar" manifest="${build}/Manifest-rt.cdc.temp"> <fileset dir="${classes-cdc}"> <include name="com/jogamp/gluegen/runtime/*.class" /> @@ -687,7 +689,8 @@ <fileset dir="${build}/obj"> <include name="*gluegen-rt.${native.library.suffix-cdc}" /> </fileset> - </jar> + </jar> + --> <!-- Copy antlr.jar into build directory for convenience so gluegen.jar can be run via "java -jar". antlr.jar is |