diff options
author | lorch <lorch@epfl.ch> | 2008-04-22 09:06:05 +0000 |
---|---|---|
committer | lorch <lorch@epfl.ch> | 2008-04-22 09:06:05 +0000 |
commit | c3b7c00d1e8a1233a741c33f5ac2e584b548a89d (patch) | |
tree | bfcb97e425b9a385387f027a516947d604451450 /build.xml | |
parent | 6af6ce11308ba6e6757365a390ad38c4a29cd23f (diff) | |
download | scala-c3b7c00d1e8a1233a741c33f5ac2e584b548a89d.tar.gz scala-c3b7c00d1e8a1233a741c33f5ac2e584b548a89d.tar.bz2 scala-c3b7c00d1e8a1233a741c33f5ac2e584b548a89d.zip |
Fixed #521: MSIL should support separate compil...
Fixed #521: MSIL should support separate compilation
- The output directory must be specified by "-d" (default: ".") There is
- a new switch -Xkeep-msil-files (default: false). This switch must be
- explicitly enabled if you want to keep the generated .msil files
Diffstat (limited to 'build.xml')
-rw-r--r-- | build.xml | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -1002,7 +1002,13 @@ 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"/> + <!-- 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"/> @@ -1032,8 +1038,8 @@ MSIL </target> <target name="msil.libraries" depends="setup.quick, msil.sources"> - <quick srcdir="${msil.dir}/src" target="msil" - assemname="${msil.dir}/predef" assemrefs="${lib.dir}" + <quick srcdir="${msil.dir}/src" destdir="${msil.dir}" target="msil" + assemname="predef" assemrefs="${lib.dir}" failonerror="false"> <include name="**/*.scala"/> <exclude name="scala/ScalaObject.scala"/> @@ -1069,7 +1075,6 @@ MSIL <include name="scala/testing/*.scala"/> <include name="scala/text/*.scala"/> --> </quick> - <exec executable="${ilasm.cmd}" vmlauncher="no"> <!-- |