diff options
| author | lorch <lorch@epfl.ch> | 2008-04-24 19:56:43 +0000 |
|---|---|---|
| committer | lorch <lorch@epfl.ch> | 2008-04-24 19:56:43 +0000 |
| commit | 1e54e8baf560c0d01c693e9277adcedba171642b (patch) | |
| tree | 6c15f3927aecbff3a6f4f83d66773f9fb86ccd1b /build.xml | |
| parent | 05b846b94dc6820563e5154dd323884530f4c255 (diff) | |
| download | scala-1e54e8baf560c0d01c693e9277adcedba171642b.tar.gz scala-1e54e8baf560c0d01c693e9277adcedba171642b.tar.bz2 scala-1e54e8baf560c0d01c693e9277adcedba171642b.zip | |
"ant msil" works again on a fresh build (and af...
"ant msil" works again on a fresh build (and after "ant clean")
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 16 |
1 files changed, 6 insertions, 10 deletions
@@ -1002,26 +1002,19 @@ MSIL <condition><not><isset property="ilasm.cmd"/></not></condition> </fail> <!-- Sets ilasm arguments (either Windows or Unix) --> - <!-- property name="ilasm.infile" value="${msil.dir}/predef.msil" --> - <path id="ilasm.infiles"> - <fileset dir="${msil.dir}" includes="*.msil"/> - </path> - <pathconvert property="ilasm.infile" pathsep=" "> - <path refid="ilasm.infiles" /> - </pathconvert> <property name="ilasm.outfile" value="${msil.dir}/predef.dll"/> <if> <isset property="os.win"/> <then> <property name="ilasm.args" - value="/quiet /dll /output=${ilasm.outfile} ${ilasm.infile}" + value="/quiet /dll /output=${ilasm.outfile}" /> </then> <else> <property name="ilasm.args" - value="/dll /output:${ilasm.outfile} ${ilasm.infile}" + value="/dll /output:${ilasm.outfile}" /> </else> </if> @@ -1075,12 +1068,15 @@ MSIL <include name="scala/testing/*.scala"/> <include name="scala/text/*.scala"/> --> </quick> + <pathconvert property="ilasm.infile" pathsep=" "> + <fileset dir="${msil.dir}" includes="*.msil"/> + </pathconvert> <exec executable="${ilasm.cmd}" vmlauncher="no"> <!-- errorproperty="ilasm.err" outputproperty="ilasm.out"> --> - <arg line="${ilasm.args}"/> + <arg line="${ilasm.args} ${ilasm.infile}"/> </exec> </target> |