Merge pull request #3050 from retronym/topic/docs-skip-take-two

Ant labour: osgi uptodate checking and better doc skipping 

3 files changed, 87 insertions, 71 deletions

diff --git a/build.xml b/build.xml
index cb159b6c9e..d28b2f209c 100755
--- a/build.xml
+++ b/build.xml
@@ -1475,6 +1475,10 @@ TODO:
       <srcfiles dir="${basedir}">
         <include name="build.xml"/>
         <include name="src/build/bnd/*.bnd"/>
+        <include name="${build-pack.dir}/lib/*.jar"/>
+      </srcfiles>
+      <srcfiles dir="${build-pack.dir}">
+        <include name="**/*"/>
       </srcfiles>
     </uptodate>
 
@@ -1779,41 +1783,43 @@ TODO:
       <do>
         <stopwatch name="docs.lib.timer"/>
         <mkdir dir="${build-docs.dir}/library"/>
-        <!-- last three attributes not supported by staged-docs: -->
-        <scaladoc
-          destdir="${build-docs.dir}/library"
-          doctitle="Scala Standard Library API (Scaladoc)"
-          docversion="${version.number}"
-          docsourceurl="${scaladoc.url}€{FILE_PATH}.scala#L1"
-          sourcepath="${src.dir}"
-          classpathref="docs.compiler.path"
-          addparams="${scalac.args.all}"
-          docRootContent="${src.dir}/library/rootdoc.txt"
-          implicits="on"
-          diagrams="on"
-          groups="on"
-          rawOutput="${scaladoc.raw.output}"
-          noPrefixes="${scaladoc.no.prefixes}"
-          docfooter="epfl"
-          docUncompilable="${src.dir}/library-aux"
-          skipPackages="scala.reflect.macros.internal:scala.reflect.internal:scala.reflect.io:scala.concurrent.impl">
-          <src>
-            <files includes="${src.dir}/actors"/>
-            <files includes="${src.dir}/library"/>
-            <files includes="${src.dir}/reflect"/>
-            <files includes="${src.dir}/swing"/>
-            <files includes="${src.dir}/continuations/library"/>
-          </src>
-          <include name="**/*.scala"/>
-          <exclude name="reflect/Code.scala"/>
-          <exclude name="reflect/Print.scala"/>
-          <exclude name="reflect/Symbol.scala"/>
-          <exclude name="reflect/Tree.scala"/>
-          <exclude name="reflect/Type.scala"/>
-          <exclude name="runtime/*$.scala"/>
-          <exclude name="runtime/ScalaRunTime.scala"/>
-          <exclude name="runtime/StringAdd.scala"/>
-        </scaladoc>
+        <if><not><isset property="docs.skip"/></not><then>
+          <!-- last three attributes not supported by staged-docs: -->
+          <scaladoc
+            destdir="${build-docs.dir}/library"
+            doctitle="Scala Standard Library API (Scaladoc)"
+            docversion="${version.number}"
+            docsourceurl="${scaladoc.url}€{FILE_PATH}.scala#L1"
+            sourcepath="${src.dir}"
+            classpathref="docs.compiler.path"
+            addparams="${scalac.args.all}"
+            docRootContent="${src.dir}/library/rootdoc.txt"
+            implicits="on"
+            diagrams="on"
+            groups="on"
+            rawOutput="${scaladoc.raw.output}"
+            noPrefixes="${scaladoc.no.prefixes}"
+            docfooter="epfl"
+            docUncompilable="${src.dir}/library-aux"
+            skipPackages="scala.reflect.macros.internal:scala.reflect.internal:scala.reflect.io:scala.concurrent.impl">
+            <src>
+              <files includes="${src.dir}/actors"/>
+              <files includes="${src.dir}/library"/>
+              <files includes="${src.dir}/reflect"/>
+              <files includes="${src.dir}/swing"/>
+              <files includes="${src.dir}/continuations/library"/>
+            </src>
+            <include name="**/*.scala"/>
+            <exclude name="reflect/Code.scala"/>
+            <exclude name="reflect/Print.scala"/>
+            <exclude name="reflect/Symbol.scala"/>
+            <exclude name="reflect/Tree.scala"/>
+            <exclude name="reflect/Type.scala"/>
+            <exclude name="runtime/*$.scala"/>
+            <exclude name="runtime/ScalaRunTime.scala"/>
+            <exclude name="runtime/StringAdd.scala"/>
+          </scaladoc>
+        </then></if>
         <stopwatch name="docs.lib.timer" action="total"/>
       </do>
     </staged-uptodate>
@@ -1862,7 +1868,7 @@ TODO:
           srcdir="${build-docs.dir}/manual/genman"
           destdir="${build-docs.dir}/manual/man"
           eol="unix" includes="**/*.1"/>
-        <copy todir="${build-docs.dir}/manual/html">
+        <copy todir="${build-docs.dir}/manual/html" overwrite="true">
           <fileset dir="${src.dir}/manual/scala/tools/docutil/resources">
             <include name="**/*.html"/>
             <include name="**/*.css"/>
@@ -1887,7 +1893,7 @@ TODO:
       <attribute name="name" />
       <sequential>
         <copy file="${build-osgi.dir}/org.scala-lang.@{name}.jar"
-          tofile="${dist.dir}/lib/@{name}.jar"/>
+          tofile="${dist.dir}/lib/@{name}.jar" overwrite="true"/>
       </sequential>
     </macrodef>
     <macrodef name="copy-plugin-bundle">
@@ -1895,19 +1901,19 @@ TODO:
       <sequential>
         <copy file="${build-osgi.dir}/org.scala-lang.plugins.@{name}.jar"
           tofile="${dist.dir}/misc/scala-devel/plugins/@{name}.jar"
-          overwrite="yes"/>
+          overwrite="true"/>
       </sequential>
     </macrodef>
 
     <mkdir dir="${dist.dir}/lib"/>
-    <copy toDir="${dist.dir}/lib">
+    <copy toDir="${dist.dir}/lib" overwrite="true">
       <fileset dir="${build-pack.dir}/lib">
         <include name="scalap.jar"/>
       </fileset>
     </copy>
 
     <!-- TODO -->
-    <copy todir="${dist.dir}/lib">
+    <copy todir="${dist.dir}/lib" overwrite="true">
       <resources refid="repl.fileset"/>
       <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper"
               from="${repl.deps.versions}" to="flatten"/>
@@ -1922,7 +1928,7 @@ TODO:
     <copy-bundle name="scala-swing"/>
     <copy-bundle name="scala-actors"/>
     <copy-bundle name="scala-compiler"/>
-    <copy toDir="${dist.dir}/bin">
+    <copy toDir="${dist.dir}/bin" overwrite="true">
       <fileset dir="${build-pack.dir}/bin"/>
     </copy>
     <chmod perm="ugo+rx" file="${dist.dir}/bin/scala"/>
@@ -1936,34 +1942,35 @@ TODO:
 
   <target name="dist.doc" depends="dist.base, docs.done">
     <mkdir dir="${dist.dir}/doc/scala-devel-docs"/>
-    <copy toDir="${dist.dir}/doc/scala-devel-docs">
+    <copy toDir="${dist.dir}/doc/scala-devel-docs" overwrite="true">
       <file file="${scala-xml-javadoc}"/>
       <file file="${scala-parser-combinators-javadoc}"/>
     </copy>
 
-    <copy file="${docs.dir}/LICENSE" toDir="${dist.dir}/doc"/>
-    <copy file="${docs.dir}/README" toDir="${dist.dir}/doc"/>
+    <copy file="${docs.dir}/LICENSE" toDir="${dist.dir}/doc" overwrite="true"/>
+    <copy file="${docs.dir}/README" toDir="${dist.dir}/doc" overwrite="true"/>
     <mkdir dir="${dist.dir}/doc/scala-devel-docs/api"/>
-    <copy toDir="${dist.dir}/doc/scala-devel-docs/api">
+    <copy toDir="${dist.dir}/doc/scala-devel-docs/api" overwrite="true">
       <fileset dir="${build-docs.dir}/library"/>
     </copy>
     <mkdir dir="${dist.dir}/doc/scala-devel-docs/examples"/>
-    <copy toDir="${dist.dir}/doc/scala-devel-docs/examples">
+    <copy toDir="${dist.dir}/doc/scala-devel-docs/examples" overwrite="true">
       <fileset dir="${docs.dir}/examples">
         <exclude name="**/*.desired.sha1"/>
       </fileset>
     </copy>
     <mkdir dir="${dist.dir}/doc/scala-devel-docs/tools"/>
-    <copy toDir="${dist.dir}/doc/scala-devel-docs/tools">
+    <copy toDir="${dist.dir}/doc/scala-devel-docs/tools" overwrite="true">
       <fileset dir="${build-docs.dir}/manual/html"/>
     </copy>
     <copy file="${src.dir}/swing/doc/README"
-          toFile="${dist.dir}/doc/scala-devel-docs/README.scala-swing"/>
+          toFile="${dist.dir}/doc/scala-devel-docs/README.scala-swing"
+          overwrite="true"/>
   </target>
 
   <target name="dist.man" depends="dist.base">
     <mkdir dir="${dist.dir}/man"/>
-    <copy toDir="${dist.dir}/man">
+    <copy toDir="${dist.dir}/man" overwrite="true">
       <fileset dir="${build-docs.dir}/manual/man"/>
     </copy>
   </target>
@@ -1994,7 +2001,7 @@ TODO:
 
   <target name="dist.src" depends="dist.base">
     <mkdir dir="${dist.dir}/src"/>
-    <copy toDir="${dist.dir}/src">
+    <copy toDir="${dist.dir}/src" overwrite="true">
       <file file="${scala-xml-sources}"/>
       <file file="${scala-parser-combinators-sources}"/>
     </copy>
@@ -2034,7 +2041,7 @@ TODO:
 
   <target name="dist.partial" depends="dist.base">
     <if><not><os family="windows"/></not><then>
-      <symlink link="${dists.dir}/latest" resource="${dist.name}" overwrite="yes"/>
+      <symlink link="${dists.dir}/latest" resource="${dist.name}" overwrite="true"/>
     </then><else> <!-- XXX THIS PROBABLY DOES NOT WORK: copying must happen last during dist.done! is this guaranteed? -->
       <copydir dest="${dists.dir}/latest" src="${dist.dir}"/>
     </else></if>
@@ -2064,7 +2071,7 @@ TODO:
   </target>
 
   <target name="starr.jars" depends="starr.start">
-    <copy toDir="${lib.dir}" overwrite="yes">
+    <copy toDir="${lib.dir}" overwrite="true">
       <fileset dir="${build-pack.dir}/lib">
         <include name="scala-library.jar"/>
         <include name="scala-reflect.jar"/>
diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml
index 946b712b6c..fbd6d4cd51 100644
--- a/src/build/maven/maven-deploy.xml
+++ b/src/build/maven/maven-deploy.xml
@@ -74,12 +74,21 @@
               <artifact:attach type="jar" file="${path}-docs.jar" classifier="javadoc" />
             </artifact:deploy>
           </then><else>
-            <artifact:install file="${path}.jar">
-              <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
-              <artifact:pom refid="@{name}.pom" />
-              <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
-              <artifact:attach type="jar" file="${path}-docs.jar" classifier="javadoc" />
-            </artifact:install>
+            <if><isset property="docs.skip"/><then>
+               <artifact:install file="${path}.jar">
+                 <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
+                 <artifact:pom refid="@{name}.pom" />
+                 <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
+               </artifact:install>
+            </then>
+            <else>
+              <artifact:install file="${path}.jar">
+                <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
+                <artifact:pom refid="@{name}.pom" />
+                <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
+              </artifact:install>
+            </else>
+            </if>
           </else></if>
         </then><else>
           <local name="repo"/>
diff --git a/src/build/pack.xml b/src/build/pack.xml
index ed628726fb..4c5ba228fc 100644
--- a/src/build/pack.xml
+++ b/src/build/pack.xml
@@ -56,7 +56,7 @@ MAIN DISTRIBUTION PACKAGING
     <checksum file="${dists.dir}/archives/${dist.name}.zip" fileext=".md5"/>
   </target>
 
-  <target name="pack-devel-docs.tar" depends="pack-archives.zip">
+  <target name="pack-devel-docs.tar" depends="pack-archives.zip" unless="docs.skip">
     <tar destfile="${dists.dir}/archives/${dist.name}-devel-docs.tar"
          compression="none" longfile="gnu">
       <tarfileset dir="${dist.dir}/doc/scala-devel-docs" prefix="${dist.name}-devel-docs"/>
@@ -119,11 +119,11 @@ MAIN DISTRIBUTION PACKAGING
         `resource` is relative to directory of `link` -->
     <symlink link="${dists.dir}/archives/scala-latest-sources.tgz"
              resource="scala-${version.number}-sources.tgz"
-             overwrite="yes"/>
+             overwrite="true"/>
   </target>
 
   <target name="pack-archives.latest.win" depends="pack-archives.src" if="os.win">
-    <copy tofile="${dists.dir}/archives/scala-latest-sources.tgz">
+    <copy tofile="${dists.dir}/archives/scala-latest-sources.tgz" overwrite="true">
       <fileset dir="${dists.dir}/archives">
          <include name="scala-${version.number}-sources.tgz"/>
       </fileset>
@@ -141,7 +141,7 @@ MAIN DISTRIBUTION PACKAGING
       <attribute name="mvn.artifact.name"/>
       <sequential>
         <mkdir dir="${dists.dir}/maven/${version.number}/@{mvn.artifact.name}"/>
-        <copy todir="${dists.dir}/maven/${version.number}/@{mvn.artifact.name}">
+        <copy verbose="true" overwrite="true" todir="${dists.dir}/maven/${version.number}/@{mvn.artifact.name}">
           <fileset dir="${dist.dir}/lib/">
             <filename name="@{mvn.artifact.name}.jar"/>
           </fileset>
@@ -167,7 +167,7 @@ MAIN DISTRIBUTION PACKAGING
       <attribute name="mvn.artifact.name"/>
       <sequential>
         <mkdir dir="${dists.dir}/maven/${version.number}/plugins/@{mvn.artifact.name}"/>
-        <copy todir="${dists.dir}/maven/${version.number}/plugins/@{mvn.artifact.name}">
+        <copy todir="${dists.dir}/maven/${version.number}/plugins/@{mvn.artifact.name}" overwrite="true">
           <fileset dir="${dist.dir}/misc/scala-devel/plugins/">
             <filename name="@{mvn.artifact.name}.jar"/>
           </fileset>
@@ -189,7 +189,7 @@ MAIN DISTRIBUTION PACKAGING
     </jar>
   </target>
 
-  <target name="pack-maven.docs" depends="pack-maven.libs, pack-maven.plugins">
+  <target name="pack-maven.docs" depends="pack-maven.libs, pack-maven.plugins" unless="docs.skip">
     <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"
          basedir="${build-docs.dir}/library">
       <include name="**/*"/>
@@ -209,30 +209,30 @@ MAIN DISTRIBUTION PACKAGING
 
     <!-- TODO - Scala swing and actors should maybe have thier own jar, but creating it is SLOW. -->
     <copy tofile="${dists.dir}/maven/${version.number}/scala-swing/scala-swing-docs.jar"
-          file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"/>
+          file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" overwrite="true"/>
     <copy tofile="${dists.dir}/maven/${version.number}/scala-actors/scala-actors-docs.jar"
-          file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"/>
+          file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" overwrite="true"/>
     <copy tofile="${dists.dir}/maven/${version.number}/scala-reflect/scala-reflect-docs.jar"
-          file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"/>
+          file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" overwrite="true"/>
   </target>
 
   <target name="pack-maven.latest.unix" depends="pack-maven.docs" unless="os.win">
     <symlink link="${dists.dir}/maven/latest"
              resource="${version.number}"
-             overwrite="yes"/>
+             overwrite="true"/>
   </target>
 
   <target name="pack-maven.latest.win" depends="pack-maven.docs" if="os.win">
-    <copy todir="${dists.dir}/maven/latest">
+    <copy todir="${dists.dir}/maven/latest" overwrite="true">
       <fileset dir="${dists.dir}/maven/${version.number}"/>
     </copy>
   </target>
 
   <target name="pack-maven.scripts" depends="pack-maven.latest.unix,pack-maven.latest.win,pack-maven.srcs">
     <copy todir="${dists.dir}/maven/${version.number}"
-          file="${lib-ant.dir}/ant-contrib.jar"/>
+          file="${lib-ant.dir}/ant-contrib.jar" overwrite="true"/>
     <copy todir="${dists.dir}/maven/${version.number}"
-          file="${lib-ant.dir}/maven-ant-tasks-2.1.1.jar"/>
+          file="${lib-ant.dir}/maven-ant-tasks-2.1.1.jar" overwrite="true"/>
     <copy tofile="${dists.dir}/maven/${version.number}/build.xml"
           file="${src.dir}/build/maven/maven-deploy.xml"/>
     <!-- export properties for use when deploying -->