harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r534596 - in /harmony/enhanced/jdktools/trunk: make/properties.xml modules/jpda/build.xml modules/jpda/src/main/native/jdwp/unix/agent/makefile
Date Wed, 02 May 2007 19:18:42 GMT
Author: tellison
Date: Wed May  2 12:18:41 2007
New Revision: 534596

URL: http://svn.apache.org/viewvc?view=rev&rev=534596
Log:
Do a better job of compiling jdktools on unix machines.
(Still work in progress)


Modified:
    harmony/enhanced/jdktools/trunk/make/properties.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/agent/makefile

Modified: harmony/enhanced/jdktools/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/properties.xml?view=diff&rev=534596&r1=534595&r2=534596
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/properties.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/properties.xml Wed May  2 12:18:41 2007
@@ -51,10 +51,25 @@
     <condition property="is.linux">
         <os name="linux" />
     </condition>
+    <condition property="is.macosx">
+        <os name="mac os x" />
+    </condition>
+    <condition property="is.freebsd">
+        <os name="freebsd" />
+    </condition>
+    <condition property="is.aix">
+        <os name="aix" />
+    </condition>
     <condition property="is.unix">
         <os family="unix" />
     </condition>
 
+    <!-- Normalized operating system family -->
+    <condition property="hy.os.family" value="windows">
+        <isset property="is.windows" />
+    </condition>
+    <property name="hy.os.family" value="unix" />
+
     <!-- Normalized operating system name -->
 
     <!-- this special case makes sense -->
@@ -64,9 +79,19 @@
     <condition property="hy.os" value="linux">
         <os name="linux" />
     </condition>
+    <condition property="hy.os" value="freebsd">
+        <os name="freebsd" />
+    </condition>
+    <condition property="hy.os" value="macosx">
+        <isset property="is.macosx"/>
+    </condition>
+    <condition property="hy.os" value="aix">
+        <os name="aix" />
+    </condition>
 
     <property name="hy.os" value="${os.name}" />
 
+
     <!-- Conditions for different architectures -->
     <condition property="is.x86_64">
         <or>
@@ -77,7 +102,7 @@
     <condition property="is.x86">
 	<and>
 	    <not>
-                <isset property="is.x86_64" />
+        <isset property="is.x86_64" />
             </not>
             <or>
                 <equals arg1="x86" arg2="${os.arch}"/>

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/build.xml?view=diff&rev=534596&r1=534595&r2=534596
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/build.xml Wed May  2 12:18:41 2007
@@ -56,14 +56,14 @@
         <echo message="Compiling JPDA natives" />
 
         <!-- Build agent shared lib -->
-        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os}/agent" />
+        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/agent" />
         
         <!-- Build transport shared lib -->
-        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os}/transport" />
+        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/transport" />
 
         <!-- copy to our local jdk skeleton -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="${hy.jpda.src.main.native}/jdwp/${hy.os}">
+            <fileset dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}">
                 <include name="*${shlib.suffix}"/>
                 <include name="*${progdb.suffix}" if="is.windows" />
             </fileset>
@@ -79,8 +79,8 @@
     <!-- Clean natives -->
     <target name="clean-native">
         <echo message="Cleaning JPDA natives" />
-        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os}/agent" target="clean" />
-        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os}/transport" target="clean"
/>
+        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/agent" target="clean"
/>
+        <make dir="${hy.jpda.src.main.native}/jdwp/${hy.os.family}/transport" target="clean"
/>
     </target>
 
     <!-- Compile JDWP tests always with debug info included -->

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/agent/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/agent/makefile?view=diff&rev=534596&r1=534595&r2=534596
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/agent/makefile
(original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/agent/makefile
Wed May  2 12:18:41 2007
@@ -15,9 +15,6 @@
 
 #
 # Makefile for module jdwp
-# export HY_HDK=/home/geir/dev/apache/harmony/enhanced/trunk/working_classlib/deploy/
-# export HY_DRLVM=/home/geir/dev/apache/harmony/enhanced/trunk/working_vm/build/deploy/
-
 #
 
 include $(HY_HDK)/build/make/defines.mk
@@ -25,7 +22,7 @@
 COMMON=../../common/
 CMNAGENT=$(COMMON)agent/
 
-HYCFLAGS += -I$(CMNAGENT)commands -I$(CMNAGENT)core \
+INCLUDES += -I$(CMNAGENT)commands -I$(CMNAGENT)core \
             -I$(COMMON)generic -Icore
 
 HYLDFLAGS += -lstdc++ -lgcc_s



Mime
View raw message