harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r417394 - in /incubator/harmony/enhanced/drlvm/trunk/build/make: components/extra/aprutil.xml win.properties
Date Tue, 27 Jun 2006 10:03:03 GMT
Author: geirm
Date: Tue Jun 27 03:03:02 2006
New Revision: 417394

URL: http://svn.apache.org/viewvc?rev=417394&view=rev
Log:
revert back to the new rev for log4cxx and do the
necessary mods to aprutil.xml as per HARMONY-669
to support the new version


Modified:
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/aprutil.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/aprutil.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/aprutil.xml?rev=417394&r1=417393&r2=417394&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/aprutil.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/aprutil.xml Tue Jun
27 03:03:02 2006
@@ -98,13 +98,15 @@
         <property name="build.depends" value="extra.apr, extra.apriconv" />
         <property name="libname" value="aprutil-1" />
         <property name="outtype" value="static" />
-        <select os="lnx">
-            <replace file="${src}/xml/expat/lib/xmlparse.c">
-                <replacefilter token="XML_MAJOR_VERSION" value="1" />
-                <replacefilter token="XML_MINOR_VERSION" value="95" />
-                <replacefilter token="XML_MICRO_VERSION" value="1" />
-                <replacefilter token="VERSION" value='"expat_1.95.1"' />
-            </replace>
+
+        <replace file="${src}/xml/expat/lib/xmlparse.c">
+            <replacefilter token="XML_MAJOR_VERSION" value="1" />
+            <replacefilter token="XML_MINOR_VERSION" value="95" />
+            <replacefilter token="XML_MICRO_VERSION" value="1" />
+            <replacefilter token="VERSION" value='"expat_1.95.1"' />
+        </replace>
+
+    	<select os="lnx">
 
             <compiler id="c.compiler" extends="common.c.compiler">
                 <fileset dir="${src}" includes="**/*.c" excludes="test/*.c ldap/*.c xml/expat/lib/*"
/>
@@ -162,6 +164,7 @@
                     <include name="crypto/*.c" />
                     <include name="buckets/*.c" />
                 </fileset>
+                <fileset dir="${src}/xml/expat/lib" includes="xmlparse.c xmlrole.c xmltok.c"
/>
                 <defineset define="APR_DECLARE_EXPORT,APU_DECLARE_EXPORT,API_DECLARE_EXPORT,APU_USE_SDBM"
/>
             </compiler>
         </select>

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties?rev=417394&r1=417393&r2=417394&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties Tue Jun 27 03:03:02 2006
@@ -67,8 +67,8 @@
 # http://apr.apache.org/download.cgi
 remote.APRICONV.archive=http://apache.reverse.net/pub/apache/apr/apr-iconv-1.1.1-win32-src.zip
 
-# LOG4CXX, svn revision 365029
-remote.LOG4CXX.archive=-r 365029 https://svn.apache.org/repos/asf/logging/log4cxx/trunk
+# LOG4CXX, svn revision 416779
+remote.LOG4CXX.archive=-r 416779 https://svn.apache.org/repos/asf/logging/log4cxx/trunk
 remote.LOG4CXX.archive.type=svn
 
 # IJ Eclipse plugin



Mime
View raw message