From 0c8d1f218779bf71db39d3c2b8e183608490b681 Mon Sep 17 00:00:00 2001
From: Jason Zaugg <jzaugg@gmail.com>
Date: Fri, 18 Oct 2013 13:22:49 +0200
Subject: Use overwriting copy uniformly in our build.

The staleness problem in our build had its roots in
the flawed uptodate check fixed in the previous commit,
but I spent a lot of time looking at these first. Maybe
one was also complicit.

We've got better things to worry about, so lets make
the all overwrite.
---
 src/build/pack.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/build/pack.xml')

diff --git a/src/build/pack.xml b/src/build/pack.xml
index e1b3c24df1..4c5ba228fc 100644
--- a/src/build/pack.xml
+++ b/src/build/pack.xml
@@ -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>
@@ -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 -->
-- 
cgit v1.2.3