diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-01-22 16:55:23 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-01-22 16:55:23 +0000 |
| commit | daf9227e7323c31257fe34bb4f2d38c7c1abbff1 (patch) | |
| tree | fa7f4e59e132cc707e3d767353247edf936e7a94 /build.xml | |
| parent | ac9fb6ad28b88ee4e7896c93d26c76e80bd3ece3 (diff) | |
| download | scala-daf9227e7323c31257fe34bb4f2d38c7c1abbff1.tar.gz scala-daf9227e7323c31257fe34bb4f2d38c7c1abbff1.tar.bz2 scala-daf9227e7323c31257fe34bb4f2d38c7c1abbff1.zip | |
fix several issues in .net backend / type parsing.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 30 |
1 files changed, 23 insertions, 7 deletions
@@ -125,10 +125,15 @@ END-USER TARGETS </target> <target name="newlibs" - description="Requires libraries (MSIL, FJBG, FORKJOIN) to be rebuilt. Add this target before any other if class file format is incompatible."> + description="Requires libraries (MSIL, FJBG) to be rebuilt. Add this target before any other if class file format is incompatible."> <property name="libs.outdated" value="yes"/> </target> + <target name="newforkjoin" + description="Requires forkjoin library to be rebuilt. Add this target before any other if class file format is incompatible."> + <property name="forkjoin.outdated" value="yes"/> + </target> + <!-- =========================================================================== PROPERTIES ============================================================================ --> @@ -529,19 +534,27 @@ QUICK BUILD (QUICK) <target name="quick.newlibs" depends="quick.lib" if="libs.outdated"> <antcall target="libs.done"> - <param name="forkjoin.jar" value="${build-libs.dir}/forkjoin.jar"/> <param name="fjbg.jar" value="${build-libs.dir}/fjbg.jar"/> <param name="msil.jar" value="${build-libs.dir}/msil.jar"/> </antcall> </target> <target name="quick.libs" depends="quick.newlibs" unless="libs.outdated"> - <property name="forkjoin.jar" value="${lib.dir}/forkjoin.jar"/> <property name="fjbg.jar" value="${lib.dir}/fjbg.jar"/> <property name="msil.jar" value="${lib.dir}/msil.jar"/> </target> - - <target name="quick.pre-comp" depends="quick.libs"> + + <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> + </target> + + <target name="quick.forkjoin" depends="quick.newforkjoin" unless="forkjoin.outdated"> + <property name="forkjoin.jar" value="${lib.dir}/forkjoin.jar"/> + </target> + + <target name="quick.pre-comp" depends="quick.forkjoin"> <uptodate property="quick.comp.available" targetfile="${build-quick.dir}/compiler.complete"> <srcfiles dir="${src.dir}/compiler"/> </uptodate> @@ -1158,6 +1171,7 @@ LIBRARIES (MSIL, FJBG maybe later) classpath="${build-libs.dir}/classes/msil" includes="**/*.java" excludes="**/tests/**" + debug="true" target="1.5" source="1.4"> <compilerarg line="${javac.args}"/> </javac> @@ -1216,8 +1230,10 @@ LIBRARIES (MSIL, FJBG maybe later) <fileset dir="${build-libs.dir}/classes/fjbg"/> </jar> </target> - - <target name="libs.done" depends="libs.msilpack, libs.fjbgpack, libs.forkjoinpack"/> + + <target name="libs.done" depends="libs.msilpack, libs.fjbgpack"/> + + <target name="forkjoin.done" depends="libs.forkjoinpack"/> <target name="libs.clean" depends="pack.clean"> <delete dir="${build-libs.dir}" includeemptydirs="yes" quiet="yes" failonerror="no"/> |