harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r540037 - in /harmony/enhanced/drlvm/trunk/build/make: ./ components/extra/ components/vm/ targets/
Date Mon, 21 May 2007 06:26:21 GMT
Author: hindessm
Date: Sun May 20 23:26:20 2007
New Revision: 540037

URL: http://svn.apache.org/viewvc?view=rev&rev=540037
Log:
Changing <select> from os linux to osfamily unix.  Some of these will
undoubtedly become more specific but this is a good first approximation.

Modified:
    harmony/enhanced/drlvm/trunk/build/make/components/extra/apr.xml
    harmony/enhanced/drlvm/trunk/build/make/components/extra/aprutil.xml
    harmony/enhanced/drlvm/trunk/build/make/components/extra/java_script.xml
    harmony/enhanced/drlvm/trunk/build/make/components/extra/log4cxx.xml
    harmony/enhanced/drlvm/trunk/build/make/components/vm/em.xml
    harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_cc.xml
    harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_gen.xml
    harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml
    harmony/enhanced/drlvm/trunk/build/make/components/vm/interpreter.xml
    harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml
    harmony/enhanced/drlvm/trunk/build/make/components/vm/port.xml
    harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml
    harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml
    harmony/enhanced/drlvm/trunk/build/make/deploy.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/build.native.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/common_extra.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml
    harmony/enhanced/drlvm/trunk/build/make/test.properties

Modified: harmony/enhanced/drlvm/trunk/build/make/components/extra/apr.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/extra/apr.xml?view=diff&rev=540037&r1=540036&r2=540037
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/extra/apr.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/extra/apr.xml Sun May 20 23:26:20 2007
@@ -58,7 +58,7 @@
     </target>
 
     <target name="apr-configure" unless="apr-config-available">
-        <select os="lnx">
+        <select osfamily="unix">
         	
 <!--            <exec executable="sh" dir="${src}">
                 <arg value="./buildconf" />
@@ -84,7 +84,7 @@
         <property name="libname" value="apr-1" />
         <property name="outtype" value="static" />
 
-        <select os="lnx">
+        <select osfamily="unix">
 
         	<!-- simply invoke make to let it build as the APR people suggest  -->
             <!-- we'll need to tune this wrt flags and such                    -->

Modified: harmony/enhanced/drlvm/trunk/build/make/components/extra/aprutil.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/extra/aprutil.xml?view=diff&rev=540037&r1=540036&r2=540037
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/extra/aprutil.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/extra/aprutil.xml Sun May 20 23:26:20
2007
@@ -62,7 +62,7 @@
     </target>
 
     <target name="configure" unless="aprutil-config-available">
-        <select os="lnx">
+        <select osfamily="unix">
             <exec executable="sh" dir="${src}">
                 <arg value="./buildconf" />
                 <arg value="--with-apr=${extra.apr.src}" />
@@ -106,7 +106,7 @@
             <replacefilter token="VERSION" value='"expat_1.95.1"' />
         </replace>
 
-    	<select os="lnx">
+    	<select osfamily="unix">
 
             <compiler id="c.compiler" extends="common.c.compiler">
                 <fileset dir="${src}" includes="**/*.c" excludes="test/*.c ldap/*.c xml/expat/lib/*"
/>
@@ -127,7 +127,7 @@
                 <defineset>
                     <define name="APU_HAVE_APR_ICONV" value="0" />
                 </defineset>
-                <select os="lnx" arch="em64t">
+                <select osfamily="unix" arch="em64t">
                     <compilerarg value="-fPIC" />
                 </select>
             </compiler>

Modified: harmony/enhanced/drlvm/trunk/build/make/components/extra/java_script.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/extra/java_script.xml?view=diff&rev=540037&r1=540036&r2=540037
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/extra/java_script.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/extra/java_script.xml Sun May 20 23:26:20
2007
@@ -28,7 +28,7 @@
 <project name="extra.java_script">
     <target name="init" >
         <mkdir dir="${build.dir}/_other" />
-        <select os="lnx">
+        <select osfamily="unix">
             <echo file="${build.dir}/_other/java.sh">
 #!/bin/sh
 

Modified: harmony/enhanced/drlvm/trunk/build/make/components/extra/log4cxx.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/extra/log4cxx.xml?view=diff&rev=540037&r1=540036&r2=540037
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/extra/log4cxx.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/extra/log4cxx.xml Sun May 20 23:26:20
2007
@@ -51,7 +51,7 @@
             <copy tofile="${includes}/log4cxx/log4cxx.h" file="${includes}/log4cxx/log4cxx.hw"
/>
             <copy tofile="${includes}/log4cxx/private/log4cxx_private.h" file="${includes}/log4cxx/private/log4cxx_private.hw"
/>
         </select>
-        <select os="lnx">
+        <select osfamily="unix">
             <copy tofile="${includes}/log4cxx/log4cxx.h" file="${includes}/log4cxx/log4cxx.h.in"
/>
             <copy tofile="${includes}/log4cxx/private/log4cxx_private.h" file="${includes}/log4cxx/private/log4cxx_private.h.in"
/>
         </select>
@@ -96,7 +96,7 @@
                 <compilerarg value="/EHsc" />
                 <defineset define="_USRDLL,DLL_EXPORTS,APR_DECLARE_EXPORT,APU_DECLARE_EXPORT,LOG4CXX_STATIC,LOG4CXX"
/>
             </select>
-            <select os="lnx">
+            <select osfamily="unix">
                 <includepath path="/usr/include/libxml2" />
                 <select arch="em64t,ipf">
                     <compilerarg value="-fPIC" />

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/em.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/em.xml?view=diff&rev=540037&r1=540036&r2=540037
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/em.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/em.xml Sun May 20 23:26:20 2007
@@ -40,7 +40,7 @@
                         <include name="vmcore/src/util/win/include" />
                     </select>
 
-                    <select os="lnx">
+                    <select osfamily="unix">
                         <include name="vmcore/src/util/linux/include" />
                     </select>
                 </dirset>
@@ -64,7 +64,7 @@
                 <include name="*.cpp" />
             </fileset>
 
-            <select os="lnx">
+            <select osfamily="unix">
                 <compilerarg value="-Wno-deprecated" />
                 <compilerarg value="-fno-exceptions" />
             </select>
@@ -80,7 +80,7 @@
             <libset libs="${vm.vmcore.lib}" dir="${vm.vmcore.libdir}" />
             <libset libs="${extra.apr.lib}" dir="${extra.apr.libdir}" />
             <libset libs="${vm.hythr.lib}" dir="${vm.hythr.libdir}" />
-            <select os="lnx">
+            <select osfamily="unix">
                 <syslibset type="shared" libs="m,dl,stdc++,z,xml2,pthread" />
                 <linkerarg value="--export-dynamic" />
                 <!-- syslibset type="static" libs="z,pthread,xml2" />

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_cc.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_cc.xml?view=diff&rev=540037&r1=540036&r2=540037
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_cc.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_cc.xml Sun May 20 23:26:20 2007
@@ -45,7 +45,7 @@
                     <select os="win">
                         <include name="vmcore/src/util/win/include" />
                     </select>
-                    <select os="lnx">
+                    <select osfamily="unix">
                         <include name="vmcore/src/util/linux/include" />
                     </select>
                 </dirset>

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_gen.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_gen.xml?view=diff&rev=540037&r1=540036&r2=540037
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_gen.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_gen.xml Sun May 20 23:26:20 2007
@@ -45,7 +45,7 @@
                     <select os="win">
                         <include name="vmcore/src/util/win/include" />
                     </select>
-                    <select os="lnx">
+                    <select osfamily="unix">
                         <include name="vmcore/src/util/linux/include" />
                     </select>
                 </dirset>

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml?view=diff&rev=540037&r1=540036&r2=540037
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml Sun May 20 23:26:20 2007
@@ -49,7 +49,7 @@
                 <select os="win">
                   <include name="thread/src/win/*.c" />
                 </select>
-                <select os="lnx">
+                <select osfamily="unix">
                   <include name="thread/src/linux/*.c" />
                 </select>
             </fileset>
@@ -62,6 +62,9 @@
                 <defineset define="_USRDLL" />
             </select>
 
+            <select os="macosx">
+                <defineset define="MACOSX" />
+            </select>
             <select os="lnx">
                 <defineset define="LINUX" />
             </select>
@@ -73,7 +76,7 @@
                 <defineset define="_EM64T_" />
             </select>
             <!--
-            <select os="lnx">
+            <select osfamily="unix">
                 <compilerarg value="-Wno-deprecated" />
                 <compilerarg value="-fno-exceptions" />
             </select>

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/interpreter.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/interpreter.xml?view=diff&rev=540037&r1=540036&r2=540037
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/interpreter.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/interpreter.xml Sun May 20 23:26:20
2007
@@ -72,7 +72,7 @@
                         <include name="vm/win" />
                     </select>
 
-                    <select os="lnx">
+                    <select osfamily="unix">
                         <include name="vm/common/base" />
                         <include name="vmcore/src/util/linux/include" />
                     </select>

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml?view=diff&rev=540037&r1=540036&r2=540037
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml Sun May 20 23:26:20
2007
@@ -119,7 +119,7 @@
                     <pathelement location="${build.vm.home}/vmcore/src/util/win/include"
/>
                 </select>
 
-                <select os="lnx">
+                <select osfamily="unix">
                     <pathelement location="${build.vm.home}/vmcore/src/util/linux/include"
/>
                 </select>
             </includepath>
@@ -225,7 +225,7 @@
             </select>
 
             <!-- linux specific -->
-            <select os="lnx">
+            <select osfamily="unix">
                 <defineset define="PLATFORM_POSIX,LINUX" />
 
                 <select cxx="gcc" arch="ia32,em64t">
@@ -328,7 +328,7 @@
 
             </select>
 
-            <select os="lnx">
+            <select osfamily="unix">
                 <linkerarg value="-shared" />
                 <linkerarg value="-ldl" />
                 <linkerarg value="-lm" />

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/port.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/port.xml?view=diff&rev=540037&r1=540036&r2=540037
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/port.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/port.xml Sun May 20 23:26:20 2007
@@ -47,7 +47,7 @@
             <defineset define="BUILDING_VM" />
 
             <fileset dir="${build.vm.home}/port/src">
-                <select os="lnx">
+                <select osfamily="unix">
                     <include name="disasm/linux/*.c" />
                     <include name="file_io/linux/*.c" />
                     <include name="misc/linux/*.c" />
@@ -77,7 +77,7 @@
                 <compilerarg value="/EHsc" />
             </select>
 
-            <select os="lnx">
+            <select osfamily="unix">
                 <compilerarg value="-fexceptions" />
             </select>
         </compiler>
@@ -89,7 +89,7 @@
             <select os="win" arch="ia32">
                 <exclude name="**" />
             </select>
-            <select os="lnx">
+            <select osfamily="unix">
                 <exclude name="**" />
             </select>
         </fileset>

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml?view=diff&rev=540037&r1=540036&r2=540037
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml Sun May 20 23:26:20 2007
@@ -89,7 +89,7 @@
             <fileset dir="${build.vm.home}/vmcore/src/kernel_classes/native">
                 <include name="*.cpp" />
 
-                <select os="lnx">
+                <select osfamily="unix">
                     <exclude name="Runtime_win.cpp" />
                     <exclude name="System_win.cpp" />
                 </select>
@@ -154,7 +154,7 @@
                     <include name="util/em64t/base_natives/*.cpp" />
                 </select>
 
-                <select os="lnx">
+                <select osfamily="unix">
                     <include name="thread/linux/*.cpp" />
                     <include name="util/linux/os_wrapper.cpp" />
                     <include name="util/linux/stubs.cpp" />
@@ -207,7 +207,7 @@
                     <pathelement path="${extra.zlib.includes}" />
                 </select>
 
-                <select os="lnx">
+                <select osfamily="unix">
                     <dirset dir="${build.vm.home}">
                         <include name="vm/common/base" />
                         <include name="vmcore/src/util/linux/include" />

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml?view=diff&rev=540037&r1=540036&r2=540037
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml Sun May 20 23:26:20 2007
@@ -54,7 +54,7 @@
                         <include name="vmcore/src/util/win/include" />
                     </select>
 
-                    <select os="lnx">
+                    <select osfamily="unix">
                         <include name="vmcore/src/util/linux/include" />
                     </select>
                 </dirset>
@@ -76,7 +76,7 @@
                 <libset libs="${vm.vmcore.lib}" dir="${vm.vmcore.libdir}" />
             </select>
 
-            <select os="lnx">
+            <select osfamily="unix">
                 <linkerarg value="--version-script,${src}/vmi.exp" />
             </select>
 

Modified: harmony/enhanced/drlvm/trunk/build/make/deploy.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/deploy.xml?view=diff&rev=540037&r1=540036&r2=540037
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/deploy.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/deploy.xml Sun May 20 23:26:20 2007
@@ -81,7 +81,7 @@
                 <other>bin/default:eclipse.bat</other>
             </select>
 
-            <select os="lnx">
+            <select osfamily="unix">
                 <other>bin/default:eclipse.sh</other>
             </select>
         </eclipse_script>

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/build.native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/build.native.xml?view=diff&rev=540037&r1=540036&r2=540037
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/build.native.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/build.native.xml Sun May 20 23:26:20 2007
@@ -98,7 +98,7 @@
             <select os="win">
                 <compilerarg value="/Zi" />
             </select>
-            <select os="lnx">
+            <select osfamily="unix">
                 <linkerarg value="-g" />
             </select>
             <fileset refid="c.fileset" />
@@ -113,7 +113,7 @@
             <select os="win">
                 <compilerarg value="/Zi" />
             </select>
-            <select os="lnx">
+            <select osfamily="unix">
                 <compilerarg value="-fpic" />
                 <linkerarg value="-g" />
             </select>
@@ -167,7 +167,7 @@
                         <exec executable="${asm.executable}" failonerror="true">
                             <arg line="${asm.args}" />
                             <arg line="${asm.add.arg}" />
-                            <select os="lnx">
+                            <select osfamily="unix">
                                 <arg line=" -o${build.dir}/_obj/${object}.${object.suffix}
@{file} " />
                             </select>
                             <select os="win">

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/common_extra.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/common_extra.xml?view=diff&rev=540037&r1=540036&r2=540037
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/common_extra.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/common_extra.xml Sun May 20 23:26:20 2007
@@ -42,7 +42,7 @@
             <select os="win">
                 <syslibset libs="advapi32,odbc32,userenv,ws2_32,mswsock" />
             </select>
-            <select os="lnx">
+            <select osfamily="unix">
                 <syslibset type="static" libs="z,pthread,xml2" />
                 <syslibset type="shared" libs="m,dl,stdc++" />
             </select>

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml?view=diff&rev=540037&r1=540036&r2=540037
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml Sun May 20 23:26:20 2007
@@ -61,6 +61,12 @@
                 <defineset define="HYX86_64" />
             </select>
 
+            <select arch="ppc32">
+                <defineset define="_PPC32_" />
+                <defineset define="_PPC_" />
+                <defineset define="HYPPC32" />
+            </select>
+
             <select os="win">
                 <defineset>
                     <define name="PLATFORM_NT" />
@@ -85,9 +91,14 @@
                 </select>
             </select>
 
-            <select os="lnx">
+            <select osfamily="unix">
                 <defineset define="PLATFORM_POSIX" />
-                <defineset define="LINUX" />
+                <select os="macosx">
+                    <defineset define="MACOSX" />
+                </select>
+                <select os="lnx">
+                    <defineset define="LINUX" />
+                </select>
                 <defineset define="__SMP__" />
                 <defineset define="_REENTRANT" />
                 <defineset define="LINUX_TLS_OPT" />
@@ -168,7 +179,7 @@
                 </select>
             </select>
 
-            <select os="lnx">
+            <select osfamily="unix">
                 <compilerarg value="-Wno-deprecated" />
                 <compilerarg value="-x" />
                 <compilerarg value="c++" />

Modified: harmony/enhanced/drlvm/trunk/build/make/test.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/test.properties?view=diff&rev=540037&r1=540036&r2=540037
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/test.properties (original)
+++ harmony/enhanced/drlvm/trunk/build/make/test.properties Sun May 20 23:26:20 2007
@@ -89,3 +89,4 @@
 eclipse.linux.x86.url=${eclipse.mirror}/eclipse-SDK-3.2.1-linux-gtk.tar.gz
 eclipse.linux.x86_64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-linux-gtk-x86_64.tar.gz
 eclipse.linux.ia64.url=${eclipse.mirror}/eclipse-SDK-3.2.1-linux-gtk-ia64.tar.gz
+eclipse.macosx.ppc32.url=${eclipse.mirror}/eclipse-platform-SDK-3.2.1-macosx-carbon.tar.gz



Mime
View raw message