diff options
| -rw-r--r-- | make/build-test.xml | 11 | ||||
| -rwxr-xr-x | make/build.xml | 18 | ||||
| -rwxr-xr-x | make/scripts/make.joal.all.linux-x86_64.sh | 6 |
3 files changed, 29 insertions, 6 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 91a1d2d..9f36ce3 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -79,8 +79,15 @@ </delete> <mkdir dir="${results.test}"/> - <javac debug="true" srcdir="${src.test}" destdir="${classes.test}" includeantruntime="false" - classpath="${gluegen-rt.jar};${build}/joal.jar;${junit.path}"/> + <javac destdir="${classes.test}" + includeantruntime="false" + srcdir="${src.test}" + classpath="${gluegen-rt.jar};${build}/joal.jar;${junit.path}" + memoryMaximumSize="${javac.memorymax}" + source="${target.sourcelevel}" + target="${target.targetlevel}" + bootclasspath="${target.rt.jar}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"/> <copy todir="${classes.test}"> <fileset dir="${src.test}" includes="**/*.wav"/> </copy> diff --git a/make/build.xml b/make/build.xml index da85f9e..e942b77 100755 --- a/make/build.xml +++ b/make/build.xml @@ -283,7 +283,14 @@ - Compile the original and generated source. --> <target name="java.compile" depends="java.generate"> - <javac destdir="${classes}" classpath="${gluegen-rt.jar}" source="1.5" debug="true" debuglevel="source,lines" includeantruntime="false"> + <javac destdir="${classes}" + includeantruntime="false" + classpath="${gluegen-rt.jar}" + memoryMaximumSize="${javac.memorymax}" + source="${target.sourcelevel}" + target="${target.targetlevel}" + bootclasspath="${target.rt.jar}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src.java}" /> <src path="${src.generated.java}" /> </javac> @@ -435,7 +442,8 @@ <target name="javadoc.init" depends="init"> <!-- 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/" /> <!-- Link offline with relative URLs does not work. Link online with relative URLs works, @@ -485,7 +493,8 @@ <javadoc packagenames="${javadoc.packagenames}" sourcepath="${src.java};${src.generated.java}" destdir="${javadoc.joal.public.path}" windowtitle="JOAL API" - source="1.5"> + source="${target.sourcelevel}" + maxmemory="${javac.memorymax}" > <classpath refid="joal_all.classpath"/> <link offline="true" href="${javadoc.link}" packagelistLoc="${gluegen.root}/make/142-packages" /> <link offline="false" href="${gluegen.link}" /> @@ -497,7 +506,8 @@ <javadoc packagenames="${javadoc.dev.packagenames},${javadoc.dev.packagenames.platform}" sourcepath="${src.java};${src.generated.java}" destdir="${javadoc.joal.dev.path}" windowtitle="JOAL API" - source="1.5"> + source="${target.sourcelevel}" + maxmemory="${javac.memorymax}" > <classpath refid="joal_all.classpath"/> <link offline="true" href="${javadoc.link}" packagelistLoc="${gluegen.root}/make/142-packages" /> <link offline="false" href="${gluegen.link}" /> diff --git a/make/scripts/make.joal.all.linux-x86_64.sh b/make/scripts/make.joal.all.linux-x86_64.sh index 6c3f27a..553f757 100755 --- a/make/scripts/make.joal.all.linux-x86_64.sh +++ b/make/scripts/make.joal.all.linux-x86_64.sh @@ -19,7 +19,13 @@ if [ -z "$ANT_PATH" ] ; then fi # -Drootrel.build=build-x86_64 \ +# -Dtarget.sourcelevel=1.6 \ +# -Dtarget.targetlevel=1.6 \ +# -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ ant \ + -Dtarget.sourcelevel=1.6 \ + -Dtarget.targetlevel=1.6 \ + -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ -Drootrel.build=build-x86_64 \ $* 2>&1 | tee make.joal.all.linux-x86_64.log |