harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r452774 - /incubator/harmony/enhanced/classlib/trunk/make/properties.xml
Date Wed, 04 Oct 2006 07:16:37 GMT
Author: hindessm
Date: Wed Oct  4 00:16:37 2006
New Revision: 452774

URL: http://svn.apache.org/viewvc?view=rev&rev=452774
Log:
Add a few missing variables to the 'echo' target.
Add normalization of the x86_64 architecture definitions as we do for x86.
Clean things up so the normalized variables are used in later conditions.

Modified:
    incubator/harmony/enhanced/classlib/trunk/make/properties.xml

Modified: incubator/harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=452774&r1=452773&r2=452774
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/properties.xml Wed Oct  4 00:16:37 2006
@@ -57,7 +57,10 @@
 
     <!-- Conditions for different architectures -->
     <condition property="is.x86_64">
-        <equals arg1="x86_64" arg2="${os.arch}"/>
+        <or>
+            <equals arg1="x86_64" arg2="${os.arch}"/>
+            <equals arg1="amd64" arg2="${os.arch}"/>
+        </or>
     </condition>
     <condition property="is.x86">
         <or>
@@ -70,14 +73,13 @@
     </condition>
     <condition property="is.64bit">
         <or>
-            <os arch="ia64" />
-            <equals arg1="x86_64" arg2="${os.arch}"/>
+            <isset property="is.ia64" />
+            <isset property="is.x86_64" />
         </or>
     </condition>
     <condition property="is.32bit">
         <or>
-            <os arch="x86"/>
-            <equals arg1="i386" arg2="${os.arch}"/>
+            <isset property="is.x86" />
         </or>
     </condition>
     <condition property="hy.bits" value="32">
@@ -92,6 +94,9 @@
             <isset property="is.32bit" />
         </and>
     </condition>
+    <condition property="hy.arch" value="x86_64">
+        <isset property="is.x86_64" />
+    </condition>
     <property name="hy.arch" value="${os.arch}" />
     
     <condition property="hy.arch.define" value="HYX86">
@@ -138,6 +143,7 @@
         <echo>
 Harmony javac properties:
 
+  hy.javac.compiler = ${hy.javac.compiler}
   hy.javac.target = ${hy.javac.target}
   hy.javac.source = ${hy.javac.source}
   hy.javac.debug  = ${hy.javac.debug}
@@ -163,6 +169,10 @@
   exe.suffix = ${exe.suffix}
   shlib.suffix = ${shlib.suffix}
   make.command = ${make.command}
+
+  hy.hdk = ${hy.hdk}
+  hy.cflags = ${hy.cflags}
+  hy.arch.define = ${hy.arch.define}
 
 
 The following property is only set if the "svn-prop" target has been



Mime
View raw message