diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2009-05-07 14:13:06 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2009-05-07 14:13:06 +0000 |
| commit | ee2d15b908360a415c7e30fdde62a2c9bf5f849f (patch) | |
| tree | dfb95de01a43414a31fbc0bc1d788e20796a5d40 /build.xml | |
| parent | af8a754328f77be03822ee5a91ea17ae5f40b263 (diff) | |
| download | scala-ee2d15b908360a415c7e30fdde62a2c9bf5f849f.tar.gz scala-ee2d15b908360a415c7e30fdde62a2c9bf5f849f.tar.bz2 scala-ee2d15b908360a415c7e30fdde62a2c9bf5f849f.zip | |
Fixes in Sabbus: "ant newlibs build" and "ant n...
Fixes in Sabbus: "ant newlibs build" and "ant newlibs newstarr" work as
expected.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -439,11 +439,13 @@ QUICK BUILD (QUICK) <stopwatch name="quick.lib.timer" action="total"/> </target> - <target name="quick.pre-libs" depends="quick.lib" if="libs.msil.outdated"> + <target name="quick.newlibs" depends="quick.lib" if="libs.msil.outdated"> <antcall target="libs.done"/> + <property name="fjbg.jar" value="${lib.dir}/fjbg.jar"/> + <property name="msil.jar" value="${build-libs.dir}/msil.jar"/> </target> - <target name="quick.libs" depends="quick.pre-libs"> + <target name="quick.libs" depends="quick.newlibs" unless="libs.msil.outdated"> <property name="fjbg.jar" value="${lib.dir}/fjbg.jar"/> <property name="msil.jar" value="${lib.dir}/msil.jar"/> </target> @@ -1333,7 +1335,6 @@ LIBRARIES (MSIL, FJBG maybe later) <jar destfile="${build-libs.dir}/msil.jar"> <fileset dir="${build-libs.dir}/classes/msil"/> </jar> - <property name="msil.jar" value="${build-libs.dir}/msil.jar"/> </target> <target name="libs.done" depends="libs.msilpack"/> |