added proper msil packaging

1 files changed, 56 insertions, 15 deletions

diff --git a/src/build/pack.xml b/src/build/pack.xml
index 7fb51f674f..4cf560e978 100644
--- a/src/build/pack.xml
+++ b/src/build/pack.xml
@@ -126,21 +126,7 @@ MAIN DISTRIBUTION SBAZ
     </sbaz>
   </target>
 
-  <target name="pack-sbaz.msil" depends="pack-sbaz.doc">
-   <sbaz
-      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="${dist.dir}/bin" includes="scala*-net*"/>
-      <libset dir="${dist.dir}/lib" includes="*.dll"/>
-    </sbaz>
-  </target>
-  
-  <target name="pack-sbaz.all" depends="pack-sbaz.msil">
+  <target name="pack-sbaz.all" depends="pack-sbaz.doc">
     <sbaz
       file="${dists.dir}/sbaz/scala-${version.number}.sbp"
       adfile="${dists.dir}/sbaz/scala-${version.number}.advert"
@@ -182,6 +168,59 @@ JAVA FOUR DISTRIBUTION PACKAGING
   <target name="fourpack-archives.done" depends="fourpack-archives.zip"/>
 
 <!-- ===========================================================================
+MSIL DISTRIBUTION PACKAGING
+============================================================================ -->
+
+  <!-- MSIL Archive -->
+
+  <target name="msilpack-archives.start">
+    <mkdir dir="${dists.dir}/archives"/>
+  </target>
+
+  <target name="msilpack-archives.tar" depends="msilpack-archives.start">
+    <tar destfile="${dists.dir}/archives/scala-msil-${version.number}.tgz" compression="gzip">
+      <tarfileset dir="${dists.dir}/scala-msil-${version.number}" prefix="scala-msil-${version.number}"
+        includes="bin/**" mode="755"/>
+      <!-- Inlcude only dll's. Using scala-msil depends on having a scala distribution -->
+      <tarfileset dir="${dists.dir}/scala-msil-${version.number}" prefix="scala-msil-${version.number}"
+        includes="lib/*.dll"/>
+    </tar>
+    <checksum file="${dists.dir}/archives/scala-msil-${version.number}.tgz" fileext=".md5"/>
+  </target>
+
+  <target name="msilpack-archives.zip" depends="msilpack-archives.tar">
+    <zip destfile="${dists.dir}/archives/scala-msil-${version.number}.zip">
+      <zipfileset dir="${dists.dir}/scala-msil-${version.number}" prefix="scala-msil-${version.number}"
+        includes="bin/**,lib/*.dll"/>
+    </zip>
+    <checksum file="${dists.dir}/archives/scala-msil-${version.number}.zip" fileext=".md5"/>
+  </target>
+  
+  <target name="msilpack-archives.done" depends="msilpack-archives.zip"/>
+
+  <!-- MSIL Sbaz package -->
+
+  <target name="msilpack-sbaz.start">
+    <mkdir dir="${dists.dir}/sbaz"/>
+  </target>
+
+  <target name="msilpack-sbaz.msil" depends="msilpack-sbaz.start">
+   <sbaz
+      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="${dists.dir}/scala-msil-${version.number}/bin" includes="scala*-net*"/>
+      <libset dir="${dists.dir}/scala-msil-${version.number}/lib" includes="*.dll"/>
+    </sbaz>
+  </target>
+
+  <target name="msilpack-sbaz.done" depends="msilpack-sbaz.msil"/>
+
+<!-- ===========================================================================
 MISCELLANEOUS
 ============================================================================ -->
   
@@ -189,6 +228,8 @@ MISCELLANEOUS
   
   <target name="fourpack-all.done" depends="fourpack-archives.done"/>
 
+  <target name="msilpack-all.done" depends="msilpack-archives.done, msilpack-sbaz.done"/>
+
 <!-- ===========================================================================
 MISCELLANEOUS
 ============================================================================ -->