diff options
| author | lorch <lorch@epfl.ch> | 2008-04-27 12:20:44 +0000 |
|---|---|---|
| committer | lorch <lorch@epfl.ch> | 2008-04-27 12:20:44 +0000 |
| commit | 1ecbd65b8c82a18001c9b24d715dbd8ffcab86d3 (patch) | |
| tree | 52162072081c76f70e001dcc25c998c9f6b486df /src/build/build-msil.xml | |
| parent | 633ceeda07158168befae76a25595da5b82ff0aa (diff) | |
| download | scala-1ecbd65b8c82a18001c9b24d715dbd8ffcab86d3.tar.gz scala-1ecbd65b8c82a18001c9b24d715dbd8ffcab86d3.tar.bz2 scala-1ecbd65b8c82a18001c9b24d715dbd8ffcab86d3.zip | |
propagating changes from Sabbus to SuperSABBUS
Diffstat (limited to 'src/build/build-msil.xml')
| -rw-r--r-- | src/build/build-msil.xml | 36 |
1 files changed, 9 insertions, 27 deletions
diff --git a/src/build/build-msil.xml b/src/build/build-msil.xml index c0435c5f09..8690ddb369 100644 --- a/src/build/build-msil.xml +++ b/src/build/build-msil.xml @@ -51,20 +51,19 @@ SETUP <condition><not><isset property="ilasm.cmd"/></not></condition> </fail> <!-- Sets ilasm arguments (either Windows or Unix) --> - <property name="ilasm.infile" value="${msil.dir}/lib/predef.msil"/> <property name="ilasm.outfile" value="${msil.dir}/lib/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> @@ -106,32 +105,15 @@ SETUP classpathref="quick.classpath"/> <mkdir dir="${msil.dir}/lib"/> <quick srcdir="${msil.dir}/src" usepredefs="no" target="msil" - assemname="${msil.dir}/lib/predef" assemrefs="${lib.dir}" + assemname="predef" assemrefs="${lib.dir}" failonerror="false"> - <include name="scala/Predef.scala"/> - <include name="scala/Either.scala"/> - <include name="scala/Option.scala"/> - <include name="scala/Pair.scala"/> - <include name="scala/Console.scala"/> - <include name="scala/Application.scala"/> - <include name="scala/ByNameFunction.scala"/> - <include name="scala/Stream.scala"/> - <include name="scala/*Annotation.scala"/> - <include name="scala/Function*.scala"/> - <include name="scala/Tuple*.scala"/> - <include name="scala/Product*.scala"/> - <include name="scala/cloneable.scala"/> - <include name="scala/deprecated.scala"/> - <include name="scala/native.scala"/> - <include name="scala/serializable.scala"/> - <include name="scala/transient.scala"/> - <include name="scala/volatile.scala"/> - <include name="scala/remote.scala"/> - <include name="scala/runtime/*.scala"/> - <include name="scala/collection/mutable/HashMap.scala"/> - <exclude name="scala/runtime/RichStringBuilder.scala"/> + <include name="**/*.scala"/> + <exclude name="scala/ScalaObject.scala"/> </quick> - <exec executable="${ilasm.cmd}" vmlauncher="no"> + <pathconvert property="ilasm.infiles" pathsep=" "> + <fileset dir="${msil.dir}" includes="*.msil"/> + </pathconvert> + <exec executable="${ilasm.cmd} {$ilasm.infiles}" vmlauncher="no"> <arg line="${ilasm.args}"/> </exec> </target> |