From ea1137235e04baf1254289a37c008bf60c254835 Mon Sep 17 00:00:00 2001
From: Jason Zaugg <jzaugg@gmail.com>
Date: Fri, 18 Oct 2013 10:01:44 +0200
Subject: 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
---
 src/build/maven/maven-deploy.xml | 21 +++++++++++++++------
 src/build/pack.xml               |  4 ++--
 2 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'src/build')

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="**/*"/>
-- 
cgit v1.2.3