diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-01-25 10:44:16 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-01-25 10:44:16 +0000 |
| commit | 361051b4d385d8b03dd4f4f6fd0410e9a5d17626 (patch) | |
| tree | e1806b2aa9a3f6ffac2d43a25b8128a2ada852a1 /build.xml | |
| parent | 2a1f11991f0bd019dc76b72b2342124a30975dba (diff) | |
| download | scala-361051b4d385d8b03dd4f4f6fd0410e9a5d17626.tar.gz scala-361051b4d385d8b03dd4f4f6fd0410e9a5d17626.tar.bz2 scala-361051b4d385d8b03dd4f4f6fd0410e9a5d17626.zip | |
small improvements in building newlibs / newfor...
small improvements in building newlibs / newforkjoin. no review.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 22 |
1 files changed, 15 insertions, 7 deletions
@@ -533,10 +533,9 @@ QUICK BUILD (QUICK) </target> <target name="quick.newlibs" depends="quick.lib" if="libs.outdated"> - <antcall target="libs.done"> - <param name="fjbg.jar" value="${build-libs.dir}/fjbg.jar"/> - <param name="msil.jar" value="${build-libs.dir}/msil.jar"/> - </antcall> + <antcall target="libs.done" inheritRefs="true"/> + <property name="fjbg.jar" value="${build-libs.dir}/fjbg.jar"/> + <property name="msil.jar" value="${build-libs.dir}/msil.jar"/> </target> <target name="quick.libs" depends="quick.newlibs" unless="libs.outdated"> @@ -545,9 +544,8 @@ QUICK BUILD (QUICK) </target> <target name="quick.newforkjoin" depends="quick.libs" if="forkjoin.outdated"> - <antcall target="forkjoin.done"> - <param name="forkjoin.jar" value="${build-libs.dir}/forkjoin.jar"/> - </antcall> + <antcall target="forkjoin.done" inheritRefs="true"/> + <property name="forkjoin.jar" value="${build-libs.dir}/forkjoin.jar"/> </target> <target name="quick.forkjoin" depends="quick.newforkjoin" unless="forkjoin.outdated"> @@ -1123,6 +1121,13 @@ LIBRARIES (MSIL, FJBG maybe later) <target name="libs.start"/> <target name="libs.pre-forkjoin" depends="libs.start"> + <property name="java6.home" value="/home/linuxsoft/apps/java-1.6"/> + <fail message="Compiling forkjoin.jar requires java 1.6. Please set the property `java6.home` in build.properties or using `-Djava6.home=/path/to/java6`"> + <condition><not> + <available file="${java6.home}/bin/javac"/> + </not></condition> + </fail> + <uptodate property="libs.forkjoin.available" targetfile="${build-libs.dir}/forkjoin.complete"> <srcfiles dir="${src.dir}/forkjoin"> <include name="**/*.java"/> @@ -1134,6 +1139,9 @@ LIBRARIES (MSIL, FJBG maybe later) <target name="libs.forkjoin" depends="libs.pre-forkjoin" unless="libs.forkjoin.available"> <mkdir dir="${build-libs.dir}/classes/forkjoin"/> <javac + executable="${java6.home}/bin/javac" + fork="yes" + compiler="javac1.6" srcdir="${src.dir}/forkjoin" destdir="${build-libs.dir}/classes/forkjoin" classpath="${build-libs.dir}/classes/forkjoin" |