Return-Path: 
 <commits-return-3422-apmail-manifoldcf-commits-archive=manifoldcf.apache.org@manifoldcf.apache.org>
X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org
Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 6EE06D213
	for <apmail-manifoldcf-commits-archive@www.apache.org>;
 Mon, 29 Oct 2012 12:38:13 +0000 (UTC)
Received: (qmail 60083 invoked by uid 500); 29 Oct 2012 12:38:12 -0000
Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org
Received: (qmail 60015 invoked by uid 500); 29 Oct 2012 12:38:12 -0000
Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@manifoldcf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@manifoldcf.apache.org>
List-Post: <mailto:commits@manifoldcf.apache.org>
List-Id: <commits.manifoldcf.apache.org>
Reply-To: dev@manifoldcf.apache.org
Delivered-To: mailing list commits@manifoldcf.apache.org
Received: (qmail 59996 invoked by uid 99); 29 Oct 2012 12:38:11 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Oct 2012 12:38:11 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Oct 2012 12:38:09 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D3CB223888FE;
	Mon, 29 Oct 2012 12:37:24 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1403270 - in /manifoldcf/trunk: build.xml
 common-build.xml
Date: Mon, 29 Oct 2012 12:37:24 -0000
To: commits@manifoldcf.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121029123724.D3CB223888FE@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kwright
Date: Mon Oct 29 12:37:24 2012
New Revision: 1403270

URL: http://svn.apache.org/viewvc?rev=1403270&view=rev
Log:
Put in code to run normal patch if svn 1.7 is not available.  Part of CONNECTORS-560.

Modified:
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/common-build.xml

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1403270&r1=1403269&r2=1403270&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Mon Oct 29 12:37:24 2012
@@ -3035,13 +3035,13 @@ Use Apache Forrest version forrest-0.9-d
             <param name="dir-name" value="commons-httpclient"/>
         </antcall>
         <!-- Apply cumulative post-3.1 fixes patch -->
-        <antcall target="patch-source-via-svn">
+        <antcall target="patch-source">
             <param name="root-dir" value="build/download"/>
             <param name="diff-file" value="../../upstream-diffs/commons-httpclient-3.1.cumulative.patch"/>
             <param name="dir-name" value="commons-httpclient"/>
         </antcall>
         <!-- Apply mcf-specific features and fixes patch -->
-        <antcall target="patch-source-via-svn">
+        <antcall target="patch-source">
             <param name="root-dir" value="build/download"/>
             <param name="diff-file" value="../../upstream-diffs/commons-httpclient-3.1.mcf.patch"/>
             <param name="dir-name" value="commons-httpclient"/>
@@ -3134,7 +3134,7 @@ Use Apache Forrest version forrest-0.9-d
             <param name="dir-name" value="xerces2-j"/>
         </antcall>
         <!-- Apply mcf-specific features and fixes patch -->
-        <antcall target="patch-source-via-svn">
+        <antcall target="patch-source">
             <param name="root-dir" value="build/download"/>
             <param name="diff-file" value="../../upstream-diffs/xerces2-j-2.9.1.mcf.patch"/>
             <param name="dir-name" value="xerces2-j"/>

Modified: manifoldcf/trunk/common-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/common-build.xml?rev=1403270&r1=1403269&r2=1403270&view=diff
==============================================================================
--- manifoldcf/trunk/common-build.xml (original)
+++ manifoldcf/trunk/common-build.xml Mon Oct 29 12:37:24 2012
@@ -51,8 +51,17 @@
         </condition>
     </target>
 
+    <target name="calculate-patch-available" depends="calculate-svn-patch-available" unless="svn-version-ok">
+        <condition property="patch-ok">
+            <os family="unix"/>
+        </condition>
+    </target>
+    
     <target name="check-svn-patch-available" depends="calculate-svn-patch-available" unless="svn-version-ok">
-        <echo message="You need svn version 1.7 or higher."/>
+        <echo message="You need svn version 1.7 or higher - attempting patch instead."/>
+    </target>
+    
+    <target name="check-patch-available" depends="calculate-patch-available" unless="patch-ok">
     </target>
     
     <target name="patch-source-via-svn" depends="check-svn-patch-available" if="svn-version-ok">
@@ -64,6 +73,15 @@
         </exec>
     </target>
     
+    <target name="patch-source-via-patch" depends="check-patch-available" if="patch-ok">
+        <mkdir dir="${root-dir}"/>
+        <exec dir="${root-dir}/${dir-name}" executable="patch" input="../${diff-file}" failifexecutionfails="true" failonerror="true">
+              <arg value="-p0" />
+        </exec>
+    </target>
+    
+    <target name="patch-source" depends="patch-source-via-svn,patch-source-via-patch"/>
+    
     <target name="build-via-ant">
         <exec osfamily="windows" dir="${root-dir}" executable="cmd" failifexecutionfails="true" failonerror="true">
             <arg value="/c"/>