summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2007-06-18 08:26:33 +0000
committermichelou <michelou@epfl.ch>2007-06-18 08:26:33 +0000
commita6ffdf699226a145b06ef542ca44575ed3b5245d (patch)
tree90b5133beac667e6a64b939576d1481c887262a5 /build.xml
parent41d984037ab6eff6f5931bdadff833df569c17f5 (diff)
downloadscala-a6ffdf699226a145b06ef542ca44575ed3b5245d.tar.gz
scala-a6ffdf699226a145b06ef542ca44575ed3b5245d.tar.bz2
scala-a6ffdf699226a145b06ef542ca44575ed3b5245d.zip
removed .NET specifics from Scala commands
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml39
1 files changed, 38 insertions, 1 deletions
diff --git a/build.xml b/build.xml
index e79e4f5a77..0330396a04 100644
--- a/build.xml
+++ b/build.xml
@@ -53,6 +53,7 @@ PROPERTIES
<property name="examples.dir" value="${build.dir}/examples"/>
<property name="cldc.dir" value="${build.dir}/cldc"/>
<property name="msil.dir" value="${build.dir}/msil"/>
+ <property name="mono.dir" value="${src.dir}/mono"/>
<!-- Sets location and structure of the distribution -->
<property name="dist.dir" value="${basedir}/dists"/>
<property name="lib.jar.name" value="scala-library.jar"/>
@@ -737,7 +738,7 @@ MSIL
</target>
- <target name="msil" depends="setup.quick, msil.sources">
+ <target name="msil.dll" 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"/>
@@ -780,6 +781,42 @@ MSIL
</exec>
</target>
+ <target name="msil" depends="msil.dll">
+ <copy todir="${quick.dir}/bin">
+ <fileset
+ dir="${mono.dir}/bin"
+ includes="*.bat,*.net"
+ />
+ <filterset>
+ <filter token="VERSION" value="${version.number}"/>
+ <filter token="COPYRIGHT" value="${copyright.string}"/>
+ <filter token="NAME" value="Scala code runner"/>
+ </filterset>
+ </copy>
+ <if><isset property="os.win"/>
+ <then>
+ <copy todir="${quick.dir}/lib">
+ <fileset dir="${msil.dir}" includes="*.dll"/>
+ <fileset dir="${lib.dir}" includes="*.dll"/>
+ </copy>
+ </then>
+ <else>
+ <symlink
+ link="${quick.dir}/lib/predef.dll"
+ resource="${msil.dir}/predef.dll"
+ overwrite="yes" failonerror="no"/>
+ <symlink
+ link="${quick.dir}/lib/scalaruntime.dll"
+ resource="${lib.dir}/scalaruntime.dll"
+ overwrite="yes" failonerror="no"/>
+ <symlink
+ link="${quick.dir}/lib/mscorlib.dll"
+ resource="${lib.dir}/mscorlib.dll"
+ overwrite="yes" failonerror="no"/>
+ </else>
+ </if>
+ </target>
+
<!-- ===========================================================================
TEST
============================================================================ -->