porting changes to scala.swing api from trunk

2 files changed, 10 insertions, 34 deletions

diff --git a/build.xml b/build.xml
index 57cb8f8c6d..fac88a862b 100644
--- a/build.xml
+++ b/build.xml
@@ -867,6 +867,7 @@ DOCUMENTATION
       <src>
         <files includes="${src.dir}/actors"/>
         <files includes="${src.dir}/library/scala"/>
+        <files includes="${src.dir}/swing"/>
       </src>
       <include name="**/*.scala"/>
       <exclude name="reflect/Code.scala"/>
@@ -926,28 +927,7 @@ DOCUMENTATION
     <touch file="${build-docs.dir}/manual.complete" verbose="no"/>
   </target>
 
-  <target name="docs.pre-swing" depends="docs.man">
-    <uptodate property="docs.swing.available" targetfile="${build-docs.dir}/swing.complete">
-      <srcfiles dir="${src.dir}/swing"/>
-    </uptodate>
-  </target>
-
-  <target name="docs.swing" depends="docs.pre-swing" unless="docs.swing.available">
-    <stopwatch name="docs.swing.timer"/>
-    <mkdir dir="${build-docs.dir}/swing"/>
-    <scaladoc
-      destdir="${build-docs.dir}/swing"
-      windowtitle="Scala Swing Library"
-      doctitle="Scala Swing ${version.number} API"
-      classpathref="pack.classpath"
-      srcdir="${src.dir}/swing">
-      <include name="**/*.scala"/>
-    </scaladoc>
-    <touch file="${build-docs.dir}/swing.complete" verbose="no"/>
-    <stopwatch name="docs.swing.timer" action="total"/>
-  </target>
-
-  <target name="docs.pre-comp" depends="docs.swing">
+  <target name="docs.pre-comp" depends="docs.man">
     <uptodate property="docs.comp.available" targetfile="${build-docs.dir}/compiler.complete">
       <srcfiles dir="${src.dir}/compiler"/>
     </uptodate>
@@ -968,7 +948,7 @@ DOCUMENTATION
     <stopwatch name="docs.comp.timer" action="total"/>
   </target>
 
-  <target name="docs.done" depends="docs.swing"/>
+  <target name="docs.done" depends="docs.man"/>
 
   <target name="docs.clean">
     <delete dir="${build-docs.dir}" includeemptydirs="yes" quiet="yes" failonerror="no"/>
@@ -1059,12 +1039,8 @@ DISTRIBUTION
     <copy toDir="${dist.dir}/doc/scala-devel-docs/tools">
       <fileset dir="${build-docs.dir}/manual/html"/>
     </copy>
-    <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>
+    <copy file="${src.dir}/swing/doc/README"
+          toFile="${dist.dir}/doc/scala-devel-docs/README.scala-swing"/>
   </target>
     
   <target name="dist.man" depends="dist.doc">
diff --git a/src/build/pack.xml b/src/build/pack.xml
index d0388e83d9..950b272644 100644
--- a/src/build/pack.xml
+++ b/src/build/pack.xml
@@ -36,15 +36,15 @@ MAIN DISTRIBUTION PACKAGING
     <checksum file="${dists.dir}/archives/scala-${version.number}.zip" fileext=".md5"/>
   </target>
 
-  <target name="pack-api.tar" depends="pack-archives.zip">
-    <tar destfile="${dists.dir}/archives/scala-${version.number}-api.tgz"
+  <target name="pack-devel-docs.tar" depends="pack-archives.zip">
+    <tar destfile="${dists.dir}/archives/scala-${version.number}-devel-docs.tgz"
          compression="gzip" longfile="gnu">
-      <tarfileset dir="${dist.dir}/doc/scala-devel-docs/api" prefix="scala-${version.number}-api"/>
+      <tarfileset dir="${dist.dir}/doc/scala-devel-docs" prefix="scala-${version.number}-devel-docs"/>
     </tar>
-    <checksum file="${dists.dir}/archives/scala-${version.number}-api.tgz" fileext=".md5"/>
+    <checksum file="${dists.dir}/archives/scala-${version.number}-devel-docs.tgz" fileext=".md5"/>
   </target>
   
-  <target name="pack-archives.src" depends="pack-api.tar">
+  <target name="pack-archives.src" depends="pack-devel-docs.tar">
     <tar destfile="${dists.dir}/archives/scala-${version.number}-sources.tgz"
          compression="gzip" longfile="gnu">
       <tarfileset dir="${basedir}" prefix="scala-${version.number}-sources">