manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1308728 [1/2] - in /incubator/lcf/branches/CONNECTORS-443: ./ upstream-diffs/
Date Tue, 03 Apr 2012 07:26:27 GMT
Author: kwright
Date: Tue Apr  3 07:26:26 2012
New Revision: 1308728

URL: http://svn.apache.org/viewvc?rev=1308728&view=rev
Log:
Separate out httpclient patches into two: a cumulative post-3.1 patch, and an mcf-specific
patch.

Added:
    incubator/lcf/branches/CONNECTORS-443/upstream-diffs/commons-httpclient-3.1.cumulative.patch
    incubator/lcf/branches/CONNECTORS-443/upstream-diffs/commons-httpclient-3.1.mcf.patch
      - copied unchanged from r1308632, incubator/lcf/branches/CONNECTORS-443/upstream-diffs/commons-httpclient-3.1-mcf.patch
    incubator/lcf/branches/CONNECTORS-443/upstream-diffs/xerces2-j-2.9.1.mcf.patch
      - copied unchanged from r1308632, incubator/lcf/branches/CONNECTORS-443/upstream-diffs/xerces2-j-2.9.1-mcf.patch
Removed:
    incubator/lcf/branches/CONNECTORS-443/upstream-diffs/commons-httpclient-3.1-mcf.patch
    incubator/lcf/branches/CONNECTORS-443/upstream-diffs/xerces2-j-2.9.1-mcf.patch
Modified:
    incubator/lcf/branches/CONNECTORS-443/build.xml

Modified: incubator/lcf/branches/CONNECTORS-443/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-443/build.xml?rev=1308728&r1=1308727&r2=1308728&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-443/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-443/build.xml Tue Apr  3 07:26:26 2012
@@ -2915,22 +2915,31 @@ Use Apache Forrest version forrest-0.9-d
             <param name="artifact-name" value="commons-logging"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <!-- Download and build patched version of commons-httpclient -->
+        <!-- Download and build patched version of commons-httpclient 3.1 -->
         <mkdir dir="build/download"/>
         <delete dir="build/download/commons-httpclient"/>
         <antcall target="checkout-source-via-svn">
             <param name="root-dir" value="build/download"/>
-            <param name="svn-url" value="https://svn.apache.org/repos/asf/httpcomponents/oac.hc3x/trunk"/>
+            <param name="svn-url" value="https://svn.apache.org/repos/asf/httpcomponents/oac.hc3x/tags/HTTPCLIENT_3_1"/>
             <param name="dir-name" value="commons-httpclient"/>
         </antcall>
+        <!-- Apply cumulative post-3.1 fixes patch -->
         <antcall target="patch-source-via-svn">
             <param name="root-dir" value="build/download"/>
-            <param name="diff-file" value="../../upstream-diffs/commons-httpclient-3.1-mcf.patch"/>
+            <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">
+            <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"/>
+        </antcall>
+        <!-- Supply dependencies -->
         <mkdir dir="build/download/commons-httpclient/lib"/>
         <copy todir="build/download/commons-httpclient/lib" file="lib/commons-logging.jar"/>
         <copy todir="build/download/commons-httpclient/lib" file="lib/commons-codec.jar"/>
+        <!-- Build it -->
         <ant dir="build/download/commons-httpclient" target="dist"/>
         <copy todir="lib" file="build/download/commons-httpclient/dist/commons-httpclient.jar"/>
     </target>
@@ -2975,11 +2984,13 @@ Use Apache Forrest version forrest-0.9-d
             <param name="svn-url" value="https://svn.apache.org/repos/asf/xerces/java/tags/Xerces-J_2_9_1"/>
             <param name="dir-name" value="xerces2-j"/>
         </antcall>
+        <!-- Apply mcf-specific features and fixes patch -->
         <antcall target="patch-source-via-svn">
             <param name="root-dir" value="build/download"/>
-            <param name="diff-file" value="../../upstream-diffs/xerces2-j-2.9.1-mcf.patch"/>
+            <param name="diff-file" value="../../upstream-diffs/xerces2-j-2.9.1.mcf.patch"/>
             <param name="dir-name" value="xerces2-j"/>
         </antcall>
+        <!-- Build it -->
         <exec dir="build/download/xerces2-j" executable="cmd" osfamily="windows">
             <arg line="/c build.bat jar"/>
         </exec>



Mime
View raw message