harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r482128 - in /harmony/enhanced/classlib/trunk: doc/ make/ modules/archive/ modules/archive/src/main/native/archive/linux/ modules/archive/src/main/native/archive/unix/ modules/archive/src/main/native/zip/linux/ modules/archive/src/main/nati...
Date Mon, 04 Dec 2006 10:52:30 GMT
Author: hindessm
Date: Mon Dec  4 02:52:24 2006
New Revision: 482128

URL: http://svn.apache.org/viewvc?view=rev&rev=482128
Log:
Renaming linux to unix to aid porting to new unix platforms.

Added:
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/linux/
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/linux/
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/linux/
    harmony/enhanced/classlib/trunk/modules/auth/src/main/java/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/auth/src/main/java/linux/
    harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/linux/
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/auth/src/test/java/linux/
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/
    harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/linux/
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/
    harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/linux/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/linux/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/linux/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/linux/
    harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/linux/
    harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/linux/
    harmony/enhanced/classlib/trunk/modules/nio/src/test/java/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/nio/src/test/java/linux/
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/linux/
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/linux/
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/pool/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/pool/linux/
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/linux/
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/linux/
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/
    harmony/enhanced/classlib/trunk/modules/print/src/main/java/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/print/src/main/java/linux/
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/security/src/main/java/linux/
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/swing/src/main/java/linux/
    harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/
      - copied from r482119, harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/
Removed:
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/linux/
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/linux/
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/linux/
    harmony/enhanced/classlib/trunk/modules/auth/src/main/java/linux/
    harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/linux/
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/linux/
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/linux/
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/linux/
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/linux/
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/
    harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/linux/
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/linux/
    harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/linux/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/linux/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/linux/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/linux/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/linux/
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmls/linux/
    harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/linux/
    harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/linux/
    harmony/enhanced/classlib/trunk/modules/nio/src/test/java/linux/
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/linux/
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/linux/
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/pool/linux/
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/linux/
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/linux/
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/
    harmony/enhanced/classlib/trunk/modules/print/src/main/java/linux/
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/linux/
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/linux/
    harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/
Modified:
    harmony/enhanced/classlib/trunk/doc/build.xml
    harmony/enhanced/classlib/trunk/make/build-java.xml
    harmony/enhanced/classlib/trunk/make/properties.xml
    harmony/enhanced/classlib/trunk/modules/archive/build.xml
    harmony/enhanced/classlib/trunk/modules/auth/build.xml
    harmony/enhanced/classlib/trunk/modules/awt/build.xml
    harmony/enhanced/classlib/trunk/modules/imageio/build.xml
    harmony/enhanced/classlib/trunk/modules/instrument/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/build.xml
    harmony/enhanced/classlib/trunk/modules/misc/build.xml
    harmony/enhanced/classlib/trunk/modules/nio/build.xml
    harmony/enhanced/classlib/trunk/modules/portlib/build.xml
    harmony/enhanced/classlib/trunk/modules/prefs/build.xml
    harmony/enhanced/classlib/trunk/modules/print/build.xml
    harmony/enhanced/classlib/trunk/modules/security/build.xml
    harmony/enhanced/classlib/trunk/modules/swing/build.xml
    harmony/enhanced/classlib/trunk/modules/text/build.xml

Modified: harmony/enhanced/classlib/trunk/doc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/doc/build.xml?view=diff&rev=482128&r1=482127&r2=482128
==============================================================================
--- harmony/enhanced/classlib/trunk/doc/build.xml (original)
+++ harmony/enhanced/classlib/trunk/doc/build.xml Mon Dec  4 02:52:24 2006
@@ -35,7 +35,7 @@
     <!-- ================================= 
           target: properties
          ================================= -->
-    <target name="properties" depends="windows-properties, linux-properties" />
+    <target name="properties" depends="windows-properties, unix-properties" />
 
     <!-- ================================= 
           target: windows-properties              
@@ -45,10 +45,10 @@
     </target>
 
     <!-- ================================= 
-          target: linux-properties              
+          target: unix-properties              
          ================================= -->
-    <target name="linux-properties" if="is.linux">
-        <property name="target.platform" value="linux" />
+    <target name="unix-properties" if="is.unix">
+        <property name="target.platform" value="unix" />
     </target>
 	
     <!-- ================================= 
@@ -60,7 +60,7 @@
         <exec executable="doxygen${exe.suffix}" dir="..">
             <arg line="doc/kernel/kernel.cfg" />
             <env key="HARMONY_DOC_DIR" value="${basedir}" />
-            <env key="HARMONY_OS" value="${hy.os}" />
+            <env key="HARMONY_OS" value="${hy.os.family}" />
         </exec>
     </target>
 
@@ -73,7 +73,7 @@
         <exec executable="doxygen${exe.suffix}" dir="..">
             <arg line="doc/classlib/classlib.cfg" />
             <env key="HARMONY_DOC_DIR" value="${basedir}" />
-            <env key="HARMONY_OS" value="${hy.os}" />
+            <env key="HARMONY_OS" value="${hy.os.family}" />
         </exec>
     </target>
 	

Modified: harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-java.xml?view=diff&rev=482128&r1=482127&r2=482128
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-java.xml Mon Dec  4 02:52:24 2006
@@ -131,9 +131,9 @@
             <src path="modules/annotation/src/main/java/" />
             <src path="modules/applet/src/main/java" />
             <src path="modules/archive/src/main/java" />
-            <src path="modules/auth/src/main/java/${hy.os}" />
+            <src path="modules/auth/src/main/java/${hy.os.family}" />
             <src path="modules/auth/src/main/java/common" />
-            <src path="modules/awt/src/main/java/${hy.os}" />
+            <src path="modules/awt/src/main/java/${hy.os.family}" />
             <src path="modules/awt/src/main/java/common" />
             <src path="modules/beans/src/main/java" />
             <src path="modules/concurrent/src/main/java/" />
@@ -151,16 +151,16 @@
             <src path="modules/nio/src/main/java" />
             <src path="modules/nio_char/src/main/java" />
             <src path="modules/prefs/src/main/java" />
-            <src path="modules/print/src/main/java/${hy.os}" />
+            <src path="modules/print/src/main/java/${hy.os.family}" />
             <src path="modules/print/src/main/java/common" />
             <src path="modules/regex/src/main/java" />
             <src path="modules/rmi/src/main/java" />
             <src path="modules/security-kernel/src/main/java" />
-            <src path="modules/security/src/main/java/${hy.os}" />
+            <src path="modules/security/src/main/java/${hy.os.family}" />
             <src path="modules/security/src/main/java/common" />
             <src path="modules/sql/src/main/java" />
             <src path="modules/suncompat/src/main/java" />
-            <src path="modules/swing/src/main/java/${hy.os}" />
+            <src path="modules/swing/src/main/java/${hy.os.family}" />
             <src path="modules/swing/src/main/java/common" />
             <src path="modules/text/src/main/java" />
             <src path="modules/tools/src/main/java" />

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=482128&r1=482127&r2=482128
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Mon Dec  4 02:52:24 2006
@@ -49,6 +49,12 @@
         <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 -->
@@ -185,6 +191,7 @@
 Harmony platform properties:
 
   hy.os = ${hy.os}
+  hy.os.family = ${hy.os.family}
   hy.arch = ${hy.arch}
   hy.bits = ${hy.bits}
   hy.platform = ${hy.platform}

Modified: harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/build.xml?view=diff&rev=482128&r1=482127&r2=482128
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/build.xml Mon Dec  4 02:52:24 2006
@@ -65,16 +65,16 @@
     
     <!-- Build native code -->
     <target name="build-native" >
-        <make dir="${hy.archive.src.main.native}/zip/${hy.os}" />
+        <make dir="${hy.archive.src.main.native}/zip/${hy.os.family}" />
         
-        <make dir="${hy.archive.src.main.native}/zlib/${hy.os}" />
+        <make dir="${hy.archive.src.main.native}/zlib/${hy.os.family}" />
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
         <fileset dir="${hy.archive.src.main.native}/zlib">
                 <patternset includes="*${shlib.suffix}*" />
             </fileset>
         </copy>
         
-    <make dir="${hy.archive.src.main.native}/archive/${hy.os}" />
+    <make dir="${hy.archive.src.main.native}/archive/${hy.os.family}" />
     <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
         <fileset dir="${hy.archive.src.main.native}/archive">
                 <patternset includes="*${shlib.suffix}*" />
@@ -84,10 +84,10 @@
     
     <!-- Clean natives -->
     <target name="clean-native">
-        <make dir="${hy.archive.src.main.native}/zip/${hy.os}" target="clean" />
-        <make dir="${hy.archive.src.main.native}/zlib/${hy.os}"
+        <make dir="${hy.archive.src.main.native}/zip/${hy.os.family}" target="clean" />
+        <make dir="${hy.archive.src.main.native}/zlib/${hy.os.family}"
               target="clean" />
-        <make dir="${hy.archive.src.main.native}/archive/${hy.os}"
+        <make dir="${hy.archive.src.main.native}/archive/${hy.os.family}"
               target="clean" />
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/build.xml?view=diff&rev=482128&r1=482127&r2=482128
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/build.xml Mon Dec  4 02:52:24 2006
@@ -28,10 +28,10 @@
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
     <property name="hy.auth.src.main.java.platform"
-              value="${hy.auth.src.main.java}/../${hy.os}" />
+              value="${hy.auth.src.main.java}/../${hy.os.family}" />
 
     <property name="hy.auth.src.test.java.platform"
-              value="${hy.auth.src.test.java}/../${hy.os}" />
+              value="${hy.auth.src.test.java}/../${hy.os.family}" />
 
     <fileset id="classes" dir="${hy.build}">
         <or>
@@ -71,7 +71,7 @@
     
     <!-- Build native code -->
     <target name="build-native" >
-    <make dir="${hy.auth.src.main.native}/auth/${hy.os}" />
+    <make dir="${hy.auth.src.main.native}/auth/${hy.os.family}" />
 
     <!-- Copy the built shared libs over to the jre/bin dir -->
     <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
@@ -83,7 +83,7 @@
     
     <!-- Clean natives -->
     <target name="clean-native">
-    <make dir="${hy.auth.src.main.native}/auth/${hy.os}" target="clean" />
+    <make dir="${hy.auth.src.main.native}/auth/${hy.os.family}" target="clean" />
     </target>
 
     <target name="clean">

Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?view=diff&rev=482128&r1=482127&r2=482128
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Mon Dec  4 02:52:24 2006
@@ -27,10 +27,10 @@
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
     <property name="hy.awt.src.main.java.platform"
-              value="${hy.awt.src.main.java}/../${hy.os}" />
+              value="${hy.awt.src.main.java}/../${hy.os.family}" />
 
     <property name="hy.awt.src.test.api.java.platform"
-              value="${hy.awt.src.test.api}/java/${hy.os}" />
+              value="${hy.awt.src.test.api}/java/${hy.os.family}" />
 
     <fileset id="classes" dir="${hy.build}">
         <or>
@@ -139,8 +139,8 @@
     </target>
 
     <target name="build-native"
-        depends="-build-native-linux,-build-native-windows">
-        <make dir="${hy.awt.src.main.native}/lcmm/${hy.os}" />
+        depends="-build-native-unix,-build-native-windows">
+        <make dir="${hy.awt.src.main.native}/lcmm/${hy.os.family}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.awt.src.main.native}/lcmm">
@@ -148,7 +148,7 @@
             </fileset>
         </copy>
 
-        <make dir="${hy.awt.src.main.native}/jpegdecoder/${hy.os}" />
+        <make dir="${hy.awt.src.main.native}/jpegdecoder/${hy.os.family}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.awt.src.main.native}/jpegdecoder">
@@ -156,7 +156,7 @@
             </fileset>
         </copy>
 
-        <make dir="${hy.awt.src.main.native}/gl/${hy.os}" />
+        <make dir="${hy.awt.src.main.native}/gl/${hy.os.family}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.awt.src.main.native}/gl">
@@ -166,8 +166,8 @@
 
     </target>
 
-    <target name="-build-native-linux" if="is.linux">
-        <make dir="${hy.awt.src.main.native}/x11wrapper/${hy.os}" />
+    <target name="-build-native-unix" if="is.unix">
+        <make dir="${hy.awt.src.main.native}/x11wrapper/${hy.os.family}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.awt.src.main.native}/x11wrapper">
@@ -175,7 +175,7 @@
             </fileset>
         </copy>
 
-        <make dir="${hy.awt.src.main.native}/linuxfont/${hy.os}" />
+        <make dir="${hy.awt.src.main.native}/linuxfont/${hy.os.family}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.awt.src.main.native}/linuxfont">
@@ -185,7 +185,7 @@
     </target>
 
     <target name="-build-native-windows" if="is.windows">
-        <make dir="${hy.awt.src.main.native}/win32wrapper/${hy.os}" />
+        <make dir="${hy.awt.src.main.native}/win32wrapper/${hy.os.family}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.awt.src.main.native}/win32wrapper">
@@ -193,7 +193,7 @@
             </fileset>
         </copy>
 
-        <make dir="${hy.awt.src.main.native}/winfont/${hy.os}" />
+        <make dir="${hy.awt.src.main.native}/winfont/${hy.os.family}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.awt.src.main.native}/winfont">
@@ -203,26 +203,26 @@
     </target>
 
     <target name="clean-native"
-            depends="-clean-native-linux,-clean-native-windows">
-        <make dir="${hy.awt.src.main.native}/lcmm/${hy.os}"
+            depends="-clean-native-unix,-clean-native-windows">
+        <make dir="${hy.awt.src.main.native}/lcmm/${hy.os.family}"
               target="clean"/>
-        <make dir="${hy.awt.src.main.native}/jpegdecoder/${hy.os}"
+        <make dir="${hy.awt.src.main.native}/jpegdecoder/${hy.os.family}"
               target="clean"/>
-        <make dir="${hy.awt.src.main.native}/gl/${hy.os}"
+        <make dir="${hy.awt.src.main.native}/gl/${hy.os.family}"
               target="clean"/>
     </target>
 
-    <target name="-clean-native-linux" if="is.linux">
-        <make dir="${hy.awt.src.main.native}/x11wrapper/${hy.os}"
+    <target name="-clean-native-unix" if="is.unix">
+        <make dir="${hy.awt.src.main.native}/x11wrapper/${hy.os.family}"
               target="clean"/>
-        <make dir="${hy.awt.src.main.native}/linuxfont/${hy.os}"
+        <make dir="${hy.awt.src.main.native}/linuxfont/${hy.os.family}"
               target="clean"/>
     </target>
 
     <target name="-clean-native-windows" if="is.windows">
-        <make dir="${hy.awt.src.main.native}/win32wrapper/${hy.os}"
+        <make dir="${hy.awt.src.main.native}/win32wrapper/${hy.os.family}"
               target="clean"/>
-        <make dir="${hy.awt.src.main.native}/winfont/${hy.os}"
+        <make dir="${hy.awt.src.main.native}/winfont/${hy.os.family}"
               target="clean"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/build.xml?view=diff&rev=482128&r1=482127&r2=482128
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/build.xml Mon Dec  4 02:52:24 2006
@@ -87,7 +87,7 @@
     </target>
     
     <target name="build-native">
-        <make dir="${hy.imageio.src.main.native}/jpegencoder/${hy.os}" />
+        <make dir="${hy.imageio.src.main.native}/jpegencoder/${hy.os.family}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.imageio.src.main.native}/jpegencoder/">

Modified: harmony/enhanced/classlib/trunk/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/build.xml?view=diff&rev=482128&r1=482127&r2=482128
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/build.xml Mon Dec  4 02:52:24 2006
@@ -68,7 +68,7 @@
     
     <!-- Build native code -->
     <target name="build-native" >
-        <make dir="${hy.instrument.src.main.native}/instrument/${hy.os}" />
+        <make dir="${hy.instrument.src.main.native}/instrument/${hy.os.family}" />
 
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
@@ -80,7 +80,7 @@
     
     <!-- Clean natives -->
     <target name="clean-native">
-        <make dir="${hy.instrument.src.main.native}/instrument/${hy.os}" target="clean"
/>
+        <make dir="${hy.instrument.src.main.native}/instrument/${hy.os.family}" target="clean"
/>
     </target>
 
     <target name="clean">

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?view=diff&rev=482128&r1=482127&r2=482128
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Mon Dec  4 02:52:24 2006
@@ -81,7 +81,7 @@
 
     <target name="copy-native-includes-unix" if="is.unix">
         <copy todir="${hy.hdk}/include" overwrite="yes">
-            <fileset dir="${hy.luni.src.main.native}/include/linux">
+            <fileset dir="${hy.luni.src.main.native}/include/unix">
                 <include name="jclprots.h" />
             </fileset>
         </copy>
@@ -95,10 +95,10 @@
     <target name="build-native-core" >
 
         <!-- Build fdlibm lib -->
-        <make dir="${hy.luni.src.main.native}/fdlibm/${hy.os}" />
+        <make dir="${hy.luni.src.main.native}/fdlibm/${hy.os.family}" />
 
         <!-- Build vmi dll -->
-        <make dir="${hy.luni.src.main.native}/vmi/${hy.os}" />
+        <make dir="${hy.luni.src.main.native}/vmi/${hy.os.family}" />
 
         <!-- On Linux we want to copy the libvmi.so into the
              deploy/lib directory so that the natives can link
@@ -116,7 +116,7 @@
     <!-- Build secondary native luni components -->
     <target name="build-native-secondary" >
         <!-- Build luni dll -->
-        <make dir="${hy.luni.src.main.native}/luni/${hy.os}" />
+        <make dir="${hy.luni.src.main.native}/luni/${hy.os.family}" />
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.luni.src.main.native}/luni">
                 <patternset includes="*${shlib.suffix}*" />
@@ -124,10 +124,10 @@
         </copy>
 
         <!-- Build vmls lib -->
-        <make dir="${hy.luni.src.main.native}/vmls/${hy.os}" />
+        <make dir="${hy.luni.src.main.native}/vmls/${hy.os.family}" />
 
         <!-- Build launcher executables -->
-        <make dir="${hy.luni.src.main.native}/launcher/${hy.os}" />
+        <make dir="${hy.luni.src.main.native}/launcher/${hy.os.family}" />
 
         <!-- Copy across the built executables -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
@@ -155,11 +155,11 @@
 
     <!-- Clean natives -->
     <target name="clean-native">
-        <make dir="${hy.luni.src.main.native}/fdlibm/${hy.os}" target="clean" />
-        <make dir="${hy.luni.src.main.native}/vmi/${hy.os}" target="clean" />
-        <make dir="${hy.luni.src.main.native}/luni/${hy.os}" target="clean" />
-        <make dir="${hy.luni.src.main.native}/vmls/${hy.os}" target="clean" />
-        <make dir="${hy.luni.src.main.native}/launcher/${hy.os}"
+        <make dir="${hy.luni.src.main.native}/fdlibm/${hy.os.family}" target="clean" />
+        <make dir="${hy.luni.src.main.native}/vmi/${hy.os.family}" target="clean" />
+        <make dir="${hy.luni.src.main.native}/luni/${hy.os.family}" target="clean" />
+        <make dir="${hy.luni.src.main.native}/vmls/${hy.os.family}" target="clean" />
+        <make dir="${hy.luni.src.main.native}/launcher/${hy.os.family}"
               target="clean" />
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/build.xml?view=diff&rev=482128&r1=482127&r2=482128
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/build.xml Mon Dec  4 02:52:24 2006
@@ -119,7 +119,7 @@
     </target>
 
     <target name="build-native" >
-        <make dir="${hy.misc.src.main.native}/accessors/${hy.os}" />
+        <make dir="${hy.misc.src.main.native}/accessors/${hy.os.family}" />
 
     <!-- Copy the built shared libs over to the jre/bin dir -->
     <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
@@ -131,7 +131,7 @@
     
     <!-- Clean natives -->
     <target name="clean-native">
-        <make dir="${hy.misc.src.main.native}/accessors/${hy.os}"
+        <make dir="${hy.misc.src.main.native}/accessors/${hy.os.family}"
               target="clean" />
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/build.xml?view=diff&rev=482128&r1=482127&r2=482128
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/build.xml Mon Dec  4 02:52:24 2006
@@ -27,7 +27,7 @@
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
     <property name="hy.nio.src.test.java.platform"
-              value="${hy.nio.src.test.java}/../${hy.os}" />
+              value="${hy.nio.src.test.java}/../${hy.os.family}" />
     <property name="exclude.file" location="./make/exclude.${hy.platform}.${hy.test.vm.name}"
/>
 
 
@@ -66,7 +66,7 @@
 
     <!-- Build natives.-->
     <target name="build-native">
-        <make dir="${hy.nio.src.main.native}/nio/${hy.os}" />
+        <make dir="${hy.nio.src.main.native}/nio/${hy.os.family}" />
 
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
@@ -87,7 +87,7 @@
 
     <!-- Clean natives. -->
     <target name="clean-native">
-        <make dir="${hy.nio.src.main.native}/nio/${hy.os}"
+        <make dir="${hy.nio.src.main.native}/nio/${hy.os.family}"
                       target="clean" />
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/build.xml?view=diff&rev=482128&r1=482127&r2=482128
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/build.xml Mon Dec  4 02:52:24 2006
@@ -50,7 +50,7 @@
             </fileset>
         </copy>
         <copy todir="${hy.hdk}/include" overwrite="yes">
-            <fileset dir="${hy.portlib.src.main.native}/include/${hy.os}">
+            <fileset dir="${hy.portlib.src.main.native}/include/${hy.os.family}">
                 <include name="hymutex.h" />
                 <include name="hysock.h" />
                 <include name="hyportpg.h" />
@@ -62,13 +62,13 @@
     <target name="build-native" >
 
        <!-- Build common lib -->
-        <make dir="${hy.portlib.src.main.native}/common/${hy.os}" />
+        <make dir="${hy.portlib.src.main.native}/common/${hy.os.family}" />
 
         <!-- Build pool lib -->
-        <make dir="${hy.portlib.src.main.native}/pool/${hy.os}" />
+        <make dir="${hy.portlib.src.main.native}/pool/${hy.os.family}" />
 
         <!-- Build sig dll -->
-        <make dir="${hy.portlib.src.main.native}/sig/${hy.os}" />
+        <make dir="${hy.portlib.src.main.native}/sig/${hy.os.family}" />
 
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.portlib.src.main.native}/sig">
@@ -77,7 +77,7 @@
         </copy>
 
         <!-- Build thread dll -->
-        <make dir="${hy.portlib.src.main.native}/thread/${hy.os}" />
+        <make dir="${hy.portlib.src.main.native}/thread/${hy.os.family}" />
 
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.portlib.src.main.native}/thread">
@@ -86,7 +86,7 @@
         </copy>
 
         <!-- Build port dll -->
-        <make dir="${hy.portlib.src.main.native}/port/${hy.os}" />
+        <make dir="${hy.portlib.src.main.native}/port/${hy.os.family}" />
 
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.portlib.src.main.native}/port">
@@ -98,11 +98,11 @@
 
     <!-- Clean natives -->
     <target name="clean-native">
-        <make dir="${hy.portlib.src.main.native}/sig/${hy.os}" target="clean" />
-        <make dir="${hy.portlib.src.main.native}/thread/${hy.os}" target="clean" />
-        <make dir="${hy.portlib.src.main.native}/port/${hy.os}" target="clean" />
-        <make dir="${hy.portlib.src.main.native}/common/${hy.os}" target="clean" />
-        <make dir="${hy.portlib.src.main.native}/pool/${hy.os}" target="clean" />
+        <make dir="${hy.portlib.src.main.native}/sig/${hy.os.family}" target="clean" />
+        <make dir="${hy.portlib.src.main.native}/thread/${hy.os.family}" target="clean"
/>
+        <make dir="${hy.portlib.src.main.native}/port/${hy.os.family}" target="clean"
/>
+        <make dir="${hy.portlib.src.main.native}/common/${hy.os.family}" target="clean"
/>
+        <make dir="${hy.portlib.src.main.native}/pool/${hy.os.family}" target="clean"
/>
 
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?view=diff&rev=482128&r1=482127&r2=482128
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/build.xml Mon Dec  4 02:52:24 2006
@@ -60,7 +60,7 @@
     <!-- Build natives. Currently there are only windows natives for
      prefs, so we check if we are on a windows platform -->
     <target name="build-native" if="is.windows">
-    <make dir="${hy.prefs.src.main.native}/prefs/${hy.os}" />
+    <make dir="${hy.prefs.src.main.native}/prefs/${hy.os.family}" />
 
     <!-- Copy the built shared libs over to the jre/bin dir -->
     <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
@@ -82,7 +82,7 @@
     <!-- Clean natives. Currently there are only windows natives for
      prefs, so we check if we are on a windows platform -->
     <target name="clean-native" if="is.windows">
-    <make dir="${hy.prefs.src.main.native}/prefs/${hy.os}" target="clean" />
+    <make dir="${hy.prefs.src.main.native}/prefs/${hy.os.family}" target="clean" />
     </target>
 
 

Modified: harmony/enhanced/classlib/trunk/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/build.xml?view=diff&rev=482128&r1=482127&r2=482128
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/print/build.xml Mon Dec  4 02:52:24 2006
@@ -27,7 +27,7 @@
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
     <property name="hy.print.src.main.java.platform"
-              value="${hy.print.src.main.java}/../${hy.os}" />
+              value="${hy.print.src.main.java}/../${hy.os.family}" />
 
     <fileset id="classes" dir="${hy.build}">
         <or>
@@ -98,7 +98,7 @@
     </target>
     
     <target name="build-native" if="is.windows">
-        <make dir="${hy.print.src.main.native}/print/${hy.os}" />
+        <make dir="${hy.print.src.main.native}/print/${hy.os.family}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
             <fileset dir="${hy.print.src.main.native}/print/">

Modified: harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/build.xml?view=diff&rev=482128&r1=482127&r2=482128
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/build.xml Mon Dec  4 02:52:24 2006
@@ -27,10 +27,10 @@
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
     <property name="hy.security.src.main.java.platform"
-              value="${hy.security.src.main.java}/../${hy.os}" />
+              value="${hy.security.src.main.java}/../${hy.os.family}" />
 
     <property name="hy.security.src.test.java.platform"
-              value="${hy.security.src.test.java}/../${hy.os}" />
+              value="${hy.security.src.test.java}/../${hy.os.family}" />
 
     <fileset id="classes" dir="${hy.build}">
         <or>
@@ -75,11 +75,11 @@
     <target name="-test-module" depends="build, compile-tests, test-jar, copy-tests-resources,
run-tests" />
 
     <!-- Build native code -->
-    <available file="${hy.security.src.main.native}/security/${hy.os}" property="native.present"
/>
+    <available file="${hy.security.src.main.native}/security/${hy.os.family}" property="native.present"
/>
 
 
     <target name="build-native" if="native.present" >
-        <make dir="${hy.security.src.main.native}/security/${hy.os}" />
+        <make dir="${hy.security.src.main.native}/security/${hy.os.family}" />
 
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
@@ -91,7 +91,7 @@
     
     <!-- Clean natives -->
     <target name="clean-native" if="native.present" >
-        <make dir="${hy.security.src.main.native}/security/${hy.os}" target="clean" />
+        <make dir="${hy.security.src.main.native}/security/${hy.os.family}" target="clean"
/>
     </target>
 
 

Modified: harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/build.xml?view=diff&rev=482128&r1=482127&r2=482128
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/build.xml Mon Dec  4 02:52:24 2006
@@ -27,10 +27,10 @@
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
     <property name="hy.swing.src.main.java.platform"
-              value="${hy.swing.src.main.java}/../${hy.os}" />
+              value="${hy.swing.src.main.java}/../${hy.os.family}" />
 
     <property name="hy.swing.src.test.java.platform"
-              value="${hy.swing.src.test.java}/../${hy.os}" />
+              value="${hy.swing.src.test.java}/../${hy.os.family}" />
 
     <fileset id="classes" dir="${hy.build}">
         <or>

Modified: harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/build.xml?view=diff&rev=482128&r1=482127&r2=482128
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/text/build.xml Mon Dec  4 02:52:24 2006
@@ -68,7 +68,7 @@
     
     <!-- Build native code -->
     <target name="build-native" >
-        <make dir="${hy.text.src.main.native}/text/${hy.os}" />
+        <make dir="${hy.text.src.main.native}/text/${hy.os.family}" />
 
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
@@ -80,7 +80,7 @@
     
     <!-- Clean natives -->
     <target name="clean-native">
-        <make dir="${hy.text.src.main.native}/text/${hy.os}" target="clean" />
+        <make dir="${hy.text.src.main.native}/text/${hy.os.family}" target="clean" />
     </target>
 
     <target name="clean">



Mime
View raw message