diff options
| author | michelou <michelou@epfl.ch> | 2007-06-11 15:23:21 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2007-06-11 15:23:21 +0000 |
| commit | 9578a9df038aa39f343a1b685247f07d6537bec6 (patch) | |
| tree | 9e14c96a8964ecb0e731d5452ee76ba0746ed890 /build.xml | |
| parent | b2d9d9096a2cc34772d659245b9544eda6432438 (diff) | |
| download | scala-9578a9df038aa39f343a1b685247f07d6537bec6.tar.gz scala-9578a9df038aa39f343a1b685247f07d6537bec6.tar.bz2 scala-9578a9df038aa39f343a1b685247f07d6537bec6.zip | |
fixed 2 quirks on .NET
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 50 |
1 files changed, 36 insertions, 14 deletions
@@ -635,21 +635,43 @@ MSIL <target name="msil" depends="setup.quick, msil.sources"> <quick srcdir="${msil.dir}/src" usepredefs="no" target="msil" assemname="${msil.dir}/predef" assemrefs="${lib.dir}"> - <include name="scala/Predef.scala" /> - <include name="scala/Console.scala" /> - <include name="scala/Application.scala" /> - <include name="scala/ByNameFunction.scala" /> - <include name="scala/*Annotation.scala" /> - <include name="scala/Function*.scala" /> - <include name="scala/Tuple*.scala" /> - <include name="scala/Product*.scala" /> - <include name="scala/deprecated.scala" /> - <include name="scala/serializable.scala" /> - <include name="scala/transient.scala" /> - <include name="scala/cloneable.scala" /> - <include name="scala/transient.scala" /> - <include name="scala/runtime/*.scala" /> + <include name="scala/Predef.scala"/> + <include name="scala/Console.scala"/> + <include name="scala/Application.scala"/> + <include name="scala/ByNameFunction.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/serializable.scala"/> + <include name="scala/transient.scala"/> + <include name="scala/runtime/*.scala"/> </quick> + <property name="ilasm.infile" value="${msil.dir}/predef.msil"/> + <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}" + /> + </then> + <else> + <property + name="ilasm.args" + value="/dll /output:${ilasm.outfile} ${ilasm.infile}" + /> + </else> + </if> + <exec + executable="ilasm" vmlauncher="no"> + <!-- + errorproperty="ilasm.err" outputproperty="ilasm.out"> + --> + <arg line="${ilasm.args}"/> + </exec> </target> <!-- =========================================================================== |