From 914e09a4a3e632e34414b2e0749d96e1dd58e6b8 Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@epfl.ch>
Date: Fri, 9 May 2008 10:28:21 +0000
Subject: added proper msil packaging

---
 build.xml | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 92bbee4acb..329648267b 100644
--- a/build.xml
+++ b/build.xml
@@ -929,19 +929,6 @@ DISTRIBUTION
     <delete dir="${dists.dir}" includeemptydirs="yes" quiet="yes" failonerror="no"/>
   </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)
 ============================================================================ -->
@@ -1005,15 +992,19 @@ FORWARDED TARGETS FOR JVM 1.4 BUILD
 FORWARDED TARGETS FOR MSIL BUILD
 ============================================================================ -->
 
-  <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">
+  <target name="msil" depends="pack.done"
+          description="Builds the Scala-MSIL package. Executables are in 'build/msil-pack/bin'.">
     <ant antfile="${src.dir}/build/msil.xml" target="msil-pack.done" inheritall="yes" inheritrefs="yes"/>
   </target>
 
+  <target name="msiltest"/>
+
+  <target name="msildist" depends="pack.done">
+    <ant antfile="${src.dir}/build/msil.xml" target="msil-all.done" inheritall="yes" inheritrefs="yes"/>
+  </target>
+
   <target name="msilclean">
-    <ant antfile="${src.dir}/build/msil.xml" target="msil.clean" inheritall="yes" inheritrefs="yes"/>
+    <ant antfile="${src.dir}/build/msil.xml" target="msil-all.clean" inheritall="yes" inheritrefs="yes"/>
   </target>
 
 <!-- ===========================================================================
@@ -1028,6 +1019,10 @@ FORWARDED TARGETS FOR PACKAGING
     <ant antfile="${src.dir}/build/pack.xml" target="fourpack-all.done" inheritall="yes" inheritrefs="yes"/>
   </target>
 
+  <target name="msildistpack" depends="msildist">
+    <ant antfile="${src.dir}/build/pack.xml" target="msilpack-all.done" inheritall="yes" inheritrefs="yes"/>
+  </target>
+
 <!-- ===========================================================================
 FORWARDED TARGETS FOR NIGHTLY BUILDS
 ============================================================================ -->
@@ -1040,8 +1035,11 @@ FORWARDED TARGETS FOR NIGHTLY BUILDS
     <ant antfile="${src.dir}/build/four.xml" target="four-all.done" inheritall="yes" inheritrefs="yes"/>
     <ant antfile="${src.dir}/build/pack.xml" target="fourpack-all.done" inheritall="yes" inheritrefs="yes"/>
   </target>
-  
-  <target name="msilnightly"/>
+
+  <target name="msilnightly" depends="pack.done">
+    <ant antfile="${src.dir}/build/four.xml" target="msil-all.done" inheritall="yes" inheritrefs="yes"/>
+    <ant antfile="${src.dir}/build/pack.xml" target="msilpack-all.done" inheritall="yes" inheritrefs="yes"/>
+  </target>
 
 <!-- ===========================================================================
 MISCELLANEOUS
-- 
cgit v1.2.3