summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@epfl.ch>2008-08-12 15:38:03 +0000
committerLukas Rytz <lukas.rytz@epfl.ch>2008-08-12 15:38:03 +0000
commit28e36e9a74b0120f4f105e204571470036c986f7 (patch)
tree1c2c7dfa80b235a65e22b736a9f96e4bd8f14198
parent5ce0e339c453d8369fd22a2b264d691ca21a0ce0 (diff)
downloadscala-28e36e9a74b0120f4f105e204571470036c986f7.tar.gz
scala-28e36e9a74b0120f4f105e204571470036c986f7.tar.bz2
scala-28e36e9a74b0120f4f105e204571470036c986f7.zip
adapted dist directory structure to match the o...
adapted dist directory structure to match the one of a sbaz (downloadable) distribution
-rw-r--r--build.xml26
-rw-r--r--src/build/pack.xml2
2 files changed, 14 insertions, 14 deletions
diff --git a/build.xml b/build.xml
index e55d9b476f..0ff03922fc 100644
--- a/build.xml
+++ b/build.xml
@@ -1018,25 +1018,25 @@ DISTRIBUTION
<target name="dist.latest" depends="dist.latest.unix,dist.latest.win"/>
<target name="dist.doc" depends="dist.latest">
- <mkdir dir="${dist.dir}/doc/scala"/>
- <copy file="${docs.dir}/LICENSE" toDir="${dist.dir}/doc/scala"/>
- <copy file="${docs.dir}/README" toDir="${dist.dir}/doc/scala"/>
- <mkdir dir="${dist.dir}/doc/scala/api"/>
- <copy toDir="${dist.dir}/doc/scala/api">
+ <mkdir dir="${dist.dir}/doc/scala-devel-docs"/>
+ <copy file="${docs.dir}/LICENSE" toDir="${dist.dir}/doc/scala-devel-docs"/>
+ <copy file="${docs.dir}/README" toDir="${dist.dir}/doc/scala-devel-docs"/>
+ <mkdir dir="${dist.dir}/doc/scala-devel-docs/api"/>
+ <copy toDir="${dist.dir}/doc/scala-devel-docs/api">
<fileset dir="${build-docs.dir}/library"/>
</copy>
- <mkdir dir="${dist.dir}/doc/scala/examples"/>
- <copy toDir="${dist.dir}/doc/scala/examples">
+ <mkdir dir="${dist.dir}/doc/scala-devel-docs/examples"/>
+ <copy toDir="${dist.dir}/doc/scala-devel-docs/examples">
<fileset dir="${docs.dir}/examples"/>
</copy>
- <mkdir dir="${dist.dir}/doc/scala/tools"/>
- <copy toDir="${dist.dir}/doc/scala/tools">
+ <mkdir dir="${dist.dir}/doc/scala-devel-docs/tools"/>
+ <copy toDir="${dist.dir}/doc/scala-devel-docs/tools">
<fileset dir="${build-docs.dir}/manual/html"/>
</copy>
- <mkdir dir="${dist.dir}/doc/scala/swing"/>
- <copy file="${src.dir}/swing/doc/README" toDir="${dist.dir}/doc/scala/swing"/>
- <mkdir dir="${dist.dir}/doc/scala/swing/api"/>
- <copy toDir="${dist.dir}/doc/scala/swing/api">
+ <mkdir dir="${dist.dir}/doc/scala-devel-docs/swing"/>
+ <copy file="${src.dir}/swing/doc/README" toDir="${dist.dir}/doc/scala-devel-docs/swing"/>
+ <mkdir dir="${dist.dir}/doc/scala-devel-docs/swing/api"/>
+ <copy toDir="${dist.dir}/doc/scala-devel-docs/swing/api">
<fileset dir="${build-docs.dir}/swing"/>
</copy>
</target>
diff --git a/src/build/pack.xml b/src/build/pack.xml
index 6173791bed..3216d50ce9 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/scala"/>
+ <docset dir="${dist.dir}/doc/scala-devel-docs"/>
</sbaz>
</target>