summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@epfl.ch>2008-05-09 07:36:20 +0000
committerLukas Rytz <lukas.rytz@epfl.ch>2008-05-09 07:36:20 +0000
commit76068fd352c878614a4bf4edc13d83278487c854 (patch)
treecfcfd89ff34df4a72a1f772094e880a98dfff1b6 /build.xml
parent0f09ba97e71daedf80a508d0af3d09893d9d172f (diff)
downloadscala-76068fd352c878614a4bf4edc13d83278487c854.tar.gz
scala-76068fd352c878614a4bf4edc13d83278487c854.tar.bz2
scala-76068fd352c878614a4bf4edc13d83278487c854.zip
added msil distribution to supersabbus
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml32
1 files changed, 24 insertions, 8 deletions
diff --git a/build.xml b/build.xml
index 16b8534820..d3389aa526 100644
--- a/build.xml
+++ b/build.xml
@@ -904,7 +904,7 @@ DISTRIBUTION
<fileset dir="${docs.dir}/man"/>
</copy>
</target>
-
+
<target name="dist.src" depends="dist.man">
<mkdir dir="${dist.dir}/src"/>
<jar destfile="${dist.dir}/src/scala-library-src.jar">
@@ -930,11 +930,24 @@ DISTRIBUTION
</target>
<!-- ===========================================================================
+DEPENDENCIES DISTRIBUTIONS
+============================================================================ -->
+
+ <target name="dist-deps.start" depends="dist.done"/>
+
+ <target name="dist-deps.msil" depends="dist-deps.start">
+ <ant antfile="${src.dir}/build/msil.xml" target="msil-dist.done"
+ inheritall="yes" inheritrefs="yes"/>
+ </target>
+
+ <target name="dist-deps.done" depends="dist-deps.msil"/>
+
+<!-- ===========================================================================
TEST AND DISTRIBUTION BUNDLE (ALL)
============================================================================ -->
-
- <target name="all.done" depends="dist.done, test.done"/>
-
+
+ <target name="all.done" depends="dist-deps.done, test.done"/>
+
<target name="all.clean" depends="locker.clean, docs.clean, dist.clean"/>
<!-- ===========================================================================
@@ -991,11 +1004,14 @@ FORWARDED TARGETS FOR JVM 1.4 BUILD
<!-- ===========================================================================
FORWARDED TARGETS FOR MSIL BUILD
============================================================================ -->
-
- <target name="msil" depends="pack.done">
+
+ <target name="msil" depends="msil-pack.done"
+ description="Builds the Scala-MSIL package. Executables are in 'build/msil-pack/bin'."/>
+
+ <target name="msil-pack.done" depends="pack.done">
<ant antfile="${src.dir}/build/msil.xml" target="msil-pack.done" inheritall="yes" inheritrefs="yes"/>
</target>
-
+
<target name="msilclean">
<ant antfile="${src.dir}/build/msil.xml" target="msil.clean" inheritall="yes" inheritrefs="yes"/>
</target>
@@ -1004,7 +1020,7 @@ FORWARDED TARGETS FOR MSIL BUILD
FORWARDED TARGETS FOR PACKAGING
============================================================================ -->
- <target name="distpack" depends="dist.done">
+ <target name="distpack" depends="dist-deps.done">
<ant antfile="${src.dir}/build/pack.xml" target="pack-all.done" inheritall="yes" inheritrefs="yes"/>
</target>