diff options
| author | Sven Gothel <[email protected]> | 2011-02-09 05:39:11 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-02-09 05:39:11 +0100 |
| commit | 5a9488ddb1d5b02acbd8a153d43ba8ac3444cff3 (patch) | |
| tree | 0ddb1fbf65e207220b50a3a75ff9c2d3d87946bd | |
| parent | c4311f1abc4aefefb8a846b0397e184a8a382b31 (diff) | |
Bump Java source level to 1.5
| -rw-r--r-- | make/build-test.xml | 2 | ||||
| -rwxr-xr-x | make/build.xml | 10 | ||||
| -rwxr-xr-x | make/joal.properties | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 58c3db9..ecf5633 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -77,7 +77,7 @@ <mkdir dir="${results.test}"/> <javac debug="true" srcdir="${src.test}" destdir="${classes.test}" includeantruntime="false" - classpath="${gluegen-rt.jar};../build/joal.jar;${junit.path}"/> + classpath="${gluegen-rt.jar};${build}/joal.jar;${junit.path}"/> <copy todir="${classes.test}"> <fileset dir="${src.test}" includes="**/*.wav"/> </copy> diff --git a/make/build.xml b/make/build.xml index 6c4ec96..3a5ce73 100755 --- a/make/build.xml +++ b/make/build.xml @@ -269,7 +269,7 @@ - Compile the original and generated source. --> <target name="java.compile" depends="java.generate"> - <javac destdir="${classes}" classpath="${gluegen-rt.jar}" source="1.4" debug="true" debuglevel="source,lines" includeantruntime="false"> + <javac destdir="${classes}" classpath="${gluegen-rt.jar}" source="1.5" debug="true" debuglevel="source,lines" includeantruntime="false"> <src path="${src.java}" /> <src path="${src.generated.java}" /> </javac> @@ -420,8 +420,8 @@ </target> <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.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/" /> <!-- Link offline with relative URLs does not work. Link online with relative URLs works, @@ -471,7 +471,7 @@ <javadoc packagenames="${javadoc.packagenames}" sourcepath="${src.java};${src.generated.java}" destdir="${javadoc.joal.public.path}" windowtitle="JOAL API" - source="1.4"> + source="1.5"> <classpath refid="joal_all.classpath"/> <link offline="true" href="${javadoc.link}" packagelistLoc="${gluegen.root}/make/142-packages" /> <link offline="false" href="${gluegen.link}" /> @@ -483,7 +483,7 @@ <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.4"> + source="1.5"> <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/joal.properties b/make/joal.properties index e56ccdf..609e39e 100755 --- a/make/joal.properties +++ b/make/joal.properties @@ -9,4 +9,4 @@ # find e.g. JAWT or JNI headers, override this to point to the # root directory of your JDK. # -# java.home.dir=C:/jdk1.4.2 +# java.home.dir=C:/jdk1.5.0 |