Return-Path: 
 <commits-return-45929-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 68640 invoked from network); 28 Oct 2007 08:21:34 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 28 Oct 2007 08:21:34 -0000
Received: (qmail 42484 invoked by uid 500); 28 Oct 2007 08:21:22 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 42464 invoked by uid 500); 28 Oct 2007 08:21:22 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 42455 invoked by uid 99); 28 Oct 2007 08:21:22 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Oct 2007 01:21:22 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Oct 2007 08:21:27 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B88BC1A9832; Sun, 28 Oct 2007 01:21:07 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r589300 - in /harmony/enhanced/drlvm/trunk/build/make: ./
 components/extra/ components/vm/ targets/
Date: Sun, 28 Oct 2007 08:21:06 -0000
To: commits@harmony.apache.org
From: hindessm@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071028082107.B88BC1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hindessm
Date: Sun Oct 28 01:21:04 2007
New Revision: 589300

URL: http://svn.apache.org/viewvc?rev=589300&view=rev
Log:
Adding FreeBSD defines to build configuration.

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/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/vmcore.xml
    harmony/enhanced/drlvm/trunk/build/make/setup.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/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/build.xml?rev=589300&r1=589299&r2=589300&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build.xml Sun Oct 28 01:21:04 2007
@@ -98,6 +98,9 @@
         <condition property="if.lnx" value="true">
             <os name="linux" />
         </condition>
+        <condition property="if.freebsd" value="true">
+            <os name="freebsd" />
+        </condition>
         <condition property="if.macosx" value="true">
             <os name="mac os x" />
         </condition>
@@ -223,9 +226,15 @@
         <condition property="build.os" value="macosx">
             <isset property="if.macosx" />
         </condition>
+        <condition property="build.os" value="freebsd">
+            <isset property="if.freebsd" />
+        </condition>
         <property name="build.os" value="Linux" />
         <condition property="build.os.short" value="macosx">
             <isset property="if.macosx" />
+        </condition>
+        <condition property="build.os.short" value="freebsd">
+            <isset property="if.freebsd" />
         </condition>
         <property name="build.os.short" value="lnx" />
         <property name="build.executable.pattern" value="\1" />

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=589300&r1=589299&r2=589300&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/extra/log4cxx.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/extra/log4cxx.xml Sun Oct 28 01:21:04 2007
@@ -103,6 +103,9 @@
                 </select>
                 <defineset define="STDC_HEADERS,LOG4CXX,LOG4CXX_STATIC,APR_DECLARE_EXPORT,APU_DECLARE_EXPORT" />
             </select>
+            <select os="freebsd">
+                <defineset define="FREEBSD" />
+            </select>
         </compiler>
     </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=589300&r1=589299&r2=589300&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/em.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/em.xml Sun Oct 28 01:21:04 2007
@@ -80,11 +80,17 @@
             <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 osfamily="unix">
+            <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>
         </linker>
     </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=589300&r1=589299&r2=589300&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 Sun Oct 28 01:21:04 2007
@@ -57,6 +57,10 @@
 
             <defineset define="BUILDING_GC" />
 
+            <select os="freebsd">
+                <defineset define="FREEBSD" />
+            </select>
+
             <select os="win">
                 <defineset define="_USRDLL" />
             </select>

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=589300&r1=589299&r2=589300&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 Sun Oct 28 01:21:04 2007
@@ -69,6 +69,10 @@
 
             <defineset define="BUILDING_GC" />
 
+            <select os="freebsd">
+                <defineset define="FREEBSD" />
+            </select>
+
             <select os="win">
                 <defineset define="_USRDLL" />
             </select>

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=589300&r1=589299&r2=589300&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml Sun Oct 28 01:21:04 2007
@@ -60,6 +60,9 @@
                 <defineset define="_USRDLL" />
             </select>
 
+            <select os="freebsd">
+                <defineset define="FREEBSD" />
+            </select>
             <select os="macosx">
                 <defineset define="MACOSX" />
             </select>
@@ -103,6 +106,12 @@
 
             <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" />

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=589300&r1=589299&r2=589300&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/interpreter.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/interpreter.xml Sun Oct 28 01:21:04 2007
@@ -127,7 +127,7 @@
         </compiler>
 
         <fileset id="asm.fileset" dir="${src}">
-            <select os="lnx" arch="ia32">
+            <select os="lnx,freebsd" arch="ia32">
                 <include name="invokeJNI_ia32.asm" />
             </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?rev=589300&r1=589299&r2=589300&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/jitrino.xml Sun Oct 28 01:21:04 2007
@@ -323,9 +323,11 @@
 
             <select osfamily="unix">
                 <linkerarg value="-shared" />
-                <linkerarg value="-ldl" />
                 <linkerarg value="-lm" />
 		<linkerarg value="--version-script=${build.vm.home}/jitrino/build/jitrino.exp" />
+            </select>
+            <select os="linux">
+                <linkerarg value="-ldl" />
             </select>
         </linker>
 

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=589300&r1=589299&r2=589300&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml Sun Oct 28 01:21:04 2007
@@ -66,6 +66,17 @@
 
             
             <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">
@@ -296,6 +307,26 @@
 				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>
 
         <linker id="linker" extends="common.linker">
             <libset libs="${vm.port.lib}"
@@ -360,12 +391,24 @@
 			<libset type="shared" libs="icuuc"
                         	dir="${external.dep.CLASSLIB}/depends/libs/linux.ia64" />
 		</select>
-                <!--linkerarg value="-lz" />
-                <linkerarg value="-lxml2" />
-                <linkerarg value="-lm" />
-                <linkerarg value="-ldl" />
-                <linkerarg value="-lpthread" />
-                <linkerarg value="-lstdc++" /-->
+            </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>
         </linker>
         <echo message="Copying files for internationalization..."/>

Modified: harmony/enhanced/drlvm/trunk/build/make/setup.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/setup.xml?rev=589300&r1=589299&r2=589300&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/setup.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/setup.xml Sun Oct 28 01:21:04 2007
@@ -194,7 +194,15 @@
                         <property name="build.os.short" value="lnx" />
                     </then>
                     <else>
-                        <property name="build.os.short" value="macosx" />
+                        <if>
+                            <isset property="if.freebsd" />
+                            <then>
+                                <property name="build.os.short" value="freebsd" />
+                            </then>
+                            <else>
+                                <property name="build.os.short" value="macosx" />
+                            </else>
+                        </if>
                     </else>
                 </if>
             </then>

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?rev=589300&r1=589299&r2=589300&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml Sun Oct 28 01:21:04 2007
@@ -72,6 +72,7 @@
 
 
             <defineset define="MACOSX" if="is.macosx"/>
+            <defineset define="FREEBSD" if="is.freebsd"/>
             <defineset define="LINUX" if="is.linux"/>
 
             <defineset if="is.unix">

Modified: harmony/enhanced/drlvm/trunk/build/make/test.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/test.properties?rev=589300&r1=589299&r2=589300&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/test.properties (original)
+++ harmony/enhanced/drlvm/trunk/build/make/test.properties Sun Oct 28 01:21:04 2007
@@ -98,3 +98,4 @@
 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
+eclipse.freebsd.x86.url=${eclipse.mirror}/eclipse-SDK-3.2.1-linux-gtk.tar.gz