Return-Path: 
 <forrest-cvs-return-2328-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@www.apache.org
Received: (qmail 85787 invoked from network); 1 May 2004 02:00:59 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 1 May 2004 02:00:59 -0000
Received: (qmail 82140 invoked by uid 500); 1 May 2004 02:00:41 -0000
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 82100 invoked by uid 500); 1 May 2004 02:00:41 -0000
Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:forrest-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:forrest-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:forrest-cvs@xml.apache.org>
Reply-To: forrest-dev@xml.apache.org
Delivered-To: mailing list forrest-cvs@xml.apache.org
Received: (qmail 82086 invoked from network); 1 May 2004 02:00:41 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 1 May 2004 02:00:41 -0000
Received: (qmail 85761 invoked by uid 65534); 1 May 2004 02:00:58 -0000
Date: 1 May 2004 02:00:58 -0000
Message-ID: <20040501020058.85758.qmail@minotaur.apache.org>
From: brondsem@apache.org
To: forrest-cvs@xml.apache.org
Subject: svn commit: rev 10466 - in xml/forrest/trunk: . tools/targets
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: brondsem
Date: Fri Apr 30 19:00:58 2004
New Revision: 10466

Modified:
   xml/forrest/trunk/status.xml
   xml/forrest/trunk/tools/targets/patch.xml
Log:
update 'build patch' command for svn

Modified: xml/forrest/trunk/status.xml
==============================================================================
--- xml/forrest/trunk/status.xml	(original)
+++ xml/forrest/trunk/status.xml	Fri Apr 30 19:00:58 2004
@@ -44,6 +44,9 @@
 
   <changes>
     <release version="0.6-dev" date="unreleased">
+      <action dev="DPB" type="update" context="shbat" fixes-bug="FOR-137">
+        'build patch' command updated for SVN
+      </action>
       <action dev="JJP" type="update" context="core" due-to="Florian G. Haas" fixes-bug="FOR-9">
         Completely rewritten Lucene-based index and search functionality
       </action>

Modified: xml/forrest/trunk/tools/targets/patch.xml
==============================================================================
--- xml/forrest/trunk/tools/targets/patch.xml	(original)
+++ xml/forrest/trunk/tools/targets/patch.xml	Fri Apr 30 19:00:58 2004
@@ -25,24 +25,32 @@
     <property name="patch.package" value="patch.tar.gz"/>
     <property name="patch.file" value="patch.txt"/>
 
-    <condition property="cvs.found">
+    <condition property="svn.found">
         <or>
-            <available file="cvs" filepath="${env.PATH}"/>
-            <available file="cvs.exe" filepath="${env.PATH}"/>
-            <available file="cvs.exe" filepath="${env.Path}"/>
+            <available file="svn" filepath="${env.PATH}"/>
+            <available file="svn.exe" filepath="${env.PATH}"/>
+            <available file="svn.exe" filepath="${env.Path}"/>
         </or>
     </condition>
 
     <target name="createpatch">
-        <fail unless="cvs.found"
-              message="You need a version of cvs to create the patch"/>
-        <cvs command="-q diff -u" output="${patch.file}"/>
+        <fail unless="svn.found"
+              message="You need a version of svn to create the patch"/>
+        <exec executable="svn" output="${patch.file}">
+            <arg value="diff"/>
+        </exec>
     </target>
 
     <target name="newfiles" depends="createpatch">
         <delete file="${patch.package}"/>
-        <cvs command="-q diff -N" output="${patch.file}.tmp"/>
-        <replace file="${patch.file}.tmp" token="? " value=""/>
+        <exec executable="svn" output="${patch.file}.tmp">
+            <arg value="status"/>
+        </exec>
+        <!-- the status columns make all lines invalid filenames (ignored by ant)
+            we remove the status columns for the new files so the only valid
+            filenames in the list are new files
+        -->
+        <replace file="${patch.file}.tmp" token="?      " value=""/>
         <tstamp>
             <format property="year" pattern="yyyy"/>
         </tstamp>
@@ -62,10 +70,8 @@
             setonempty="false"
             property="no.copyright"
             refid="no.copyright.set"/>
-            <!-- Commented out until someone decides if we need Copyright in all forrest pages
-	    <fail if="no.copyright"
-            message="Please assign the Apache Copyright (for ${year}) to these files and retry:${line.separator}${no.copyright}"/>
-	    -->
+        <fail if="no.copyright"
+            message="Please include the Apache Copyright header (for ${year}) to these files and retry:${line.separator}${no.copyright}"/>
     </target>
 
     <target name="patchpackage" depends="newfiles">
@@ -75,5 +81,10 @@
             includesfile="${patch.file}.tmp"
             excludes="${patch.file}.tmp"/>
         <delete file="${patch.file}.tmp"/>
+        <echo>
+Attach the following file to a new issue in the Forrest issue tracker:
+    ${patch.package} if you have added new files
+    ${patch.file} if you have only modified existing files
+        </echo>
     </target>
 </project>