natas_hw
/
legacy-svn-scala
mirror of https://github.com/scala/legacy-svn-scala
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added proper msil packaging 

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@14962 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
rytz 2008-05-09 10:28:21 +00:00
parent 0ea8155184
commit e31431fa9a
4 changed files with 117 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
build.xml
View File

@ -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

2
src/build/four.xml
View File

@ -340,7 +340,7 @@ DISTRIBUTION
<symlink link="${dists.dir}/latest-jvm4" resource="${four-dist.dir}" overwrite="yes"/>
</target>
<target name="four-dist.done" depends="four-dist.src"/>
<target name="four-dist.done" depends="four-dist.latest"/>
<!-- ===========================================================================
TEST AND DISTRIBUTION BUNDLE (ALL)

49
src/build/msil.xml
View File

@ -118,7 +118,7 @@ MSIL BUILD
<include name="**/*.scala"/>
<exclude name="scala/ScalaObject.scala"/>
</scalac>
<stopwatch name="four.lib.timer" action="total"/>
<stopwatch name="msil.lib.timer" action="total"/>
</target>
<target name="msil.done" depends="msil.lib"/>
@ -214,30 +214,65 @@ PACKED MSIL BUILD (MSIL-PACK)
<delete dir="${build-msil-pack.dir}" includeemptydirs="yes" quiet="yes" failonerror="no"/>
</target>
<!-- ===========================================================================
DOCUMENTATION
============================================================================ -->
<!-- see four.xml for template -->
<target name="msil-docs.done"/>
<target name="msil-docs.clean"/>
<!-- ===========================================================================
BOOTRAPING TEST AND TEST SUITE
============================================================================ -->
<!-- see four.xml for template -->
<target name="msil-test.done"/>
<!-- ===========================================================================
DISTRIBUTION
============================================================================ -->
<target name="msil-dist.start" depends="msil-pack.done"/>
<target name="msil-dist.start" depends="msil-pack.done">
<property name="msil-dist.dir" value="${dists.dir}/scala-msil-${version.number}"/>
</target>
<target name="msil-dist.lib" depends="msil-dist.start">
<!-- ${dist.dir} is set by the main build script -->
<copy toDir="${dist.dir}/lib">
<mkdir dir="${msil-dist.dir}/lib"/>
<copy toDir="${msil-dist.dir}/lib">
<fileset dir="${build-msil-pack.dir}/lib"
includes="*.dll"/>
<fileset dir="${build-msil-pack.dir}/lib"
includes="scala-compiler.jar,scala-library.jar"/>
</copy>
</target>
<target name="msil-dist.bin" depends="msil-dist.lib">
<copy toDir="${dist.dir}/bin">
<mkdir dir="${msil-dist.dir}/bin"/>
<copy toDir="${msil-dist.dir}/bin">
<fileset dir="${build-msil-pack.dir}/bin"
includes="scala*-net*"/>
</copy>
<chmod perm="ugo+rx" dir="${dist.dir}/bin"
<chmod perm="ugo+rx" dir="${msil-dist.dir}/bin"
includes="scala*-net*" excludes="*.bat"/>
</target>
<target name="msil-dist.done" depends="msil-dist.bin"/>
<target name="msil-dist.latest" depends="msil-dist.bin" unless="os.win">
<symlink link="${dists.dir}/latest-msil" resource="${msil-dist.dir}" overwrite="yes"/>
</target>
<target name="msil-dist.done" depends="msil-dist.latest"/>
<!-- ===========================================================================
TEST AND DISTRIBUTION BUNDLE (ALL)
============================================================================ -->
<target name="msil-all.done" depends="msil-dist.done, msil-test.done"/>
<target name="msil-all.clean" depends="msil-docs.clean, msil.clean"/>
</project>

71
src/build/pack.xml
View File

@ -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"
@ -181,6 +167,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
============================================================================ -->