harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r593491 - in /harmony/enhanced/drlvm/trunk/build/make: ./ components/extra/ components/vm/
Date Fri, 09 Nov 2007 10:52:44 GMT
Author: varlax
Date: Fri Nov  9 02:52:43 2007
New Revision: 593491

URL: http://svn.apache.org/viewvc?rev=593491&view=rev
Log:
Getting rid of xsl preprocessing

Modified:
    harmony/enhanced/drlvm/trunk/build/make/build.xml
    harmony/enhanced/drlvm/trunk/build/make/components/extra/log4cxx.xml
    harmony/enhanced/drlvm/trunk/build/make/components/extra/zlib.xml
    harmony/enhanced/drlvm/trunk/build/make/components/vm/em.xml
    harmony/enhanced/drlvm/trunk/build/make/components/vm/encoder.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

Modified: harmony/enhanced/drlvm/trunk/build/make/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/build.xml?rev=593491&r1=593490&r2=593491&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build.xml Fri Nov  9 02:52:43 2007
@@ -221,6 +221,30 @@
                 <isset property="is.x86"/>
             </and>
         </condition>
+        <condition property="is.unix.ia64">
+            <and>
+                <isset property="is.unix"/>
+                <isset property="is.ia64"/>
+            </and>
+        </condition>
+        <condition property="is.windows.x86">
+            <and>
+                <isset property="is.windows"/>
+                <isset property="is.x86"/>
+            </and>
+        </condition>
+        <condition property="is.windows.x86_64">
+            <and>
+                <isset property="is.windows"/>
+                <isset property="is.x86_64"/>
+            </and>
+        </condition>
+        <condition property="is.windows.ia64">
+            <and>
+                <isset property="is.windows"/>
+                <isset property="is.ia64"/>
+            </and>
+        </condition>
     </target>
 
     <!-- initialization target specific for unix -->

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?rev=593491&r1=593490&r2=593491&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/extra/log4cxx.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/extra/log4cxx.xml Fri Nov  9 02:52:43 2007
@@ -48,14 +48,12 @@
     </target>
 
     <target name="configure" unless="config-available">
-        <select os="win">
-            <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 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>
+        <condition property="plaf.ext" value="hw" else="h.in">
+            <isset property="is.windows"/>
+        </condition>
+        
+        <copy tofile="${includes}/log4cxx/log4cxx.h" file="${includes}/log4cxx/log4cxx.${plaf.ext}" />
+        <copy tofile="${includes}/log4cxx/private/log4cxx_private.h" file="${includes}/log4cxx/private/log4cxx_private.${plaf.ext}" />
 
         <property name="logchar_is_utf8" value="0" />
         <property name="has.wchar_t" value="1" />
@@ -76,37 +74,22 @@
         <property name="libname" value="log4cxx" />
         <property name="outtype" value="static" />
         <compiler id="cpp.compiler" extends="common.cpp.compiler">
-            <select os="lnx">
-                <includepath path="/usr/include/libxml2" />
-            </select>
+            <includepath path="/usr/include/libxml2" if="is.unix"/>
             <includepath>
                 <pathelement location="${includes}" />
                 <pathelement location="${extra.apr.includes}" />
                 <pathelement location="${extra.aprutil.includes}" />
-                <select os="win">
-                    <pathelement location="${extra.apriconv.includes}" />
-                </select>
             </includepath>
+            <includepath path="${extra.apriconv.includes}" if="is.windows"/>
             <fileset dir="${src}/src">
                 <include name="*.cpp" />
-                <select os="lnx">
-                    <exclude name="iconv_module.cpp" />
-                </select>
+                <exclude name="iconv_module.cpp" if="is.unix"/>
             </fileset>
-            <select os="win">
-                <compilerarg value="/EHsc" />
-                <defineset define="_USRDLL,DLL_EXPORTS,APR_DECLARE_EXPORT,APU_DECLARE_EXPORT,LOG4CXX_STATIC,LOG4CXX" />
-            </select>
-            <select osfamily="unix">
-                <includepath path="/usr/include/libxml2" />
-                <select arch="em64t,ipf">
-                    <compilerarg value="-fPIC" />
-                </select>
-                <defineset define="STDC_HEADERS,LOG4CXX,LOG4CXX_STATIC,APR_DECLARE_EXPORT,APU_DECLARE_EXPORT" />
-            </select>
-            <select os="freebsd">
-                <defineset define="FREEBSD" />
-            </select>
+            <compilerarg value="/EHsc" if="is.windows"/>
+            <defineset define="_USRDLL,DLL_EXPORTS,APR_DECLARE_EXPORT,APU_DECLARE_EXPORT,LOG4CXX_STATIC,LOG4CXX" if="is.windows"/>
+            <compilerarg value="-fPIC" if="is.unix" unless="is.x86"/>
+            <defineset define="STDC_HEADERS,LOG4CXX,LOG4CXX_STATIC,APR_DECLARE_EXPORT,APU_DECLARE_EXPORT" if="is.unix"/>
+            <defineset define="FREEBSD" if="is.freebsd"/>
         </compiler>
     </target>
 </project>

Modified: harmony/enhanced/drlvm/trunk/build/make/components/extra/zlib.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/extra/zlib.xml?rev=593491&r1=593490&r2=593491&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/extra/zlib.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/extra/zlib.xml Fri Nov  9 02:52:43 2007
@@ -28,17 +28,16 @@
 
 <project name="extra.zlib">
 
-    <target name="init" >
-        <select os="win">
+    <target name="init" if="is.windows">
             <property name="includes" value="${build.dir}/include" />
             <mkdir dir="${includes}" />
 
             <property name="libdir" value="${build.dir}/_bin"/>
             <mkdir dir="${libdir}" />
 
-            <select arch="em64t">
-                <property name="select.ZLIB.home" value="${build.ZLIB-x86_64.home}"/>
-            </select>
+            <condition property="select.ZLIB.home" value="${build.ZLIB-x86_64.home}">
+                <isset property="is.x86_64"/>
+            </condition>
             <property name="select.ZLIB.home" value="${build.ZLIB.home}"/>
             
             <copy file="${select.ZLIB.home}/zlib1.dll"
@@ -54,7 +53,6 @@
             </copy>
 
             <property name="libname" value="zdll" />
-        </select>
     </target>
     
 </project>

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?rev=593491&r1=593490&r2=593491&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/em.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/em.xml Fri Nov  9 02:52:43 2007
@@ -37,13 +37,8 @@
         <compiler id="cpp.compiler" extends="common.cpp.compiler">
             <includepath>
                 <dirset dir="${src}">
-                    <select os="win">
-                        <include name="vmcore/src/util/win/include" />
-                    </select>
-
-                    <select osfamily="unix">
-                        <include name="vmcore/src/util/linux/include" />
-                    </select>
+                    <include name="vmcore/src/util/win/include" if="is.windows"/>
+                    <include name="vmcore/src/util/linux/include" if="is.unix"/>
                 </dirset>
 
                 <dirset dir="${src}">
@@ -57,18 +52,12 @@
 
             <defineset define="BUILDING_EM" />
 
-            <select os="win">
-                <defineset define="_USRDLL" />
-            </select>
+            <defineset define="_USRDLL" if="is.windows"/>
 
             <fileset dir="${src}/em/src">
                 <include name="*.cpp" />
             </fileset>
 
-            <select osfamily="unix">
-                <compilerarg value="-Wno-deprecated" />
-                <compilerarg value="-fno-exceptions" />
-            </select>
        </compiler>
 
         <linker id="linker" extends="common.linker">
@@ -81,18 +70,14 @@
             <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">
-                <syslibset type="shared" libs="m,dl,stdc++,z,xml2,pthread" />
-                <linkerarg value="--version-script=${build.vm.home}/em/build/em.exp" />
-                <!-- syslibset type="static" libs="z,pthread,xml2" />
-                <syslibset type="shared" libs="m,dl,stdc++" / -->
-            </select>
-            <select os="freebsd">
-                <syslibset type="shared" libs="m,stdc++,z,pthread" />
-                <libset libs="xml2" dir="/usr/local/lib" />
-                <linkerarg value="--export-dynamic" />
-                <linkerarg value="--version-script=${build.vm.home}/em/build/em.exp" />
-            </select>
+            
+            <syslibset type="shared" libs="m,dl,stdc++,z,xml2,pthread" if="is.linux"/>
+            
+            <syslibset type="shared" libs="m,stdc++,z,pthread" if="is.freebsd"/>
+            <libset libs="xml2" dir="/usr/local/lib" if="is.freebsd"/>
+            <linkerarg value="--export-dynamic" if="is.freebsd"/>
+            
+            <linkerarg value="--version-script=${build.vm.home}/em/build/em.exp" if="is.unix"/>
         </linker>
     </target>
 </project>

Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/encoder.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/encoder.xml?rev=593491&r1=593490&r2=593491&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/encoder.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/encoder.xml Fri Nov  9 02:52:43 2007
@@ -35,18 +35,14 @@
 
         <compiler id="cpp.compiler" extends="common.cpp.compiler">
             <defineset define="APR_DECLARE_EXPORT" />
-            <defineset define="NO_EBCODER_INLINE" />
+            <!--defineset define="NO_EBCODER_INLINE" /-->
 
             <includepath>
                 <pathelement location="${build.vm.home}/include" />
             </includepath>
             <fileset dir="${build.vm.home}/port/src/encoder">
-                <select arch="ia32,em64t">
-                    <include name="ia32_em64t/*.cpp" />
-                </select>
-                <select arch="ipf">
-                    <include name="ipf/*.cpp" />
-                </select>
+                <include name="ia32_em64t/*.cpp" unless="is.ia64"/>
+                <include name="ipf/*.cpp" if="is.ia64"/>
             </fileset>
         </compiler>
     </target>

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?rev=593491&r1=593490&r2=593491&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_cc.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_cc.xml Fri Nov  9 02:52:43 2007
@@ -43,12 +43,8 @@
                     <include name="include" />
                     <include name="vmcore/include" />
                     <include name="vm/interface" />
-                    <select os="win">
-                        <include name="vmcore/src/util/win/include" />
-                    </select>
-                    <select osfamily="unix">
-                        <include name="vmcore/src/util/linux/include" />
-                    </select>
+                    <include name="vmcore/src/util/win/include" if="is.windows"/>
+                    <include name="vmcore/src/util/linux/include" if="is.unix"/>
                 </dirset>
             </includepath>
 
@@ -58,46 +54,27 @@
 
             <defineset define="BUILDING_GC" />
 
-            <select os="freebsd">
-                <defineset define="FREEBSD" />
-            </select>
-
-            <select os="win">
-                <defineset define="_USRDLL" />
-            </select>
-
-            <select os="win" cfg="release" cxx="icl">
-                <compilerarg value="/Qip" />
-            </select>
+            <defineset define="_USRDLL" if="is.windows"/>
         </compiler>
 
-        <select os="win" arch="ipf">
+        <!--select os="win" arch="ipf">
             <fileset id="asm.fileset"
                      dir="${build.vm.home}/gc_cc/src">
                 <include name="ini_ipf_low_level.asm" />
             </fileset>
-        </select>
+        </select-->
 
         <linker id="linker" extends="common.linker">
-            <select os="win">
-                <syslibset libs="advapi32,odbc32,ws2_32,mswsock" />
-                <libset libs="${vm.vmcore.lib}" dir="${vm.vmcore.libdir}" />
-            </select>
-
-            <select os="win" arch="ipf">
-                <syslibset libs="AdvAPI32" />
-            </select>
-
-            <select os="win" cfg="debug" arch="ia32">
-                <linkerarg value="/NODEFAULTLIB:libcmtd.lib" />
-                <syslibset libs="msvcrtd" />
-            </select>
+            <syslibset libs="advapi32,odbc32,ws2_32,mswsock" if="is.windows"/>
+            <libset libs="${vm.vmcore.lib}" dir="${vm.vmcore.libdir}" if="is.windows"/>
+            <syslibset libs="AdvAPI32" if="is.windows.ia64"/>
+
+            <linkerarg value="/NODEFAULTLIB:libcmtd.lib" if="is.windows.x86" unless="is.cfg.release"/>
+            <syslibset libs="msvcrtd" if="is.windows.x86" unless="is.cfg.release"/>
 
             <libset libs="${vm.hythr.lib}" dir="${vm.hythr.libdir}" />
-            <select os="lnx">
-                <linkerarg value="-Bsymbolic" />
-                <linkerarg value="--version-script=${build.vm.home}/gc_cc/build/gc_cc.exp" />
-            </select>
+            <linkerarg value="-Bsymbolic" if="is.unix"/>
+            <linkerarg value="--version-script=${build.vm.home}/gc_cc/build/gc_cc.exp" if="is.unix"/>
         </linker>
 
          <!-- Java helpers -->

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?rev=593491&r1=593490&r2=593491&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_gen.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/gc_gen.xml Fri Nov  9 02:52:43 2007
@@ -43,12 +43,8 @@
                     <include name="include" />
                     <include name="vmcore/include" />
                     <include name="vm/interface" />
-                    <select os="win">
-                        <include name="vmcore/src/util/win/include" />
-                    </select>
-                    <select osfamily="unix">
-                        <include name="vmcore/src/util/linux/include" />
-                    </select>
+                    <include name="vmcore/src/util/win/include" if="is.windows"/>
+                    <include name="vmcore/src/util/linux/include" if="is.unix"/>
                 </dirset>
             </includepath>
 
@@ -70,46 +66,28 @@
 
             <defineset define="BUILDING_GC" />
 
-            <select os="freebsd">
-                <defineset define="FREEBSD" />
-            </select>
-
-            <select os="win">
-                <defineset define="_USRDLL" />
-            </select>
-
-            <select os="win" cfg="release" cxx="icl">
-                <compilerarg value="/Qip" />
-            </select>
+            <defineset define="_USRDLL" if="is.windows"/>
         </compiler>
 
-        <select os="win" arch="ipf">
+        <!--select os="win" arch="ipf">
             <fileset id="asm.fileset"
                      dir="${build.vm.home}/gc_gen/src">
                 <include name="ini_ipf_low_level.asm" />
             </fileset>
-        </select>
+        </select-->
 
         <linker id="linker" extends="common.linker">
-            <select os="win">
-                <syslibset libs="advapi32,odbc32,ws2_32,mswsock" />
-                <libset libs="${vm.vmcore.lib}" dir="${vm.vmcore.libdir}" />
-            </select>
-
-            <select os="win" arch="ipf">
-                <syslibset libs="AdvAPI32" />
-            </select>
-
-            <select os="win" cfg="debug">
-                <linkerarg value="/NODEFAULTLIB:libcmtd.lib" />
-                <syslibset libs="msvcrtd" />
-            </select>
+            <syslibset libs="advapi32,odbc32,ws2_32,mswsock" if="is.windows"/>
+            <libset libs="${vm.vmcore.lib}" dir="${vm.vmcore.libdir}" if="is.windows"/>
+
+            <syslibset libs="AdvAPI32" if="is.windows.ia64"/>
+
+            <linkerarg value="/NODEFAULTLIB:libcmtd.lib" if="is.windows" unless="is.cfg.release"/>
+            <syslibset libs="msvcrtd" if="is.windows" unless="is.cfg.release"/>
 
             <libset libs="${vm.hythr.lib}" dir="${vm.hythr.libdir}" />
-            <select os="lnx">
-                <linkerarg value="-Bsymbolic" />
-                <linkerarg value="--version-script=${build.vm.home}/gc_gen/build/gc_gen.exp" />
-            </select>
+            <linkerarg value="-Bsymbolic" if="is.unix"/>
+            <linkerarg value="--version-script=${build.vm.home}/gc_gen/build/gc_gen.exp" if="is.unix"/>
         </linker>
 
         <!-- Java helpers -->

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?rev=593491&r1=593490&r2=593491&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml Fri Nov  9 02:52:43 2007
@@ -45,41 +45,12 @@
 
             <fileset dir="${src}">
                 <include name="thread/src/*.c" />
-                <select os="win">
-                  <include name="thread/src/win/*.c" />
-                </select>
-                <select osfamily="unix">
-                  <include name="thread/src/linux/*.c" />
-                </select>
+              <include name="thread/src/win/*.c" if="is.windows"/>
+              <include name="thread/src/linux/*.c" if="is.unix"/>
             </fileset>
 
-            <select os="win" cfg="release" cxx="icl">
-                <compilerarg value="/Qip" />
-            </select>
-
-            <select os="win">
-                <defineset define="_USRDLL" />
-            </select>
-
-            <select os="freebsd">
-                <defineset define="FREEBSD" />
-            </select>
-            <select os="macosx">
-                <defineset define="MACOSX" />
-            </select>
-            <select os="lnx">
-                <defineset define="LINUX" />
-            </select>
-            <select os="lnx" arch="em64t,ipf">
-                <defineset define="LINUX64" />
-                <defineset define="LINUXPPC64" />
-            </select>
-            <select os="win" arch="em64t">
-                <defineset define="_EM64T_" />
-            </select>
-            <select osfamily="unix">
-                <compilerarg value="-fno-exceptions" />
-            </select>
+            <defineset define="_USRDLL" if="is.windows"/>
+
             <defineset define="APR_DECLARE_STATIC" />
         </compiler>
 
@@ -96,31 +67,17 @@
             <libset libs="${extra.apr.lib}"
                     dir="${extra.apr.libdir}" />
 
-                    
-            <select os="win">
-                <linkerarg value="/DEF:${src}/thread/src/hythr.def" />
-            </select>
-
-            <select cfg="debug" os="win">
-                <linkerarg value="/NODEFAULTLIB:libcmt.lib" />
-            </select>
-
-            <select os="lnx">
-                <syslibset libs="stdc++,rt,pthread" />
-                <linkerarg value="-Wl,-init" />
-                <linkerarg value="-Wl,hythread_library_init" />
-                <linkerarg value="-Wl,--version-script,${src}/thread/src/hythr.exp" />
-            </select>
-            <select os="freebsd">
-                <syslibset libs="stdc++,pthread" />
-                <linkerarg value="-Wl,-init" />
-                <linkerarg value="-Wl,hythread_library_init" />
-                <linkerarg value="-Wl,--version-script,${src}/thread/src/hythr.exp" />
-            </select>
-
-            <select os="win">
-                <syslibset libs="advapi32,ws2_32" />
-            </select>
+            <linkerarg value="/DEF:${src}/thread/src/hythr.def" if="is.windows"/>
+
+            <linkerarg value="/NODEFAULTLIB:libcmt.lib" if="is.windows" unless="is.cfg.release"/>
+
+            <syslibset libs="stdc++,rt,pthread" if="is.linux"/>
+            <syslibset libs="stdc++,pthread" if="is.freebsd"/>
+            <linkerarg value="-Wl,-init" if="is.unix"/>
+            <linkerarg value="-Wl,hythread_library_init" if="is.unix"/>
+            <linkerarg value="-Wl,--version-script,${src}/thread/src/hythr.exp" if="is.unix"/>
+
+            <syslibset libs="advapi32,ws2_32" if="is.windows"/>
         </linker>
 
     </target>

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?rev=593491&r1=593490&r2=593491&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/interpreter.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/interpreter.xml Fri Nov  9 02:52:43 2007
@@ -42,127 +42,60 @@
                 <include name="interpreter_ti.cpp" />
                 <include name="interp_exports.cpp" />
                 <include name="interp_vm_helpers.cpp" />
-                <select arch="ia32">
-                    <include name="interp_native_ia32.cpp" />
-                </select>
-                <select arch="ipf">
-                    <include name="interp_native_ipf.cpp" />
-                </select>
-                <select arch="em64t">
-                    <include name="interp_native_em64t.cpp" />
-                </select>
+                <include name="interp_native_ia32.cpp" if="is.x86"/>
+                <include name="interp_native_ipf.cpp" if="is.ia64"/>
+                <include name="interp_native_em64t.cpp" if="is.x86_64"/>
             </fileset>
 
+            <includepath path="${extra.zlib.includes}" if="is.windows"/>
             <includepath>
                 <pathelement location="${extra.apr.includes}" />
                 <pathelement location="${extra.log4cxx.includes}" />
 
-                <select os="win">
-                    <pathelement location="${extra.zlib.includes}" />
-                </select>
-            </includepath>
-
-            <includepath>
                 <dirset dir="${build.vm.home}">
                     <include name="include" />
                     <include name="vmcore/include" />
                     <include name="port/include" />
 
-                    <select os="win">
-                        <include name="vmcore/src/util/win/include" />
-                        <include name="vm/win" />
-                    </select>
-
-                    <select osfamily="unix">
-                        <include name="vm/common/base" />
-                        <include name="vmcore/src/util/linux/include" />
-                    </select>
-
-                    <select arch="ipf">
-                        <include name="vmcore/src/util/ipf/include" />
-                        <include name="vm/ipf/include" />
-                        <include name="vmcore/src/util/ipf/base_natives" />
-                        <include name="vm/ipf/dynopt_ipf" />
-                        <include name="port/src/lil/ipf/pim/include" />
-                    </select>
-
-                    <select arch="ia32">
-                        <include name="vmcore/src/util/ia32/base_natives" />
-                        <include name="vm/ia32/debugger/include" />
-                        <include name="port/src/encoder/ia32_em64t" />
-                        <include name="port/src/lil/ia32/pim/include" />
-                    </select>
-
-                    <select arch="em64t">
-                        <include name="vmcore/src/util/em64t/base_natives" />
-                        <include name="vm/em64t/debugger/include" />
-                        <include name="port/src/encoder/ia32_em64t" />
-                        <include name="port/src/lil/em64t/pim/include" />
-                    </select>
-
-                    <select os="win" arch="ipf">
-                        <include name="vm/common/dynopt" />
-                    </select>
+                    <include name="vmcore/src/util/win/include" if="is.windows"/>
+                    <include name="vmcore/src/util/linux/include" if="is.unix"/>
+
+                    <include name="vmcore/src/util/ipf/include" if="is.ia64"/>
+                    <include name="vmcore/src/util/ipf/base_natives" if="is.ia64"/>
+                    <include name="port/src/lil/ipf/pim/include" if="is.ia64"/>
+
+                    <include name="vmcore/src/util/ia32/base_natives" if="is.x86"/>
+                    <include name="port/src/encoder/ia32_em64t" if="is.x86"/>
+                    <include name="port/src/lil/ia32/pim/include" if="is.x86"/>
+
+                    <include name="vmcore/src/util/em64t/base_natives" if="is.x86_64"/>
+                    <include name="port/src/encoder/ia32_em64t" if="is.x86_64"/>
+                    <include name="port/src/lil/em64t/pim/include" if="is.x86_64"/>
                 </dirset>
             </includepath>
 
             <defineset define="GC_V4,USE_DLL_JIT,BUILDING_JIT" />
 
-            <select os="win">
-                <select cfg="release">
-                    <compilerarg value="/Op" />
-
-                    <select cxx="icl">
-                        <compilerarg value="/Qip" />
-                    </select>
-                </select>
-
-                <select cxx="icl">
-                    <compilerarg value="-Qwd1572" />
-                </select>
-            </select>
-
-            <select os="win" cxx="icl">
-                <compilerarg value="-Qwd1572" />
-            </select>
+            <compilerarg value="/Op" if="is.windows" unless="is.cfg.debug"/>
+            <compilerarg value="-Qwd1572" if="is.icl"/>
         </compiler>
 
         <fileset id="asm.fileset" dir="${src}">
-            <select os="lnx,freebsd" arch="ia32">
-                <include name="invokeJNI_ia32.asm" />
-            </select>
-
-            <select os="lnx" arch="em64t">
-                <include name="invokeJNI_em64t.asm" />
-            </select>
-
-            <select os="lnx" arch="ipf">
-                <include name="invokeJNI_ipf.asm" />
-            </select>
-
-            <select os="win" arch="ia32">
-                <exclude name="*" />
-            </select>
-            <select os="win" arch="ipf">
-                <include name="invokeJNI_Windows_ipf.asm" />
-            </select>
-            <select os="win" arch="em64t">
-                <include name="invokeJNI_Windows_em64t.asm" />
-            </select>
+            <include name="invokeJNI_ia32.asm" if="is.unix.x86"/>
+            <include name="invokeJNI_em64t.asm" if="is.unix.x86_64"/>
+            <include name="invokeJNI_ipf.asm" if="is.unix.ia64"/>
+
+            <exclude name="*" if="is.windows.x86"/>
+            <include name="invokeJNI_Windows_ipf.asm" if="is.windows.ia64"/>
+            <include name="invokeJNI_Windows_em64t.asm" if="is.windows.x86_64"/>
         </fileset>
 
         <linker id="linker" extends="common.linker">
-            <select os="lnx">
-                <linkerarg value="--version-script=${build.vm.home}/interpreter/build/interpreter.exp" />
-            </select>
-
-            <select os="win" cfg="debug">
-                <linkerarg value="/NODEFAULTLIB:libcmt.lib" />
-            </select>
-
-            <select os="win">
-                <syslibset libs="advapi32,userenv,ws2_32,vmcore,odbc32,mswsock" />
-            </select>
+            <linkerarg value="--version-script=${build.vm.home}/interpreter/build/interpreter.exp" if="is.unix"/>
+
+            <linkerarg value="/NODEFAULTLIB:libcmt.lib" if="is.windows" unless="is.cfg.release"/>
+
+            <syslibset libs="advapi32,userenv,ws2_32,vmcore,odbc32,mswsock" if="is.windows"/>
 
             <libset libs="${vm.vmcore.lib}" dir="${vm.vmcore.libdir}" />
            <libset libs="${vm.hythr.lib}" dir="${vm.hythr.libdir}" />

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?rev=593491&r1=593490&r2=593491&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml Fri Nov  9 02:52:43 2007
@@ -26,7 +26,7 @@
   -->
 
 <project name="vm.jitrino">
-    <target name="init" depends="common_vm">
+    <target name="init" depends="-init-win,-init-unix">
         <property name="build.depends" value="extra.apr,vm.vmcore,vm.encoder,vm.hythr" />
         <property name="outtype" value="shared" />
         <property name="libname" value="jitrino" />
@@ -46,7 +46,7 @@
 
         <patternset id="java.classes.pattern" includes="empty_pattern"/>
 
-        <compiler id="cpp.compiler" extends="common.cpp.compiler">
+        <compiler id="cpp.compiler" extends="plaf.cpp.compiler">
             <fileset dir="${src}">
                 <include name="dynopt/*.cpp" />
                 <include name="main/*.cpp" />
@@ -57,19 +57,10 @@
                 <include name="translator/*.cpp" />
                 <include name="translator/java/*.cpp" />
                 <include name="vm/*.cpp" />
-                <include name="codegenerator/*.cpp" />
 
-                <select arch="ipf">
-                    <include name="codegenerator/ipf/*.cpp" />
-                    <!-- <include name="codegenerator/ipf/msched/*.cpp" />
-                    <include name="codegenerator/ipf/msched/MachineModel/common/*.cpp" />
-                    <include name="codegenerator/ipf/msched/MachineModel/mckinley/*.cpp" /> -->
-                </select>
-
-                <select arch="ia32,em64t">
-                    <include name="codegenerator/ia32/*.cpp" />
-                    <include name="jet/*.cpp" />
-                </select>
+                <include name="codegenerator/ipf/*.cpp" if="is.ia64"/>
+                <include name="codegenerator/ia32/*.cpp" unless="is.ia64"/>
+                <include name="jet/*.cpp" unless="is.ia64"/>
             </fileset>
 
             <includepath>
@@ -85,83 +76,101 @@
                     <include name="vm" />
                     <include name="codegenerator" />
 
-                    <select arch="ia32,em64t">
-                        <include name="codegenerator/ia32" />
-                        <include name="jet" />
-                    </select>
-
-                    <select arch="ipf">
-                        <include name="codegenerator/ipf" />
-                        <include name="codegenerator/ipf/include" />
-                        <!-- <include name="codegenerator/ipf/msched" />
-                        <include name="codegenerator/ipf/msched/MachineModel/common" />
-                        <include name="codegenerator/ipf/msched/MachineModel/mckinley" /> -->
-                    </select>
+                    <include name="codegenerator/ia32" unless="is.ia64"/>
+                    <include name="jet" unless="is.ia64"/>
+
+                    <include name="codegenerator/ipf" if="is.ia64"/>
+                    <include name="codegenerator/ipf/include" if="is.ia64"/>
                 </dirset>
             </includepath>
 
-            <select arch="ia32,em64t">
-                <includepath>
-                    <dirset dir="${build.vm.home}">
-                        <include name="port/src/encoder/ia32_em64t" />
-                    </dirset>
-                </includepath>
-            </select>
+            <includepath unless="is.ia64">
+                <dirset dir="${build.vm.home}">
+                    <include name="port/src/encoder/ia32_em64t" />
+                </dirset>
+            </includepath>
 
             <includepath>
                 <pathelement location="${extra.apr.includes}" />
                 <pathelement location="${build.vm.home}/include" />
                 <pathelement location="${build.vm.home}/vmcore/include" />
                 <pathelement location="${build.vm.home}/port/include" />
+            </includepath>
+            <includepath path="${build.vm.home}/vmcore/src/util/win/include" if="is.windows"/>
+            <includepath path="${build.vm.home}/vmcore/src/util/linux/include" if="is.unix"/>
+
+            <defineset define="PROJECT_JITRINO" />
+            <defineset define="JIT_LOGS,JIT_STATS" if="is.cfg.debug" />
+            
+        </compiler>
+        
+        <linker name="${build.cxx}" id="linker">
+            <!--select os="win">
+                <select arch="ipf">
+                    <linkerarg value="/MACHINE:IA64" />
+                </select>
 
-                <select os="win">
-                    <pathelement location="${build.vm.home}/vmcore/src/util/win/include" />
+                <select arch="em64t">
+                    <linkerarg value="/MACHINE:X64" />
                 </select>
 
-                <select osfamily="unix">
-                    <pathelement location="${build.vm.home}/vmcore/src/util/linux/include" />
+                <select arch="ia32">
+                    <linkerarg value="/MACHINE:X86" />
                 </select>
-            </includepath>
 
-            <defineset define="PROJECT_JITRINO" />
+                <linkerarg value="/DLL" />
+                <linkerarg value="/SUBSYSTEM:WINDOWS" />
+                <linkerarg value="/DEBUG" />
+                <linkerarg value="/NOLOGO" />
+                <linkerarg value="/FIXED:NO" />
+                
+                <linkerarg value="/OUT:${libdir}/" />
+                </select-->
+            <libset libs="${vm.vmcore.lib}" dir="${vm.vmcore.libdir}" if="is.windows"/>
+            <libset libs="${vm.encoder.lib}" dir="${vm.encoder.libdir}" if="is.windows"/>
+            <libset libs="${vm.hythr.lib}" dir="${vm.hythr.libdir}" if="is.windows"/>
+            
+            <linkerarg value="/OPT:REF" if="is.windows"/>
+
+            <linkerarg value="-shared" if="is.unix"/>
+            <linkerarg value="-lm" if="is.unix"/>
+            <linkerarg value="--version-script=${build.vm.home}/jitrino/build/jitrino.exp" if="is.unix"/>
+            <linkerarg value="-ldl" if="is.linux"/>
+        </linker>
+
+        <echo message="Copying the configuration jitrino files..."/>
+ 
+        <copy todir="${build.semi.dir}/vm/jitrino/_other" 
+              flatten="true" 
+              includeEmptyDirs="false">
+              <fileset dir="${build.VM.home}/jitrino/config">
+                   <include name="${build.arch}/**" />
+              </fileset>
+        </copy>
+    </target>
 
             <!-- windows specific -->
-            <select os="win">
+        <target name="-init-win" depends="common_vm" if="is.windows">
+            <compiler id="plaf.cpp.compiler" extends="common.cpp.compiler">
                 <compilerarg value="/Fo${build.semi.dir}/vm/jitrino/_obj/" />
 
                 <!-- _CRT_SECURE_NO_DEPRECATE added to suppress a huge amount of complaints from msvc em64t compiler -->
                 <defineset define="PLATFORM_NT,_WINDLL,_MBCS,_REENTRANT,__SMP__,WIN32,_WIN32,_CRT_SECURE_NO_DEPRECATE,_HAS_ITERATOR_DEBUGGING=0,_SECURE_SCL=0" />
 
-                <compilerarg value="/nologo" />
-                <compilerarg value="/EHsc" />
                 <compilerarg value="/TP" />
-                <compilerarg value="/Zi" />
                 <compilerarg value="/Zc:forScope" />
                 <compilerarg value="/WL" />
                 <compilerarg value="/W4" />
 <!--                <compilerarg value="/WX" /> -->
 
-                <select cfg="debug">
-                    <compilerarg value="/Od" />
-                    <compilerarg value="/Gm" />
-                    <compilerarg value="/RTC1" />
-                    <compilerarg value="/MTd" />
-                </select>
-
-                <select cfg="release">
-                    <compilerarg value="/O2" />
-                    <compilerarg value="/Ot" />
-                    <compilerarg value="/MT" />
-                </select>
+                <compilerarg value="/Gm" if="is.cfg.debug"/>
+                <compilerarg value="/RTC1" if="is.cfg.debug"/>
 
-                <select cxx="icl">
-                    <select cfg="release">
-                        <compilerarg value="/Qip" />
-                        <compilerarg value="/Qvec_report0" />
-                    </select>
+                <compilerarg value="/Ot" if="is.cfg.release"/>
 
-                    <compilerarg value="/Qww1,82,111,172,181,279,280,373,424,593,654,858" />
-                    <compilerarg value="/Qwd82,193,271,304,373,383,424,444,654,869,981,1125,1418,1419,1572,1683" />
+                <compilerarg value="/Qvec_report0" if="is.icl" unless="is.cfg.debug"/>
+                <compilerarg value="/Qww1,82,111,172,181,279,280,373,424,593,654,858" if="is.icl"/>
+                <compilerarg value="/Qwd82,193,271,304,373,383,424,444,654,869,981,1125,1418,1419,1572,1683" if="is.icl"/>
                     <!--
                       # /Qwd[tag,...] Disable the soft diagnostics that corresponds to tag. 
                       # /Qwr[tag,...] Override the severity of the soft diagnostics corresponding to tag and make it a remark. 
@@ -194,18 +203,14 @@
                       # warning #1125: function "xxx" is hidden by "yyy" - virtual function override intended?
                       # warning #1572: floating-point equality and inequality comparisons are unreliable
                     -->
-                </select>
 
-                <select cxx="msvc">
-                    <compilerarg value="/wd4201" />
-                    <compilerarg value="/wd4244" />
-                    <compilerarg value="/wd4512" />
-                    <compilerarg value="/wd4702" />
-                    <compilerarg value="/wd4100" />
-                    <compilerarg value="/wd4127" />
-                    <select cfg="release">
-                        <compilerarg value="/wd4718" />
-                    </select>
+                <compilerarg value="/wd4201" if="is.msvc"/>
+                <compilerarg value="/wd4244" if="is.msvc"/>
+                <compilerarg value="/wd4512" if="is.msvc"/>
+                <compilerarg value="/wd4702" if="is.msvc"/>
+                <compilerarg value="/wd4100" if="is.msvc"/>
+                <compilerarg value="/wd4127" if="is.msvc"/>
+                <compilerarg value="/wd4718" if="is.msvc" unless="is.cfg.debug"/>
                     <!--
                       #4201 - W4, nonstandart extention - nameless struct or union
                       #4702 - W4, unreachable code (fired in STL's <list>)
@@ -219,127 +224,35 @@
                       # the default name is the same for all input files (vc70.pdb) and 
                       # thus causes problems during parralel build.
                     -->
-                </select>
-            </select>
-
-            <!-- linux specific -->
-            <select osfamily="unix">
-                <defineset define="PLATFORM_POSIX,LINUX" />
-
-                <select cxx="gcc">
-                    <compilerarg value="-fmessage-length=0" />
-                    <compilerarg value="-Wall" />
-                    <compilerarg value="-Werror" />
-                </select>
+            </compiler>
+        </target>
+        
+        <target name="-init-unix" depends="common_vm" if="is.unix">
+            <compiler id="plaf.cpp.compiler" extends="common.cpp.compiler">
+                <compilerarg value="-fmessage-length=0" if="is.gcc"/>
+                <compilerarg value="-Wall" if="is.gcc"/>
+                <compilerarg value="-Werror" if="is.gcc"/>
 
                 <compilerarg value="-x" />
                 <compilerarg value="c++" />
                 <compilerarg value="-fPIC" />
                 <compilerarg value="-fno-exceptions" />
 
-                <select cxx="icc">
-                    <compilerarg value="-wd68" />
-                    <compilerarg value="-wd654" />
-                    <compilerarg value="-wd854" />
-                    <compilerarg value="-wd470" />
-                    <compilerarg value="-wd1572" />
-                    <compilerarg value="-wd1125" />
+                <compilerarg value="-wd68" if="is.icc"/>
+                <compilerarg value="-wd654" if="is.icc"/>
+                <compilerarg value="-wd854" if="is.icc"/>
+                <compilerarg value="-wd470" if="is.icc"/>
+                <compilerarg value="-wd1572" if="is.icc"/>
+                <compilerarg value="-wd1125" if="is.icc"/>
                     <!--                        
                       # 470 - 'qualified name is not allowed in member declaration'
                       # warning #1125: function "xxx" is hidden by "yyy"
                       - virtual function override intended 
                       # warning #1572: floating-point equality and inequality comparisons are unreliable
                     -->
-                </select>
-
-                <select cfg="debug">
-                    <compilerarg value="-g" />
-                    <compilerarg value="-O0" />
-                </select>
-
-                <select cfg="release">
-                    <compilerarg value="-O" />
-                </select>
-            </select>
-
-            <!-- arch specific -->
-            <select arch="ia32">
-                <defineset define="_IA32_" />
-            </select>
-
-            <select arch="em64t">
-                <defineset define="_EM64T_" />
-                <defineset define="POINTER64" />
-                <select os="win">
-                    <compilerarg value="-D_WIN64" />
-                </select>
-            </select>
-
-            <select arch="ipf">
-                <defineset define="_IPF_" />
-                <defineset define="POINTER64" />
-                <select os="win">
-                    <compilerarg value="-D_WIN64" />
-                </select>
-            </select>
-
-            <!-- only in debug mode -->
-            <select cfg="debug">
-                <defineset define="_DEBUG,JIT_LOGS,JIT_STATS" />
-            </select>
-
-            <!-- only in release mode -->
-            <select cfg="release">
-                <defineset define="NDEBUG" />
-            </select>
-        </compiler>
-
-        <linker name="${build.cxx}" id="linker">
-            <select os="win">
-                <select arch="ipf">
-                    <linkerarg value="/MACHINE:IA64" />
-                </select>
-
-                <select arch="em64t">
-                    <linkerarg value="/MACHINE:X64" />
-                </select>
 
-                <select arch="ia32">
-                    <linkerarg value="/MACHINE:X86" />
-                </select>
-
-                <linkerarg value="/DLL" />
-                <linkerarg value="/SUBSYSTEM:WINDOWS" />
-                <linkerarg value="/DEBUG" />
-                <linkerarg value="/NOLOGO" />
-                <linkerarg value="/FIXED:NO" />
-                <linkerarg value="/OPT:REF" />
-                <linkerarg value="/OUT:${libdir}/" />
-
-                <libset libs="${vm.vmcore.lib}" dir="${vm.vmcore.libdir}" />
-                <libset libs="${vm.encoder.lib}" dir="${vm.encoder.libdir}" />
-                <libset libs="${vm.hythr.lib}" dir="${vm.hythr.libdir}" />
-
-            </select>
-
-            <select osfamily="unix">
-                <linkerarg value="-shared" />
-                <linkerarg value="-lm" />
-		<linkerarg value="--version-script=${build.vm.home}/jitrino/build/jitrino.exp" />
-            </select>
-            <select os="linux">
-                <linkerarg value="-ldl" />
-            </select>
-        </linker>
+                <compilerarg value="-O" if="is.unix" unless="is.cfg.debug"/>
+            </compiler>
+        </target>
 
-        <echo message="Copying the configuration jitrino files..."/>
- 
-        <copy todir="${build.semi.dir}/vm/jitrino/_other" 
-              flatten="true" 
-              includeEmptyDirs="false">
-              <fileset dir="${build.VM.home}/jitrino/config">
-                   <include name="${build.arch}/**" />
-              </fileset>
-        </copy>
-    </target>
 </project>

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?rev=593491&r1=593490&r2=593491&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/port.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/port.xml Fri Nov  9 02:52:43 2007
@@ -48,51 +48,27 @@
             <defineset define="BUILDING_VM" />
 
             <fileset dir="${build.vm.home}/port/src">
-                <select osfamily="unix">
-                    <include name="disasm/linux/*.c" />
-                    <include name="file_io/linux/*.c" />
-                    <include name="misc/linux/*.c" />
-                    <include name="vmem/linux/*.c" />
-                    <include name="thread/linux/*.c" />
-
-                    <select arch="ia32,em64t">
-                        <include name="atomic/linux/*.c" />
-                    </select>
-
-                    <select arch="ipf">
-                        <include name="atomic/linux_ipf/*.c" />
-                    </select>
-                </select>
-
-                <select os="win">
-                    <include name="atomic/win/*.c" />
-                    <include name="disasm/win/*.c" />
-                    <include name="file_io/win/*.c" />
-                    <include name="misc/win/*.c" />
-                    <include name="vmem/win/*.c" />
-                    <include name="thread/win/*.c" />
-                </select>
+                <include name="disasm/linux/*.c" if="is.unix"/>
+                <include name="file_io/linux/*.c" if="is.unix"/>
+                <include name="misc/linux/*.c" if="is.unix"/>
+                <include name="vmem/linux/*.c" if="is.unix"/>
+                <include name="thread/linux/*.c" if="is.unix"/>
+
+                <include name="atomic/linux/*.c" if="is.unix" unless="is.ia64"/>
+                <include name="atomic/linux_ipf/*.c" if="is.unix.ia64"/>
+
+                <include name="atomic/win/*.c" if="is.windows"/>
+                <include name="disasm/win/*.c" if="is.windows"/>
+                <include name="file_io/win/*.c" if="is.windows"/>
+                <include name="misc/win/*.c" if="is.windows"/>
+                <include name="vmem/win/*.c" if="is.windows"/>
+                <include name="thread/win/*.c" if="is.windows"/>
             </fileset>
-
-            <select os="win">
-                <compilerarg value="/EHsc" />
-            </select>
-
-            <select osfamily="unix">
-                <compilerarg value="-fexceptions" />
-            </select>
         </compiler>
 
         <fileset id="asm.fileset" dir="${build.vm.home}/port/src">
-            <select os="win" arch="em64t">
-                <include name="atomic/win/*.asm" />
-            </select>
-            <select os="win" arch="ia32">
-                <exclude name="**" />
-            </select>
-            <select osfamily="unix">
-                <exclude name="**" />
-            </select>
+            <include name="atomic/win/*.asm" if="is.windows.x86_64"/>
+            <include name="atomic/linux_ipf/port_atomic_asm.asm" if="is.unix.ia64"/>
         </fileset>
 
         <compiler id="cpp.compiler" extends="common.cpp.compiler">
@@ -114,21 +90,9 @@
                 <include name="time/*.cpp" />
             </fileset>
 
-            <select os="win">
-                <compilerarg value="/EHsc" />
-            </select>
-
-            <select os="lnx">
-                <compilerarg value="-fexceptions" />
-            </select>
+            <compilerarg value="/EHsc" if="is.windows"/>
+            <compilerarg value="-fexceptions" if="is.unix"/>
         </compiler>
 
-        <select os="lnx" arch="ipf">
-            <fileset id="asm.fileset" dir="${src}">
-                <include name="port/src/atomic/linux_ipf/port_atomic_asm.asm" />
-            </fileset>
-
-            <property name="asm.args" value="-Wa,--fatal-warnings" />
-        </select>
     </target>
 </project>

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?rev=593491&r1=593490&r2=593491&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml Fri Nov  9 02:52:43 2007
@@ -28,7 +28,7 @@
 
 <project name="vm.vmcore">
 
-    <target name="stamp_version" depends="common_vm" if="svn.revision">
+    <target name="stamp_version" if="svn.revision" unless="skip.svn.stamp">
         <copy file="${build.vm.home}/vmcore/include/version_svn_tag_orig.h"
               tofile="${build.vm.home}/vmcore/include/version_svn_tag.h" overwrite="true">
             <filterset>
@@ -36,14 +36,26 @@
             </filterset>
         </copy>
     </target>
+    
+    <target name="-check-version" if="svn.revision">
+        <uptodate property="skip.svn.stamp" srcfile="${build.vm.home}/.svn/entries" 
+            targetfile="${build.vm.home}/vmcore/include/version_svn_tag.h"/>
+    </target>
 
-    <target name="copy_version" depends="common_vm" unless="svn.revision">
+    <target name="copy_version" unless="svn.revision">
         <copy file="${build.vm.home}/vmcore/include/version_svn_tag_orig.h"
               tofile="${build.vm.home}/vmcore/include/version_svn_tag.h" overwrite="false">
         </copy>
     </target>
 
-    <target name="init" depends="common_vm, stamp_version, copy_version">
+    <target name="-init-unix" if="is.unix">
+        <symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/${hy.platform}/libicuuc.so"
+            resource="${external.dep.CLASSLIB}/depends/libs/${hy.platform}/libicuuc.so.34"/>
+        <symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/${hy.platform}/libicudata.so"
+            resource="${external.dep.CLASSLIB}/depends/libs/${hy.platform}/libicudata.so.34"/>
+    </target>
+
+    <target name="init" depends="common_vm, -check-version, stamp_version, copy_version, -init-unix">
         <property name="build.depends" value="extra.apr,
                                               extra.aprutil,
                                               extra.log4cxx,
@@ -65,19 +77,7 @@
                 <pathelement location="${vm.port.includes}" />
             </includepath>
 
-            
             <defineset define="BUILDING_VM,GC_V4,USE_DLL_JIT,APR_DECLARE_STATIC" />
-
-            <select os="freebsd">
-                <defineset define="FREEBSD" />
-            </select>
-            <select os="macosx">
-                <defineset define="MACOSX" />
-            </select>
-            <select os="lnx">
-                <defineset define="LINUX" />
-            </select>
-
         </compiler>
 
         <compiler id="cpp.compiler" extends="common.cpp.compiler">
@@ -103,16 +103,10 @@
 
             <fileset dir="${build.vm.home}/vmcore/src/kernel_classes/native">
                 <include name="*.cpp" />
-
-                <select osfamily="unix">
-                    <exclude name="Runtime_win.cpp" />
-                    <exclude name="System_win.cpp" />
-                </select>
-
-                <select os="win">
-                    <exclude name="Runtime_lnx.cpp" />
-                    <exclude name="System_lnx.cpp" />
-                </select>
+                <exclude name="Runtime_win.cpp" if="is.unix"/>
+                <exclude name="System_win.cpp" if="is.unix"/>
+                <exclude name="Runtime_lnx.cpp" if="is.windows"/>
+                <exclude name="System_lnx.cpp" if="is.windows"/>
             </fileset>
 
             <fileset dir="${build.vm.home}">
@@ -120,223 +114,74 @@
                 <include name="port/src/lil/pim/*.cpp" />
                 <include name="vmstart/src/compmgr/*.cpp" />
 
-                <select arch="ipf">
-                    <include name="port/src/lil/ipf/pim/*.cpp" />
-                </select>
-
-                <select arch="ia32">
-                    <include name="port/src/lil/ia32/pim/*.cpp" />
-                </select>
-
-                <select arch="em64t">
-                    <include name="port/src/lil/em64t/pim/*.cpp" />
-                </select>
+                <include name="port/src/lil/ipf/pim/*.cpp" if="is.ia64"/>
+                <include name="port/src/lil/ia32/pim/*.cpp" if="is.x86"/>
+                <include name="port/src/lil/em64t/pim/*.cpp" if="is.x86_64"/>
             </fileset>
 
             <fileset dir="${build.vm.home}/vmcore/src">
-                <select os="win">
-                    <include name="thread/win/*.cpp" />
-                    <include name="util/win/*.cpp" />
-                </select>
-
-                <select os="win" arch="ia32">
-                    <include name="util/win/ia32/*.cpp" />
-                    <include name="util/win/ia32_em64t/*.cpp" />
-                </select>
-
-                <select os="win" arch="em64t">
-                    <include name="util/win/em64t/*.cpp" />
-                    <include name="util/win/ia32_em64t/*.cpp" />
-                </select>
-
-                <select os="win" arch="ipf">
-                    <include name="util/win/ipf/*.cpp" />
-                </select>
-
-                <select arch="ipf">
-                    <include name="util/ipf/base/*.cpp" />
-                    <include name="util/ipf/base_natives/*.cpp" />
-                    <include name="util/ipf/code_emit/*.cpp" />
-                </select>
-
-                <select arch="ia32">
-                    <include name="util/ia32/base/*.cpp" />
-                    <include name="util/ia32/base_natives/*.cpp" />
-                </select>
-
-                <select arch="em64t">
-                    <include name="util/em64t/base/*.cpp" />
-                    <include name="util/em64t/base_natives/*.cpp" />
-                </select>
-
-                <select osfamily="unix">
-                    <include name="thread/linux/*.cpp" />
-                    <include name="util/linux/os_wrapper.cpp" />
-                    <include name="util/linux/stubs.cpp" />
-                    <include name="util/linux/crash_handler.cpp" />
-                    <include name="util/linux/native_modules.cpp" />
-
-                    <select arch="ia32">
-                        <include name="util/linux/signals_ia32.cpp" />
-                    </select>
-
-                    <select arch="em64t">
-                        <include name="util/linux/signals_em64t.cpp" />
-                    </select>
-
-                    <select arch="ipf">
-                        <include name="util/linux/signals_ipf.cpp" />
-                    </select>
-                </select>
+                <include name="thread/win/*.cpp" if="is.windows"/>
+                <include name="util/win/*.cpp" if="is.windows"/>
+
+                <include name="util/win/ia32/*.cpp" if="is.windows.x86"/>
+                <include name="util/win/em64t/*.cpp" if="is.windows.x86_64"/>
+                <include name="util/win/ia32_em64t/*.cpp" if="is.windows" unless="is.ia64"/>
+                <include name="util/win/ipf/*.cpp" if="is.windows.ia64"/>
+
+                <include name="util/ipf/**/*.cpp" if="is.ia64"/>
+                <include name="util/ia32/**/*.cpp" if="is.x86"/>
+                <include name="util/em64t/**/*.cpp" if="is.x86_64"/>
+
+                <include name="thread/linux/*.cpp" if="is.unix"/>
+                <include name="util/linux/*.cpp" if="is.unix"/>
+                <exclude name="util/linux/signals_ia32.cpp" unless="is.unix.x86"/>
+                <exclude name="util/linux/signals_em64t.cpp" unless="is.unix.x86_64"/>
+                <exclude name="util/linux/signals_ipf.cpp" unless="is.unix.ia64"/>
             </fileset>
 
+            <includepath path="${extra.zlib.includes}" if="is.windows"/>
             <includepath>
                 <pathelement location="${extra.apr.includes}" />
                 <pathelement location="${extra.apr.includes}/apr-1" />
                 <pathelement location="${extra.log4cxx.includes}" />
-		<pathelement location="${external.dep.CLASSLIB.includes}/icu4c" />		
-                <select os="win">
-                    <pathelement location="${extra.zlib.includes}" />
-                </select>
-            </includepath>
+		        <pathelement location="${external.dep.CLASSLIB.includes}/icu4c" />
 
-            <includepath>
                 <dirset dir="${build.vm.home}">
                     <include name="include" />
                     <include name="vmcore/include" />
                     <include name="port/include" />
+                
+                    <include name="vmcore/src/util/win/include" if="is.windows"/>
+                    <include name="vmcore/src/util/linux/include" if="is.unix"/>
+
+                    <include name="vmcore/src/util/ipf/include" if="is.ia64"/>
+                    <include name="vmcore/src/util/ipf/base_natives" if="is.ia64"/>
+                    <include name="port/src/lil/ipf/pim/include" if="is.ia64"/>
+
+                    <include name="vmcore/src/util/ia32/base_natives" if="is.x86"/>
+                    <include name="port/src/encoder/ia32_em64t" if="is.x86"/>
+                    <include name="port/src/lil/ia32/pim/include" if="is.x86"/>
+
+                    <include name="vmcore/src/util/em64t/base_natives" if="is.x86_64"/>
+                    <include name="port/src/encoder/ia32_em64t" if="is.x86_64"/>
+                    <include name="port/src/lil/em64t/pim/include" if="is.x86_64"/>
                 </dirset>
-		
-		<pathelement path="${external.dep.CLASSLIB.includes}/icu4c" />
-                <pathelement path="${extra.log4cxx.includes}" />
-
-                <select os="win">
-                    <dirset dir="${build.vm.home}">
-                        <include name="vmcore/src/util/win/include" />
-                        <include name="vm/win" />
-                    </dirset>
-
-                    <pathelement path="${extra.zlib.includes}" />
-                </select>
-
-                <select osfamily="unix">
-                    <dirset dir="${build.vm.home}">
-                        <include name="vm/common/base" />
-                        <include name="vmcore/src/util/linux/include" />
-                        <include name="vm/linux" />
-                    </dirset>
-                </select>
-
-                <select arch="ipf">
-                    <dirset dir="${build.vm.home}">
-                        <include name="vmcore/src/util/ipf/include" />
-                        <include name="vm/ipf/base" />
-                        <include name="vmcore/src/util/ipf/base_natives" />
-                        <include name="vm/ipf/dynopt_ipf" />
-                        <include name="port/src/lil/ipf/pim/include" />
-
-                        <select os="win">
-                            <include name="vm/common/dynopt" />
-                        </select>
-                    </dirset>
-                </select>
-
-                <select arch="ia32">
-                    <dirset dir="${build.vm.home}">
-                        <include name="vmcore/src/util/ia32/base_natives" />
-                        <include name="vm/ia32/debugger/include" />
-                        <include name="port/src/encoder/ia32_em64t" />
-                        <include name="port/src/lil/ia32/pim/include" />
-                    </dirset>
-                </select>
-
-                <select arch="em64t">
-                    <dirset dir="${build.vm.home}">
-                        <include name="vmcore/src/util/em64t/base_natives" />
-                        <include name="vm/em64t/debugger/include" />
-                        <include name="port/src/encoder/ia32_em64t" />
-                        <include name="port/src/lil/em64t/pim/include" />
-                    </dirset>
-                </select>
             </includepath>
 
-            <select os="win" cfg="release" cxx="icl">
-                <compilerarg value="/Qip" />
-            </select>
-
             <defineset define="BUILDING_VM,GC_V4,USE_DLL_JIT,APR_DECLARE_STATIC" />
         </compiler>
 
-        <select os="lnx,freebsd" arch="ia32">
-            <fileset id="asm.fileset"
-                     dir="${build.vm.home}/vmcore">
-                <include name="src/util/ia32/base/*.asm" />
-            </fileset>
-        </select>
-
-        <select os="lnx" arch="ipf">
-            <fileset id="asm.fileset"
-                 dir="${build.vm.home}/vmcore">
-                <include name="src/util/ipf/base/*.asm" />
-            </fileset>
-        </select>
-
-        <select os="win" arch="em64t">
-            <fileset id="asm.fileset"
-                 dir="${build.vm.home}/vmcore">
-                <include name="src/util/win/em64t/*.asm" />
-            </fileset>
-        </select>
-
-	<select os="lnx" >
-		<select arch="ia32">
-			<symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/linux.x86/libicuuc.so"
-				resource="${external.dep.CLASSLIB}/depends/libs/linux.x86/libicuuc.so.34"/>
-			<symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/linux.x86/libicudata.so"
-				resource="${external.dep.CLASSLIB}/depends/libs/linux.x86/libicudata.so.34"/>
-		</select>
-		<select arch="em64t">
-			<symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/linux.x86_64/libicuuc.so"
-				resource="${external.dep.CLASSLIB}/depends/libs/linux.x86_64/libicuuc.so.34"/>
-			<symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/linux.x86_64/libicudata.so"
-				resource="${external.dep.CLASSLIB}/depends/libs/linux.x86_64/libicudata.so.34"/>
-		</select>
-		<select arch="ipf">
-			<symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/linux.ia64/libicuuc.so"
-				resource="${external.dep.CLASSLIB}/depends/libs/linux.ia64/libicuuc.so.34"/>
-			<symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/linux.ia64/libicudata.so"
-				resource="${external.dep.CLASSLIB}/depends/libs/linux.ia64/libicudata.so.34"/>
-		</select>
-	</select>
-	<select os="freebsd" >
-		<select arch="ia32">
-			<symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/freebsd.x86/libicuuc.so"
-				resource="${external.dep.CLASSLIB}/depends/libs/freebsd.x86/libicuuc.so.34"/>
-			<symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/freebsd.x86/libicudata.so"
-				resource="${external.dep.CLASSLIB}/depends/libs/freebsd.x86/libicudata.so.34"/>
-		</select>
-		<select arch="em64t">
-			<symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/freebsd.x86_64/libicuuc.so"
-				resource="${external.dep.CLASSLIB}/depends/libs/freebsd.x86_64/libicuuc.so.34"/>
-			<symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/freebsd.x86_64/libicudata.so"
-				resource="${external.dep.CLASSLIB}/depends/libs/freebsd.x86_64/libicudata.so.34"/>
-		</select>
-		<select arch="ipf">
-			<symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/freebsd.ia64/libicuuc.so"
-				resource="${external.dep.CLASSLIB}/depends/libs/freebsd.ia64/libicuuc.so.34"/>
-			<symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/freebsd.ia64/libicudata.so"
-				resource="${external.dep.CLASSLIB}/depends/libs/freebsd.ia64/libicudata.so.34"/>
-		</select>
-	</select>
+        <fileset id="asm.fileset" dir="${build.vm.home}/vmcore">
+            <include name="src/util/ipf/base/*.asm" if="is.unix.ia64"/>
+            <include name="src/util/win/em64t/*.asm" if="is.windows.x86_64"/>
+        </fileset>
 
         <linker id="linker" extends="common.linker">
             <libset libs="${vm.port.lib}"
                     dir="${vm.port.libdir}" />
 
-            <select arch="ia32,em64t">
-                 <libset libs="${vm.encoder.lib}"
-                     dir="${vm.encoder.libdir}" />
-            </select>
+            <libset libs="${vm.encoder.lib}"
+                     dir="${vm.encoder.libdir}" unless="is.ia64"/>
 
             <libset libs="${extra.log4cxx.lib}"
                     dir="${extra.log4cxx.libdir}" />
@@ -353,65 +198,26 @@
             <libset libs="${vm.port.lib}"
                     dir="${vm.port.libdir}" />
 
-            <select os="win">
-                <libset libs="${extra.zlib.lib}"
-                        dir="${extra.zlib.libdir}" />
-
-       	        <libset libs="icuuc"
-                        dir="${external.dep.CLASSLIB.libdir}" />			
-            </select>
-
-            <select os="win">
-                <select arch="em64t">
-                    <linkerarg value="/DEF:${build.vm.home}/vmcore/src/harmonyvm64.def"/>
-                </select>
-                <select arch="ia32">
-                    <linkerarg value="/DEF:${build.vm.home}/vmcore/src/harmonyvm.def"/>
-                </select>
-                <select cfg="debug">
-                    <linkerarg value="/NODEFAULTLIB:libcmt.lib" />
-                    <linkerarg value="/NODEFAULTLIB:msvcrt.lib" />
-                </select>
-                <select arch="em64t" cfg="release">
-                    <linkerarg value="/NODEFAULTLIB:msvcrt.lib" />
-                </select>
-            </select>
-
-            <select os="lnx">
-                <syslibset type="shared" libs="m,dl,stdc++,z,xml2,pthread,gcc_s,rt" /> 
-                <linkerarg value="--version-script=${build.vm.home}/vmcore/build/vmcore.exp" />
-		<select arch="ia32">
-			<libset type="shared" libs="icuuc"
-                        	dir="${external.dep.CLASSLIB}/depends/libs/linux.x86" />
-		</select>
-		<select arch="em64t">
-			<libset type="shared" libs="icuuc"
-                        	dir="${external.dep.CLASSLIB}/depends/libs/linux.x86_64" />
-		</select>
-		<select arch="ipf">
-			<libset type="shared" libs="icuuc"
-                        	dir="${external.dep.CLASSLIB}/depends/libs/linux.ia64" />
-		</select>
-            </select>
-            <select os="freebsd">
-                <syslibset type="shared" libs="m,stdc++,z,pthread" /> 
-                <libset libs="xml2" dir="/usr/local/lib" />
-                <linkerarg value="--export-dynamic" />
-                <linkerarg value="--version-script=${build.vm.home}/vmcore/build/vmcore.exp" />
-		<select arch="ia32">
-			<libset type="shared" libs="icuuc"
-                        	dir="${external.dep.CLASSLIB}/depends/libs/freebsd.x86" />
-		</select>
-		<select arch="em64t">
-			<libset type="shared" libs="icuuc"
-                        	dir="${external.dep.CLASSLIB}/depends/libs/freebsd.x86_64" />
-		</select>
-		<select arch="ipf">
-			<libset type="shared" libs="icuuc"
-                        	dir="${external.dep.CLASSLIB}/depends/libs/freebsd.ia64" />
-		</select>
-            </select>
+            <libset libs="${extra.zlib.lib}"
+                        dir="${extra.zlib.libdir}" if="is.windows"/>
+
+   	        <libset libs="icuuc"
+                        dir="${external.dep.CLASSLIB.libdir}" if="is.windows"/>
+
+            <linkerarg value="/DEF:${build.vm.home}/vmcore/src/harmonyvm64.def" if="is.windows.x86_64"/>
+            <linkerarg value="/DEF:${build.vm.home}/vmcore/src/harmonyvm.def" if="is.windows.x86"/>
+            <linkerarg value="/NODEFAULTLIB:libcmt.lib" if="is.windows" unless="is.cfg.release"/>
+            <linkerarg value="/NODEFAULTLIB:msvcrt.lib" if="is.windows"/>
+
+            <linkerarg value="--version-script=${build.vm.home}/vmcore/build/vmcore.exp" if="is.unix"/>
+			<libset type="shared" libs="icuuc"
+                        	dir="${external.dep.CLASSLIB}/depends/libs/${hy.platform}" if="is.unix"/>
+            <syslibset type="shared" libs="m,dl,stdc++,z,xml2,pthread,gcc_s,rt" if="is.linux"/>
+            <syslibset type="shared" libs="m,stdc++,z,pthread" if="is.freebsd"/> 
+            <libset libs="xml2" dir="/usr/local/lib" if="is.freebsd"/>
+            <linkerarg value="--export-dynamic" if="is.freebsd"/>
         </linker>
+        
         <echo message="Copying files for internationalization..."/>
 
         <mkdir dir="${build.semi.dir}/vm/vmcore/_other"/> 

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?rev=593491&r1=593490&r2=593491&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/vmi.xml Fri Nov  9 02:52:43 2007
@@ -37,71 +37,42 @@
         <compiler id="cpp.compiler" extends="common.cpp.compiler">
             <includepath>
                 <pathelement location="${extra.apr.includes}" />
-            </includepath>
-
-            <select os="lnx">
-                <defineset define="LINUX" />
-            </select>
-
-            <select os="win" arch="ia32">
-                <defineset define="_STATIC_CPPLIB" />
-            </select>
-
-            <includepath>
                 <dirset dir="${build.vm.home}">
                     <include name="vmcore/include" />
-
-                    <select os="win">
-                        <include name="vmcore/src/util/win/include" />
-                    </select>
-
-                    <select osfamily="unix">
-                        <include name="vmcore/src/util/linux/include" />
-                    </select>
+                    <include name="vmcore/src/util/win/include" if="is.windows"/>
+                    <include name="vmcore/src/util/linux/include" if="is.unix"/>
                 </dirset>
-
                 <pathelement location="${external.dep.CLASSLIB.includes}" />
-
-
             </includepath>
 
             <fileset dir="${src}">
                 <include name="*.cpp" />
             </fileset>
+
+            <!--select os="win" arch="ia32">
+                <defineset define="_STATIC_CPPLIB" />
+            </select-->
         </compiler>
 
         <linker id="linker" extends="common.linker">
-            <select os="win">
-                <linkerarg value="/export:VMI_GetVMIFromJavaVM" />
-                <linkerarg value="/export:VMI_GetVMIFromJNIEnv" />
-                <libset libs="${vm.vmcore.lib}" dir="${vm.vmcore.libdir}" />
-            </select>
-
-            <select osfamily="unix">
-                <linkerarg value="--version-script,${src}/vmi.exp" />
-            </select>
-
-            <select cfg="debug" os="win">
-                <linkerarg value="/NODEFAULTLIB:libcmtd.lib" />
-                <syslibset libs="msvcrtd" />
-            </select>
-
-            <select cfg="release" os="win">
-                <linkerarg value="/NODEFAULTLIB:libcmt.lib" />
-                <syslibset libs="msvcrt" />
-            </select>
-
-            <select osfamily="windows">
-                <libset libs="hyzip, hypool, hyprt"
-                        dir="${external.dep.CLASSLIB.libdir}" />
-            </select>
-            <select osfamily="unix">
-                <libset libs="hyzip, hypool"
-                        dir="${external.dep.CLASSLIB.libdir}" />
-                <libset libs="hyprt"
-                        dir="${external.dep.CLASSLIB.dlldir}" />
-            </select>
-
+            <linkerarg value="/export:VMI_GetVMIFromJavaVM" if="is.windows"/>
+            <linkerarg value="/export:VMI_GetVMIFromJNIEnv" if="is.windows"/>
+            <libset libs="${vm.vmcore.lib}" dir="${vm.vmcore.libdir}" if="is.windows"/>
+
+            <linkerarg value="--version-script,${src}/vmi.exp" if="is.unix"/>
+
+            <linkerarg value="/NODEFAULTLIB:libcmtd.lib" if="is.windows" unless="is.cfg.release"/>
+            <syslibset libs="msvcrtd" if="is.windows" unless="is.cfg.release"/>
+
+            <linkerarg value="/NODEFAULTLIB:libcmt.lib" if="is.windows" unless="is.cfg.debug"/>
+            <syslibset libs="msvcrt" if="is.windows" unless="is.cfg.debug"/>
+
+            <libset libs="hyzip, hypool, hyprt"
+                        dir="${external.dep.CLASSLIB.libdir}" if="is.windows"/>
+            <libset libs="hyzip, hypool"
+                        dir="${external.dep.CLASSLIB.libdir}" if="is.unix"/>
+            <libset libs="hyprt"
+                        dir="${external.dep.CLASSLIB.dlldir}" if="is.unix"/>
         </linker>
     </target>
 </project>



Mime
View raw message