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

Ant labour: osgi uptodate checking and better doc skipping 

2 files changed, 28 insertions, 19 deletions

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 -->