diff options
| author | Sven Gothel <[email protected]> | 2012-01-22 18:38:27 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-01-22 18:38:27 +0100 |
| commit | 826c63dda445393c19be57dbd4cb7e3b1676b512 (patch) | |
| tree | 552791da0bbefa3d5da5493eeaea2791c77ae084 /make/build.xml | |
| parent | c18c52b8c20aa03a08940bef81b620d48c4117e2 (diff) | |
Fix Bug 516 (Determine Java Version) / See gluegen: 64639b805a32338385421f168e12c1ef7f749d00
Diffstat (limited to 'make/build.xml')
| -rwxr-xr-x | make/build.xml | 18 |
1 files changed, 14 insertions, 4 deletions
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}" /> |