Skip more under ant -Ddocs.skip.

 - skip docs.lib, which doesn't route through the staged-docs
   macro
 - skip copying docs to the staged maven distribution
 - skip maven local deploy of doc jar under this mode
 - skip devel docs tarring

3 files changed, 54 insertions, 43 deletions

diff --git a/build.xml b/build.xml
index cb159b6c9e..86b932686e 100755
--- a/build.xml
+++ b/build.xml
@@ -1779,41 +1779,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>
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..e1b3c24df1 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"/>
@@ -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="**/*"/>