svn commit: r1403256 - /manifoldcf/trunk/common-build.xml

[kw...@apache.org]

Author: kwright
Date: Mon Oct 29 11:50:49 2012
New Revision: 1403256

URL: http://svn.apache.org/viewvc?rev=1403256&view=rev
Log:
Check for proper svn version. Part of CONNECTORS-560.

Modified:
    manifoldcf/trunk/common-build.xml

Modified: manifoldcf/trunk/common-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/common-build.xml?rev=1403256&r1=1403255&r2=1403256&view=diff
==============================================================================
--- manifoldcf/trunk/common-build.xml (original)
+++ manifoldcf/trunk/common-build.xml Mon Oct 29 11:50:49 2012
@@ -34,7 +34,23 @@
         </exec>
     </target>
 
-    <target name="patch-source-via-svn">
+    <target name="calculate-svn-patch-available">
+        <mkdir dir="build/svn-check"/>
+        <exec dir="build/svn-check" output="build/svn-check/svn.output" executable="svn" failifexecutionfails="true" failonerror="true">
+              <arg value="--version" />
+        </exec>
+        <loadfile property="svn-output" srcFile="build/svn-check/svn.output"/>
+        <condition property="svn-version-ok">
+            <contains string="${svn-output}" substring="1.7."/>
+        </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."/>
+    </target>
+    
+    <target name="patch-source-via-svn" depends="check-svn-patch-available" if="svn-version-ok">
+        <mkdir dir="${root-dir}"/>
         <exec dir="${root-dir}" executable="svn" failifexecutionfails="true" failonerror="true">
               <arg value="patch" />
               <arg value="${diff-file}" />