harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r413113 - in /incubator/harmony/enhanced/drlvm/trunk/build/make: components/extra/apr.xml components/extra/aprutil.xml components/extra/log4cxx.xml targets/common_classlib.xml
Date Fri, 09 Jun 2006 18:06:17 GMT
Author: geirm
Date: Fri Jun  9 11:06:17 2006
New Revision: 413113

URL: http://svn.apache.org/viewvc?rev=413113&view=rev
Log:
tweaks to stop the <apr-1/foo.h> stuff, and 
just do <foo.h> for APR includes.  Not a big deal
but let me get more comfortable w/ the build.

No functional changes.  

Code change commit will follow


Modified:
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/apr.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/aprutil.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/log4cxx.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_classlib.xml

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/apr.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/apr.xml?rev=413113&r1=413112&r2=413113&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/apr.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/apr.xml Fri Jun  9
11:06:17 2006
@@ -34,7 +34,7 @@
             <fileset dir="${includes.apr}" includes="*.h" />
         </copy>
 
-        <property name="includes" location="${build.dir}/include" />
+        <property name="includes" location="${build.dir}/include/apr-1" />
     </target>
 
     <target name="prepare_src">

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=413113&r1=413112&r2=413113&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 Fri Jun
 9 11:06:17 2006
@@ -111,7 +111,7 @@
                 <fileset dir="${src}/xml/expat/lib" includes="xmlparse.c xmlrole.c xmltok.c"
/>
                 <includepath>
                     <pathelement location="${includes}" />
-                    <pathelement location="${extra.apr.includes}/apr-1" />
+                    <pathelement location="${extra.apr.includes}" />
                 </includepath>
                 <includepath path="${src}/include" />
                 <includepath path="${src}/include/private" />
@@ -137,7 +137,7 @@
                 <includepath>
                     <pathelement location="${extra.apriconv.includes}" />
                     <pathelement location="${includes}" />
-                    <pathelement location="${extra.apr.includes}/apr-1" />
+                    <pathelement location="${extra.apr.includes}" />
                 </includepath>
                 <includepath>
                     <dirset dir="${src}">

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/log4cxx.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/log4cxx.xml?rev=413113&r1=413112&r2=413113&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/log4cxx.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/log4cxx.xml Fri Jun
 9 11:06:17 2006
@@ -80,7 +80,7 @@
             </select>
             <includepath>
                 <pathelement location="${includes}" />
-                <pathelement location="${extra.apr.includes}/apr-1" />
+                <pathelement location="${extra.apr.includes}" />
                 <pathelement location="${extra.aprutil.includes}" />
                 <select os="win">
                     <pathelement location="${extra.apriconv.includes}" />

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_classlib.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_classlib.xml?rev=413113&r1=413112&r2=413113&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_classlib.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_classlib.xml Fri Jun
 9 11:06:17 2006
@@ -75,6 +75,13 @@
         <compiler id="common.compiler">
             <!--common for cpp and c-->
             <includepath>
+
+<!-- $$$ geirm for what's coming...  
+                <pathelement location="${build.CLASSLIB.home}/deploy/include" />
+                <pathelement location="${build.CLASSLIB.home}/deploy/jdk/include" />
+                <pathelement location="${build.CLASSLIB.home}/modules/luni/src/main/native/include/shared"
/>
+-->
+
                 <pathelement location="${os.native.dir}/include" />
                 <pathelement location="${shared.dir}/include" />
                 <pathelement location="${common.src}" />



Mime
View raw message