From 76068fd352c878614a4bf4edc13d83278487c854 Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@epfl.ch>
Date: Fri, 9 May 2008 07:36:20 +0000
Subject: added msil distribution to supersabbus

---
 build.xml          | 32 ++++++++++++++++++++++++--------
 src/build/msil.xml | 52 ++++++++++++++++++++++------------------------------
 src/build/pack.xml | 12 +++++++-----
 3 files changed, 53 insertions(+), 43 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">
@@ -929,12 +929,25 @@ 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)
 ============================================================================ -->
-  
-  <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>
   
diff --git a/src/build/msil.xml b/src/build/msil.xml
index 1244395cc3..9bdecba168 100644
--- a/src/build/msil.xml
+++ b/src/build/msil.xml
@@ -172,7 +172,8 @@ PACKED MSIL BUILD (MSIL-PACK)
         <filter token="NAME" value="Scala compiler"/>
       </filterset>
     </copy>
-    <chmod perm="ugo+rx" dir="${build-msil-pack.dir}/bin" includes="*-net*"/>
+    <chmod perm="ugo+rx" dir="${build-msil-pack.dir}/bin"
+           includes="scala*-net*" excludes="*.bat"/>
 
     <if>
       <isset property="os.win"/>
@@ -180,10 +181,10 @@ PACKED MSIL BUILD (MSIL-PACK)
         <copy todir="${build-msil-pack.dir}/lib">
           <fileset
               dir="${lib.dir}"
-              includes="mscorlib.dll scalaruntime.dll"/>
+              includes="mscorlib.dll,scalaruntime.dll"/>
           <fileset
               dir="${build-pack.dir}/lib"
-              includes="scala-compiler.jar scala-library.jar"/>
+              includes="scala-compiler.jar,scala-library.jar"/>
         </copy>
       </then>
       <else>
@@ -218,34 +219,25 @@ PACKED MSIL BUILD (MSIL-PACK)
 DISTRIBUTION
 ============================================================================ -->
 
-  <!--<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}"/>
-    <copy todir="${dist.current.dir}">
-      <fileset dir="${msil.dir}" includes="bin/**,lib/**"/>
-    </copy>
-    <chmod perm="ugo+rx" dir="${dist.current.dir}/bin" includes="*-net*"/>
-    <copy todir="${dist.current.dir}/lib">
-      <fileset dir="${lib.dir}" includes="*.dll"/>
+  <target name="msil-dist.start" depends="msil-pack.done"/>
+
+  <target name="msil-dist.lib" depends="msil-dist.start">
+    <!-- ${dist.dir} is set by the main build script -->
+    <copy toDir="${dist.dir}/lib">
+      <fileset dir="${build-msil-pack.dir}/lib"
+               includes="*.dll"/>
     </copy>
-    <copy todir="${dist.current.dir}/lib">
-      <fileset dir="${dist.dir}/latest/lib" includes="scala*.jar"/>
+  </target>
+
+  <target name="msil-dist.bin" depends="msil-dist.lib">
+    <copy toDir="${dist.dir}/bin">
+      <fileset dir="${build-msil-pack.dir}/bin"
+               includes="scala*-net*"/>
     </copy>
-    <! Recreate the 'latest' link to point to this distribution 
-    <if><isset property="os.win"/>
-      <then>
-        <copy todir="${dist.dir}/latest-msil">
-          <fileset dir="${dist.current.dir}"/>
-        </copy>
-      </then>
-      <else>
-        <symlink
-          link="${dist.dir}/latest-mono"
-          resource="${dist.current.dir}"
-          overwrite="yes" failonerror="no"/>
-      </else>
-    </if>
-  </target>-->
+    <chmod perm="ugo+rx" dir="${dist.dir}/bin"
+           includes="scala*-net*" excludes="*.bat"/>
+  </target>
+
+  <target name="msil-dist.done" depends="msil-dist.bin"/>
 
 </project>
diff --git a/src/build/pack.xml b/src/build/pack.xml
index de0aee7b0b..7fb51f674f 100644
--- a/src/build/pack.xml
+++ b/src/build/pack.xml
@@ -88,7 +88,9 @@ MAIN DISTRIBUTION SBAZ
       desc="The Scala developer tools. This contains everything that is required to write, test and document new Scala programs."
       depends="scala-library"
       link="${sbaz.universe}/scala-devel-${version.number}.sbp">
-      <binset dir="${dist.dir}/bin" includes="**"/>
+      <binset
+          dir="${dist.dir}/bin"
+          includes="scala,scala.bat,scalac,scalac.bat,scaladoc,scaladoc.bat,fsc,fsc.bat"/>
       <libset dir="${dist.dir}/lib" includes="scala-compiler.jar"/>
       <manset dir="${dist.dir}/man" includes="**"/>
       <srcset dir="${dist.dir}/src" includes="scala-compiler-src.jar"/>
@@ -126,15 +128,15 @@ MAIN DISTRIBUTION SBAZ
 
   <target name="pack-sbaz.msil" depends="pack-sbaz.doc">
    <sbaz
-      file="${dist.dir}/scala-msil-${version.number}.sbp"
-      adfile="${dist.dir}/scala-msil-${version.number}.advert"
+      file="${dists.dir}/sbaz/scala-msil-${version.number}.sbp"
+      adfile="${dists.dir}/sbaz/scala-msil-${version.number}.advert"
       name="scala-msil"
       version="${version.number}"
       desc="The Scala MSIL package contains everything needed to use Scala on .NET."
       depends="scala-library,scala-devel"
       link="${sbaz.universe}/scala-msil-${version.number}.sbp">
-      <binset dir="${quick.dir}/bin" includes="scala*net*"/>
-      <libset dir="${quick.dir}/lib" includes="*.dll"/>
+      <binset dir="${dist.dir}/bin" includes="scala*-net*"/>
+      <libset dir="${dist.dir}/lib" includes="*.dll"/>
     </sbaz>
   </target>
   
-- 
cgit v1.2.3