From 38e6ffb467a47c0fc127f23c8abbc234f414ccbe Mon Sep 17 00:00:00 2001
From: Antoine Levy-Lambert <antoine@apache.org>
Date: Thu, 19 May 2005 12:45:12 +0000
Subject: [PATCH] new target upload merged from Ant 1.6 branch

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278298 13f79535-47bb-0310-9956-ffa450edef68
---
 ReleaseInstructions |  4 +++-
 build.xml           | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ReleaseInstructions b/ReleaseInstructions
index a135d7991..2fa3763e3 100644
--- a/ReleaseInstructions
+++ b/ReleaseInstructions
@@ -58,6 +58,7 @@ Note: This document was updated in the context of releasing Ant 1.6.
 
         On the branch and on the main trunk (*):
 
+            * WHATSNEW
             * xdocs/antnews.xml (Announcement)
             * xdocs/faq.xml (Ant's history details - not for betas)
             * xdocs/index.xml (Announcement, latest release details, link to
@@ -164,7 +165,8 @@ Note: This document was updated in the context of releasing Ant 1.6.
     you'll have to do some house-keeping for the old release:
 
     * upload the new release files to
-      /www/www.apache.org/dist/ant/[source|binary].
+      /www/www.apache.org/dist/ant/[source|binaries].
+      this can be done using the target upload of the build.xml
 
     * remove the symbolic links from /www/www.apache.org/dist/ant.
 
diff --git a/build.xml b/build.xml
index 67dcf5f71..369465e58 100644
--- a/build.xml
+++ b/build.xml
@@ -1319,6 +1319,22 @@
     description="--> creates the full Apache Ant distribution">
   </target>
 
+  <!--
+       ===================================================================
+         Upload the distribution to cvs.apache.org for final releases
+       ===================================================================
+  -->
+  <target name="upload" description="upload distribution">
+    <fail unless="apache.user" message="set a property apache.user with your apache user"/>
+    <fail unless="ssh.passphrase" message="set a property with your ssh passphrase"/>
+    <fail unless="ssh.keyfile" message="set a property with your ssh keyfile"/>
+    <fail unless="ssh.knownhosts" message="set a property with your ssh knownhosts"/>
+    <scp todir="${apache.user}@cvs.apache.org:/www/www.apache.org/dist/ant" keyfile="${ssh.keyfile}" passphrase="${ssh.passphrase}" knownhosts="${ssh.knownhosts}">
+      <fileset dir="${dist.base}">
+        <include name="**/*"/>
+      </fileset>
+     </scp>
+  </target>
 
   <!--
        ===================================================================