diff options
author | jeberle <jeberle@epfl.ch> | 2008-05-06 09:49:37 +0000 |
---|---|---|
committer | jeberle <jeberle@epfl.ch> | 2008-05-06 09:49:37 +0000 |
commit | 3e47505f7ff50117d0aee441ab2a04efd1070dac (patch) | |
tree | d76ecc2012650264da8bee6ff85c90f62a6342d7 /src/build/build-msil.xml | |
parent | 2d2821504b7a325522d818d6dc3a41eab29269d7 (diff) | |
download | scala-3e47505f7ff50117d0aee441ab2a04efd1070dac.tar.gz scala-3e47505f7ff50117d0aee441ab2a04efd1070dac.tar.bz2 scala-3e47505f7ff50117d0aee441ab2a04efd1070dac.zip |
in fact superSabbus uses msil.xml, not build-ms...
in fact superSabbus uses msil.xml, not build-msil.xml
Diffstat (limited to 'src/build/build-msil.xml')
-rw-r--r-- | src/build/build-msil.xml | 73 |
1 files changed, 37 insertions, 36 deletions
diff --git a/src/build/build-msil.xml b/src/build/build-msil.xml index 0c07cfc342..8690ddb369 100644 --- a/src/build/build-msil.xml +++ b/src/build/build-msil.xml @@ -3,10 +3,6 @@ <project name="scala-msil" basedir="../.." default="build"> -<description> - SuperSabbus extension for the MSIL library targeted for the dotnet framework. THIS FILE IS NOT STAND-ALONE AND SHOULD ONLY BE USED THROUGH ENTRY POINTS IN SUPERSABBUS. - </description> - <!-- =========================================================================== PROPERTIES ============================================================================ --> @@ -16,7 +12,7 @@ PROPERTIES <property name="mono.dir" value="${src.dir}/mono"/> <!-- Loads custom properties definitions --> - <property file="${src.dir}/build/build-msil.properties"/> + <property file="${scripts.dir}/scripts/build-msil.properties"/> <!-- Sets location of build folders --> <property name="build.dir" value="${basedir}/build"/> @@ -24,7 +20,7 @@ PROPERTIES <property name="dist.dir" value="${basedir}/dists"/> <!-- =========================================================================== -MSIL BUILD +SETUP ============================================================================ --> <target name="msil.init" depends="init"> @@ -81,25 +77,43 @@ MSIL BUILD <target name="msil.sources" depends="msil.init"> <mkdir dir="${msil.dir}/src"/> <copy todir="${msil.dir}/src"> - <fileset dir="${src.dir}/dotnet-library" includes="**/*.scala, **/*.cs"/> + <fileset dir="${src.dir}/library" includes="**/*.scala"> + <not> + <present targetdir="${src.dir}/dotnet-library"/> + </not> + <exclude name="scala/collection/jcl/**/*.scala"/> + </fileset> </copy> <copy todir="${msil.dir}/src"> - <fileset dir="${src.dir}/library" includes="**/*.scala"/> + <fileset dir="${src.dir}/dotnet-library"> + <include name="**/*.scala"/> + </fileset> </copy> </target> <target name="msil.libraries" depends="msil.sources"> + <antcall target="build.quick"/> + <property name="quick.dir" value="${build.dir}/quick"/> + <path id="quick.classpath"> + <pathelement location="${quick.dir}/lib/library"/> + <pathelement location="${quick.dir}/lib/compiler"/> + <pathelement location="${fjbg.jar}"/> + <pathelement location="${msil.jar}"/> + </path> + <taskdef + name="quick" classname="scala.tools.ant.Scalac" + classpathref="quick.classpath"/> <mkdir dir="${msil.dir}/lib"/> - <scalac srcdir="${msil.dir}/src" target="msil" + <quick srcdir="${msil.dir}/src" usepredefs="no" target="msil" assemname="predef" assemrefs="${lib.dir}" failonerror="false"> <include name="**/*.scala"/> <exclude name="scala/ScalaObject.scala"/> - </scalac> + </quick> <pathconvert property="ilasm.infiles" pathsep=" "> <fileset dir="${msil.dir}" includes="*.msil"/> </pathconvert> - <exec executable="${ilasm.cmd} ${ilasm.infiles}" vmlauncher="no"> + <exec executable="${ilasm.cmd} {$ilasm.infiles}" vmlauncher="no"> <arg line="${ilasm.args}"/> </exec> </target> @@ -128,31 +142,18 @@ MSIL BUILD </filterset> </copy> <chmod perm="ugo+rx" dir="${msil.dir}/bin" includes="*-net*"/> - <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> + <jar destfile="${msil.dir}/lib/${comp.jar.name}"> + <fileset dir="${quick.dir}/lib/compiler"/> + <zipfileset src="${fjbg.jar}"/> + <zipfileset src="${msil.jar}"/> + </jar> + <jar destfile="${msil.dir}/lib/${lib.jar.name}"> + <fileset dir="${strap.dir}/lib/library"/> + <fileset dir="${strap.dir}/lib/actors"/> + </jar> </target> - <!--<target name="msil.dist" depends="msil.build"> + <target name="msil.dist" depends="msil.build"> <antcall target="binaries"/> <property name="dist.current.dir" value="${dist.dir}/scala-msil-${version.number}"/> <mkdir dir="${dist.current.dir}"/> @@ -166,7 +167,7 @@ MSIL BUILD <copy todir="${dist.current.dir}/lib"> <fileset dir="${dist.dir}/latest/lib" includes="scala*.jar"/> </copy> - <! Recreate the 'latest' link to point to this distribution + <!-- Recreate the 'latest' link to point to this distribution --> <if><isset property="os.win"/> <then> <copy todir="${dist.dir}/latest-msil"> @@ -180,7 +181,7 @@ MSIL BUILD overwrite="yes" failonerror="no"/> </else> </if> - </target>--> + </target> <!-- =========================================================================== CLEAN |