harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r423056 - in /incubator/harmony/enhanced/classlib/trunk: depends/libs/linux.IA32/ depends/libs/linux.x86/ depends/libs/win.IA32/ depends/libs/windows.x86/ make/build-native.xml make/properties.xml
Date Tue, 18 Jul 2006 11:50:41 GMT
Author: hindessm
Date: Tue Jul 18 04:50:39 2006
New Revision: 423056

URL: http://svn.apache.org/viewvc?rev=423056&view=rev
Log:
Remove some historical properties and use the common ones.

Added:
    incubator/harmony/enhanced/classlib/trunk/depends/libs/linux.x86/
      - copied from r423036, incubator/harmony/enhanced/classlib/trunk/depends/libs/linux.IA32/
    incubator/harmony/enhanced/classlib/trunk/depends/libs/windows.x86/
      - copied from r423036, incubator/harmony/enhanced/classlib/trunk/depends/libs/win.IA32/
Removed:
    incubator/harmony/enhanced/classlib/trunk/depends/libs/linux.IA32/
    incubator/harmony/enhanced/classlib/trunk/depends/libs/win.IA32/
Modified:
    incubator/harmony/enhanced/classlib/trunk/make/build-native.xml
    incubator/harmony/enhanced/classlib/trunk/make/properties.xml

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-native.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-native.xml?rev=423056&r1=423055&r2=423056&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-native.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-native.xml Tue Jul 18 04:50:39 2006
@@ -23,6 +23,17 @@
 		Compile the native source into component shared libs.
     </description>
 
+    <!-- import common properties -->
+    <import file="${basedir}/make/properties.xml" />
+
+    <property name="hy.hdk" location="deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="depends.build" location="depends/build" />
+    <property name="depends.oss" location="depends/oss" />
+    <property name="depends.libs" location="depends/libs/${hy.platform}" />
+    <property name="depends.files" location="depends/files" />
+    <property name="native.lib.target" location="${hy.hdk}/lib" />
+
     <!-- ================================= 
           target: default              
          ================================= -->
@@ -31,7 +42,6 @@
         depends="clean, build" />
 
 
-
     <!-- ================================= 
           target: build
          ================================= -->
@@ -46,60 +56,8 @@
             depends="make-clean, clean-includes, clean-overlay-oss, clean-layout" />
 
 
-    <!-- ================================= 
-          target: properties
-         ================================= -->
-    <target name="properties" depends="init, windows-properties, linux-properties">
-        <property name="hy.hdk" location="deploy" />
-    	<property name="hy.jdk" location="${hy.hdk}/jdk" />
-    	<property name="depends.build" location="depends/build" />
-        <property name="depends.oss" location="depends/oss" />
-        <property name="depends.libs" location="depends/libs/${target.platform}" />
-    	<property name="depends.files" location="depends/files" />
-    	<property name="native.lib.target" location="${hy.hdk}/lib" />
-    </target>
-
-
-    <!-- ================================= 
-          target: windows-properties              
-         ================================= -->
-    <target name="windows-properties" if="is.windows">
-        <property name="target.platform" value="./win.IA32" />
-        <property name="make.command" value="nmake.exe" />
-        <property name="exe.suffix" value=".exe" />
-        <property name="shlib.suffix" value=".dll" />
-    	<property name="linklib.suffix" value=".lib" />
-    </target>
-
-
-    <!-- ================================= 
-          target: linux-properties              
-         ================================= -->
-    <target name="linux-properties" if="is.linux">
-        <property name="target.platform" value="./linux.IA32" />
-        <property name="make.command" value="make" />
-        <property name="exe.suffix" value="" />
-        <property name="shlib.suffix" value=".so" />
-    	<property name="linklib.suffix" value=".so" />
-    </target>
-
-
-    <!-- - - - - - - - - - - - - - - - - - 
-          target: init                      
-         - - - - - - - - - - - - - - - - - -->
-    <target name="init">
-        <!-- Determine our operating system -->
-        <condition property="is.windows">
-            <os family="windows" />
-        </condition>
-
-        <condition property="is.linux">
-            <os name="linux" />
-        </condition>
-    </target>
-
     <!-- This target invokes make on the all target to compile all natives -->
-    <target name="make-all" depends="properties">
+    <target name="make-all">
     	<!-- Create the target directory structure -->
         <mkdir dir="${hy.jdk}/jre/bin" />
         <mkdir dir="${hy.jdk}/include" />
@@ -123,7 +81,7 @@
     <!-- ================================= 
           target: make-clean              
          ================================= -->
-    <target name="make-clean" depends="properties">
+    <target name="make-clean">
     	<antcall target="copy-makefile-includes" />
     	
     	<ant dir="modules/auth" antfile="build.xml" target="clean.native" />
@@ -144,8 +102,7 @@
     <!-- ================================= 
           target: layout              
          ================================= -->
-    <target name="layout" 
-        depends="properties" 
+    <target name="layout"
         description="Construct the correct directory structure for native binaries">
 
     	<!-- NLS catalog files -->
@@ -165,7 +122,7 @@
     <!-- ================================= 
           target: clean-layout              
          ================================= -->
-    <target name="clean-layout" depends="properties">
+    <target name="clean-layout">
         <delete includeemptydirs="true" failonerror="false">
             <fileset dir="${hy.jdk}">
                 <include name="**/bin/java${exe.suffix}" />
@@ -180,7 +137,7 @@
     <!-- ================================= 
           target: overlay-oss              
          ================================= -->
-    <target name="overlay-oss" depends="properties">
+    <target name="overlay-oss">
         <ant dir="modules/luni" antfile="build.xml"
         	target="overlay-oss" />
 
@@ -218,7 +175,7 @@
     <!-- ================================= 
           target: copy-makefile-includes              
          ================================= -->
-	<target name="copy-makefile-includes" depends="properties" >
+	<target name="copy-makefile-includes">
 		<!-- copy generic defines and rules for each platform into a shared
 			place -->
 	    <mkdir dir="${hy.hdk}/build/make" />
@@ -240,7 +197,7 @@
     <!-- ================================= 
           target: clean-overlay-oss              
          ================================= -->
-    <target name="clean-overlay-oss" depends="properties">
+    <target name="clean-overlay-oss">
         <ant dir="modules/luni" antfile="build.xml" 
              target="clean-overlay-oss" />
      	<ant dir="modules/archive" antfile="build.xml" 

Modified: incubator/harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/properties.xml?rev=423056&r1=423055&r2=423056&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/properties.xml Tue Jul 18 04:50:39 2006
@@ -96,6 +96,11 @@
     </condition>
     <property name="shlib.suffix" value=".so" />
 
+    <condition property="linklib.suffix" value=".lib">
+        <isset property="is.windows"/>
+    </condition>
+    <property name="linklib.suffix" value=".so" />
+
     <condition property="make.command" value="nmake.exe">
         <isset property="is.windows"/>
     </condition>



Mime
View raw message