diff options
| -rw-r--r-- | make/build.xml | 50 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.macosx.sh | 5 | ||||
| -rwxr-xr-x | make/scripts/make.jogl.all.x86_64.sh | 3 |
3 files changed, 44 insertions, 14 deletions
diff --git a/make/build.xml b/make/build.xml index 29930c6..5923fa6 100644 --- a/make/build.xml +++ b/make/build.xml @@ -103,7 +103,8 @@ <property name="src" value="${project.root}/src" /> <property name="javadoc" value="${project.root}/javadoc" /> <!-- 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/" /> + <!--property name="javadoc.link" value="http://download.oracle.com/javase/1.5.0/docs/api/" /--> + <property name="javadoc.link" value="http://docs.oracle.com/javase/6/docs/api/" /> <property name="javadoc.link.jogl" value="${jogl.root}/javadoc-public/" /> <property name="jogl.demos.jar" value="${build}/jogl-demos.jar" /> <property name="jogl.demos.util.jar" value="${build}/jogl-demos-util.jar" /> @@ -116,9 +117,14 @@ </target> <target name="nurbs" if="jogl.nurbs"> - <!-- NOTE: this target requires a 1.5 javac to be on the PATH --> - <javac destdir="${classes}" includes="demos/nurbs/**" source="1.5" debug="true" debuglevel="source,lines" - includeantruntime="false"> + <javac destdir="${classes}" + includeAntRuntime="false" + includes="demos/nurbs/**" + memoryMaximumSize="${javac.memorymax}" + source="${target.sourcelevel}" + target="${target.targetlevel}" + bootclasspath="${target.rt.jar}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src}" /> <classpath refid="jogl-demos.classpath" /> </javac> @@ -135,8 +141,13 @@ </target> <target name="redbook-javac"> - <javac destdir="${classes}" source="1.5" target="1.5" debug="true" debuglevel="source,lines" - includeantruntime="false"> + <javac destdir="${classes}" + includeantruntime="false" + memoryMaximumSize="${javac.memorymax}" + source="${target.sourcelevel}" + target="${target.targetlevel}" + bootclasspath="${target.rt.jar}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src}/redbook/src" /> <classpath refid="jogl-demos.classpath" /> </javac> @@ -152,8 +163,14 @@ <pathelement location="${simple-xml.jar}" /> <pathelement location="${swt.jar}" /> </path> - <javac destdir="${classes}" excludes="${jogl.cg.excludes},demos/nurbs/**,${jogl.swt.excludes},jbullet/**,${jogl.redbook.excludes}" source="1.5" debug="true" debuglevel="source,lines" - includeantruntime="false"> + <javac destdir="${classes}" + excludes="${jogl.cg.excludes},demos/nurbs/**,${jogl.swt.excludes},jbullet/**,${jogl.redbook.excludes}" + includeantruntime="false" + memoryMaximumSize="${javac.memorymax}" + source="${target.sourcelevel}" + target="${target.targetlevel}" + bootclasspath="${target.rt.jar}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src}" /> <classpath refid="jogl-demos.classpath" /> </javac> @@ -204,9 +221,14 @@ <pathelement location="${jogl.cg.jar}" /> <pathelement location="${gluegen-rt.jar}" /> </path> - <javac destdir="${classes}" includes="demos/GLInfo*,demos/es1/**,demos/es2/**" source="1.5" debug="true" debuglevel="source,lines" - includeantruntime="false"> - bootclasspath="${gluegen.root}/make/lib/cdc_fp.jar"> + <javac destdir="${classes}" + includes="demos/GLInfo*,demos/es1/**,demos/es2/**" + includeantruntime="false" + memoryMaximumSize="${javac.memorymax}" + source="${target.sourcelevel}" + target="${target.targetlevel}" + bootclasspath="${target.rt.jar}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src}" /> <classpath refid="jogl-demos.classpath" /> </javac> @@ -238,8 +260,10 @@ <target name="javadoc" depends="init"> <mkdir dir="${javadoc}" /> - <javadoc destdir="${javadoc}" windowtitle="JOGL Demos" - source="1.5"> + <javadoc destdir="${javadoc}" + windowtitle="JOGL Demos" + source="${target.sourcelevel}" + maxmemory="${javac.memorymax}" > <packageset dir="${src}"> <exclude name="demos/cg/**" /> </packageset> diff --git a/make/scripts/make.jogl.all.macosx.sh b/make/scripts/make.jogl.all.macosx.sh index 716e32b..d0f1475 100755 --- a/make/scripts/make.jogl.all.macosx.sh +++ b/make/scripts/make.jogl.all.macosx.sh @@ -5,6 +5,9 @@ SDIR=`dirname $0` # -Dc.compiler.debug=true # -Djogl.cg=1 \ -ant -v \ +ant \ + -Dtarget.sourcelevel=1.6 \ + -Dtarget.targetlevel=1.6 \ + -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ -Drootrel.build=build-macosx \ $* 2>&1 | tee make.jogl.all.macosx.log diff --git a/make/scripts/make.jogl.all.x86_64.sh b/make/scripts/make.jogl.all.x86_64.sh index 110e51d..7d192b8 100755 --- a/make/scripts/make.jogl.all.x86_64.sh +++ b/make/scripts/make.jogl.all.x86_64.sh @@ -13,6 +13,9 @@ fi # -Djogl.redbook=true \ ant \ + -Dtarget.sourcelevel=1.6 \ + -Dtarget.targetlevel=1.6 \ + -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ -Djogl.cg=1 \ -Duser.swt.jar=$SWT_CLASSPATH \ -Drootrel.build=build-x86_64 \ |