summaryrefslogtreecommitdiff
path: root/src/build
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@epfl.ch>2008-08-12 11:00:53 +0000
committerLukas Rytz <lukas.rytz@epfl.ch>2008-08-12 11:00:53 +0000
commit13fddf993cb528a32a29e28986630462f5a5fcd5 (patch)
tree9b004f47bd3c50cf6859017ee81deec9cc0dc5a2 /src/build
parent4f81ca5702998dd1e2a5bf8adce9df655b43fab9 (diff)
downloadscala-13fddf993cb528a32a29e28986630462f5a5fcd5.tar.gz
scala-13fddf993cb528a32a29e28986630462f5a5fcd5.tar.bz2
scala-13fddf993cb528a32a29e28986630462f5a5fcd5.zip
json parser builds on jvm14.
Diffstat (limited to 'src/build')
-rw-r--r--src/build/pack.xml30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/build/pack.xml b/src/build/pack.xml
index 4cf560e978..aeb1b2c971 100644
--- a/src/build/pack.xml
+++ b/src/build/pack.xml
@@ -122,7 +122,7 @@ MAIN DISTRIBUTION SBAZ
version="${version.number}"
desc="The Scala developer documentation. This contains all developer documentation."
link="${sbaz.universe}/scala-devel-docs-${version.number}.sbp">
- <docset dir="${dist.dir}/doc"/>
+ <docset dir="${dist.dir}/doc/scala"/>
</sbaz>
</target>
@@ -149,20 +149,20 @@ JAVA FOUR DISTRIBUTION PACKAGING
</target>
<target name="fourpack-archives.tar" depends="fourpack-archives.start">
- <tar destfile="${dists.dir}/archives/scala-jvm4-${version.number}.tgz" compression="gzip">
- <tarfileset dir="${dists.dir}/scala-jvm4-${version.number}" prefix="scala-jvm4-${version.number}"
+ <tar destfile="${dists.dir}/archives/scala-${version.number}-jvm4.tgz" compression="gzip">
+ <tarfileset dir="${dists.dir}/scala-jvm4-${version.number}" prefix="scala-${version.number}-jvm4"
includes="bin/**" mode="755"/>
- <tarfileset dir="${dists.dir}/scala-jvm4-${version.number}" prefix="scala-jvm4-${version.number}"
+ <tarfileset dir="${dists.dir}/scala-jvm4-${version.number}" prefix="scala-${version.number}-jvm4"
excludes="bin/**"/>
</tar>
- <checksum file="${dists.dir}/archives/scala-jvm4-${version.number}.tgz" fileext=".md5"/>
+ <checksum file="${dists.dir}/archives/scala-${version.number}-jvm4.tgz" fileext=".md5"/>
</target>
<target name="fourpack-archives.zip" depends="fourpack-archives.tar">
- <zip destfile="${dists.dir}/archives/scala-jvm4-${version.number}.zip">
- <zipfileset dir="${dists.dir}/scala-jvm4-${version.number}" prefix="scala-jvm4-${version.number}"/>
+ <zip destfile="${dists.dir}/archives/scala-${version.number}-jvm4.zip">
+ <zipfileset dir="${dists.dir}/scala-jvm4-${version.number}" prefix="scala-${version.number}-jvm4"/>
</zip>
- <checksum file="${dists.dir}/archives/scala-jvm4-${version.number}.zip" fileext=".md5"/>
+ <checksum file="${dists.dir}/archives/scala-${version.number}-jvm4.zip" fileext=".md5"/>
</target>
<target name="fourpack-archives.done" depends="fourpack-archives.zip"/>
@@ -178,22 +178,22 @@ MSIL DISTRIBUTION PACKAGING
</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}"
+ <tar destfile="${dists.dir}/archives/scala-${version.number}-msil.tgz" compression="gzip">
+ <tarfileset dir="${dists.dir}/scala-msil-${version.number}" prefix="scala-${version.number}-msil"
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}"
+ <tarfileset dir="${dists.dir}/scala-msil-${version.number}" prefix="scala-${version.number}-msil"
includes="lib/*.dll"/>
</tar>
- <checksum file="${dists.dir}/archives/scala-msil-${version.number}.tgz" fileext=".md5"/>
+ <checksum file="${dists.dir}/archives/scala-${version.number}-msil.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}"
+ <zip destfile="${dists.dir}/archives/scala-${version.number}-msil.zip">
+ <zipfileset dir="${dists.dir}/scala-msil-${version.number}" prefix="scala-${version.number}-msil"
includes="bin/**,lib/*.dll"/>
</zip>
- <checksum file="${dists.dir}/archives/scala-msil-${version.number}.zip" fileext=".md5"/>
+ <checksum file="${dists.dir}/archives/scala-${version.number}-msil.zip" fileext=".md5"/>
</target>
<target name="msilpack-archives.done" depends="msilpack-archives.zip"/>