manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1308632 [1/3] - in /incubator/lcf/branches/CONNECTORS-443: build.xml common-build.xml upstream-diffs/ upstream-diffs/commons-httpclient-3.1-mcf.patch upstream-diffs/xerces2-j-2.9.1-mcf.patch
Date Tue, 03 Apr 2012 00:32:42 GMT
Author: kwright
Date: Tue Apr  3 00:32:41 2012
New Revision: 1308632

URL: http://svn.apache.org/viewvc?rev=1308632&view=rev
Log:
Build a patched commons-httpclient jar on the fly.

Added:
    incubator/lcf/branches/CONNECTORS-443/upstream-diffs/
    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
    incubator/lcf/branches/CONNECTORS-443/common-build.xml

Modified: incubator/lcf/branches/CONNECTORS-443/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-443/build.xml?rev=1308632&r1=1308631&r2=1308632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-443/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-443/build.xml Tue Apr  3 00:32:41 2012
@@ -2897,12 +2897,6 @@ Use Apache Forrest version forrest-0.9-d
             <param name="artifact-name" value="commons-fileupload"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
-        <antcall target="download-via-svn"><param name="target" value="lib"/>
-            <param name="project-desc" value="commons-httpclient"/>
-            <param name="artifact-version" value="3.1-mcf-1"/>
-            <param name="artifact-name" value="commons-httpclient"/>
-            <param name="artifact-type" value="jar"/>
-        </antcall>
         <antcall target="download-via-maven"><param name="target" value="lib"/>
             <param name="project-path" value="commons-io"/>
             <param name="artifact-version" value="1.3.2"/>
@@ -2921,6 +2915,24 @@ 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 -->
+        <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="dir-name" value="commons-httpclient"/>
+        </antcall>
+        <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>
+        <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"/>
+        <ant dir="build/download/commons-httpclient" target="dist"/>
+        <copy todir="lib" file="build/download/commons-httpclient/dist/commons-httpclient.jar"/>
     </target>
     
     <target name="download-jetty">

Modified: incubator/lcf/branches/CONNECTORS-443/common-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-443/common-build.xml?rev=1308632&r1=1308631&r2=1308632&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-443/common-build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-443/common-build.xml Tue Apr  3 00:32:41 2012
@@ -37,4 +37,21 @@
         <get src="${svn-base-url}/bin-dist/${project-desc}-${artifact-version}/${escaped-artifact-name}.${artifact-type}"
dest="${target}/${artifact-name}.${artifact-type}"/>
     </target>
 
+    <target name="checkout-source-via-svn">
+        <mkdir dir="${root-dir}"/>
+        <exec dir="${root-dir}" executable="svn" failifexecutionfails="true">
+              <arg value="checkout" />
+              <arg value="${svn-url}" />
+              <arg value="${dir-name}" />
+        </exec>
+    </target>
+
+    <target name="patch-source-via-svn">
+        <exec dir="${root-dir}" executable="svn" failifexecutionfails="true">
+              <arg value="patch" />
+              <arg value="${diff-file}" />
+              <arg value="${dir-name}" />
+        </exec>
+    </target>
+    
 </project>



Mime
View raw message