harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r394034 - in /incubator/harmony/enhanced/classlib/trunk: make/ modules/applet/make/ modules/applet/make/common/ modules/archive/make/ modules/archive/make/common/ modules/auth/make/ modules/auth/make/common/ modules/awt/make/ modules/awt/ma...
Date Fri, 14 Apr 2006 06:50:09 GMT
Author: smishura
Date: Thu Apr 13 23:49:53 2006
New Revision: 394034

URL: http://svn.apache.org/viewcvs?rev=394034&view=rev
Log:
Apply patch HARMONY-340 (javac source and target properties should be moved to top-level property file)

Modified:
    incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
    incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
    incubator/harmony/enhanced/classlib/trunk/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/make/properties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/logging/make/build.xml   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/math/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/build.xml   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/sql/make/build.xml   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/text/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Thu Apr 13 23:49:53 2006
@@ -23,6 +23,9 @@
 		Compile the Java source and package in component archives.
     </description>
 
+    <!-- import common properties -->
+    <import file="${basedir}/make/properties.xml" />
+
     <!-- Users need to set this property to use a different compiler -->
     <!-- To use the eclipse compiler set the value of the below      -->
     <!-- property to be "org.eclipse.jdt.core.JDTCompilerAdapter"    -->
@@ -244,7 +247,7 @@
             description="Compile the source">
         <mkdir dir="${build.output}" />
 
-        <javac destdir="${build.output}" source="1.5" target="jsr14" debug="on">
+        <javac destdir="${build.output}" source="${hy.javac.source}" target="${hy.javac.target}" debug="on">
             <src path="modules/applet/src/main/java" />
             <src path="modules/auth/src/main/java/common" />
             <src path="modules/auth/src/main/java/windows" />

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build-test.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-test.xml Thu Apr 13 23:49:53 2006
@@ -19,6 +19,9 @@
 
     <description> Tests for classlib package</description>
 
+    <!-- import common properties -->
+    <import file="${basedir}/make/properties.xml" />
+
     <!-- set global properties for this build. -->
 
     <property name="build.compiler" value="modern"/>
@@ -185,7 +188,11 @@
     <target name="compile-support" depends="copy-test-resources, check-support-jars"
     	description="Compile the unit test source">
     	<mkdir dir="${tests.build.output}" />
-        <javac destdir="${tests.build.output}" source="1.5" target="jsr14" debug="on">
+    	<javac destdir="${tests.build.output}"
+    		source="${hy.javac.source}"
+    		target="${hy.javac.target}"
+    		debug="on">
+
             <src path="${support.dir}/src/test/java" />
             <src path="modules/archive/src/test/java" />
             <src path="modules/luni/src/test/java" />

Modified: incubator/harmony/enhanced/classlib/trunk/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build.xml Thu Apr 13 23:49:53 2006
@@ -22,6 +22,9 @@
     	Build contributed source and lay out results in the required format 
     </description>
 
+    <!-- import properties for snapshot targets -->
+    <import file="${basedir}/make/properties.xml" />
+
     <!-- ================================= 
           target: default              
          ================================= -->
@@ -122,40 +125,13 @@
     <!-- ================================= 
           target: properties
          ================================= -->
-    <target name="properties"
-            depends="common-properties, unix-properties, windows-properties" />
-
-    <!-- ================================= 
-          target: common-properties
-         ================================= -->
-    <target name="common-properties">
-        <xmlproperty file=".svn/entries" prefix="svn" />
-        <property name="svn.revision"
-                  value="${svn.wc-entries.entry(revision)}" />
+    <target name="properties" depends="svn-prop">
         <property name="deploy.file.prefix"
                   value="harmony-classlib-r${svn.revision}" />
-        <condition property="is.win" value="true">
-            <os family="Windows" />
-        </condition>
-        <condition property="is.unix" value="true">
-            <os name="linux" />
-        </condition>
-    </target>
-
-    <!-- ================================= 
-          target: unix-properties
-         ================================= -->
-    <target name="unix-properties" if="is.unix">
         <property name="deploy.tar"
-                  value="${deploy.file.prefix}-${os.name}-${os.arch}-snapshot.tar.gz" />
-    </target>
-
-    <!-- ================================= 
-          target: windows-properties
-         ================================= -->
-    <target name="windows-properties" if="is.win">
+                  value="${deploy.file.prefix}-${hy.os}-${hy.arch}-snapshot.tar.gz" />
         <property name="deploy.zip"
-                  value="${deploy.file.prefix}-win-${os.arch}-snapshot.zip" />
+                  value="${deploy.file.prefix}-${hy.os}-${hy.arch}-snapshot.zip" />
     </target>
 
     <!-- ================================= 
@@ -187,12 +163,13 @@
                 includes="README-snapshot.txt"
                 fullpath="Harmony/README"/>
         </tar>
+        <checksum file="${deploy.tar}" fileext=".md5"/>
     </target>
 
     <!-- ================================= 
           target: snapshot-zip
          ================================= -->
-    <target name="snapshot-zip" depends="default, properties" if="is.win">
+    <target name="snapshot-zip" depends="default, properties" if="is.windows">
         <echo>
 ========================================
 Generating snapshot zip
@@ -209,6 +186,7 @@
                 includes="README-snapshot.txt"
                 fullpath="Harmony/README.txt"/>
         </zip>
+        <checksum file="${deploy.zip}" fileext=".md5"/>
     </target>
 
 </project>

Modified: incubator/harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/properties.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/properties.xml Thu Apr 13 23:49:53 2006
@@ -19,6 +19,10 @@
 
 <project name="Common Platform definitions" default="echo" basedir="..">
 
+    <!-- Javac properties -->
+    <property name="hy.javac.source" value="1.5" />
+    <property name="hy.javac.target" value="jsr14" />
+
     <!-- Conditions for operating systems -->
     <condition property="is.windows">
         <os family="Windows" />
@@ -90,6 +94,14 @@
     <target name="echo" depends="svn-prop" >
         <echo>
 
+Harmony javac properties:
+
+  hy.javac.target = ${hy.javac.target}
+  hy.javac.source = ${hy.javac.source}
+
+
+Harmony platform properties:
+
   hy.os = ${hy.os}
   hy.arch = ${hy.arch}
   hy.bits = ${hy.bits}
@@ -105,10 +117,18 @@
   is.x86_64 = ${is.x86_64}
   is.ia64 = ${is.ia64}
 
-  svn.revision = ${svn.revision}
-
   exe.suffix = ${exe.suffix}
   shlib.suffix = ${shlib.suffix}
+
+
+The following property is only set if the "svn-prop" target has been
+called:
+
+  svn.revision = ${svn.revision}
+
+
+Ant native properties, for information, but please use Harmony
+properties in preference to these:
 
   os.name = ${os.name}
   os.arch = ${os.arch}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml Thu Apr 13 23:49:53 2006
@@ -18,59 +18,11 @@
 <project name="APPLET Build" default="build" basedir="..">
 	<description>Build for APPLET component</description>
 
+        <!-- import common properties -->
+        <import file="${basedir}/../../make/properties.xml" />
+
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<property environment="env"/>
-
-	<!-- Determine the (normalized) operating system family -->
-	<condition property="if.win">
-		<os family="Windows" />
-	</condition>
-	<condition property="hy.os_family" value="windows">
-		<isset property="if.win"/>
-	</condition>
-
-	<condition property="if.linux">
-		<and>
-			<os name="linux" />
-			<os family="unix" />
-		</and>
-	</condition>
-	<condition property="hy.os_family" value="linux">
-		<isset property="if.linux"/>
-	</condition>
-
-
-	<!-- Determine the (normalized) processor family -->
-	<condition property="if.x86_64">
-		<contains string="${os.arch}" substring="x86_64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="x86_64">
-		<isset property="if.x86_64"/>
-	</condition>
-	
-	<condition property="if.x86">
-		<and>
-			<contains string="${os.arch}" substring="86"/>
-			<not>
-				<isset property="if.x86_64"/>
-			</not>
-		</and>
-	</condition>
-	<condition property="hy.cpu_family" value="x86">
-		<isset property="if.x86"/>
-	</condition>
-	
-	<condition property="if.ipf">
-		<contains string="${os.arch}" substring="ia64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="ipf">
-		<isset property="if.ipf"/>
-	</condition>
-
-	<!-- Define the platform property dependant upon the OS and platform -->
-	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
-
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
 	<property name="build.compiler" value="modern" />
@@ -89,7 +41,6 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- APPLET TARGETS -->
@@ -97,7 +48,6 @@
 	<target name="build" depends="init">
 		<ant dir="make/common" target="compile.java" />
 		<ant dir="make/common" target="build.jar" />
-	<!--	<ant dir="make/platform/${hy.platform}" target="compile.native" /> -->
 		<ant dir="make/common" target="copy.resources" />
 	</target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml Thu Apr 13 23:49:53 2006
@@ -25,8 +25,8 @@
 		<javac sourcepath=""
 			srcdir="${hy.applet.src.main.java}"
 			destdir="${hy.applet.bin.main}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,8 +53,8 @@
 		<javac srcdir="${hy.applet.src.test.java}"
 			destdir="${hy.applet.bin.test}"
 			sourcepath=""
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml Thu Apr 13 23:49:53 2006
@@ -18,58 +18,11 @@
 <project name="ARCHIVE Build" default="build" basedir="..">
 	<description>Build for ARCHIVE component</description>
 
+        <!-- import common properties -->
+        <import file="${basedir}/../../make/properties.xml" />
+
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<property environment="env"/>
-
-	<!-- Determine the (normalized) operating system family -->
-	<condition property="if.win">
-		<os family="Windows" />
-	</condition>
-	<condition property="hy.os_family" value="windows">
-		<isset property="if.win"/>
-	</condition>
-
-	<condition property="if.linux">
-		<and>
-			<os name="linux" />
-			<os family="unix" />
-		</and>
-	</condition>
-	<condition property="hy.os_family" value="linux">
-		<isset property="if.linux"/>
-	</condition>
-
-
-	<!-- Determine the (normalized) processor family -->
-	<condition property="if.x86_64">
-		<contains string="${os.arch}" substring="x86_64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="x86_64">
-		<isset property="if.x86_64"/>
-	</condition>
-	
-	<condition property="if.x86">
-		<and>
-			<contains string="${os.arch}" substring="86"/>
-			<not>
-				<isset property="if.x86_64"/>
-			</not>
-		</and>
-	</condition>
-	<condition property="hy.cpu_family" value="x86">
-		<isset property="if.x86"/>
-	</condition>
-	
-	<condition property="if.ipf">
-		<contains string="${os.arch}" substring="ia64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="ipf">
-		<isset property="if.ipf"/>
-	</condition>
-
-	<!-- Define the platform property dependant upon the OS and platform -->
-	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
@@ -89,7 +42,6 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- ARCHIVE TARGETS -->
@@ -97,7 +49,6 @@
 	<target name="build" depends="init">
 		<ant dir="make/common" target="compile.java" />
 		<ant dir="make/common" target="build.jar" />
-	<!--	<ant dir="make/platform/${hy.platform}" target="compile.native" /> -->
 		<ant dir="make/common" target="copy.resources" />
 	</target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml Thu Apr 13 23:49:53 2006
@@ -25,8 +25,8 @@
 		<javac sourcepath=""
 			srcdir="${hy.archive.src.main.java}"
 			destdir="${hy.archive.bin.main}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,8 +53,8 @@
 		<javac srcdir="${hy.archive.src.test.java}"
 			destdir="${hy.archive.bin.test}"
 			sourcepath=""
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml Thu Apr 13 23:49:53 2006
@@ -19,58 +19,11 @@
 <project name="AUTH Build" default="build" basedir="..">
 	<description>Build for AUTH component</description>
 
+        <!-- import common properties -->
+        <import file="${basedir}/../../make/properties.xml" />
+
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<property environment="env"/>
-
-	<!-- Determine the (normalized) operating system family -->
-	<condition property="if.win">
-		<os family="Windows" />
-	</condition>
-	<condition property="hy.os_family" value="windows">
-		<isset property="if.win"/>
-	</condition>
-
-	<condition property="if.linux">
-		<and>
-			<os name="linux" />
-			<os family="unix" />
-		</and>
-	</condition>
-	<condition property="hy.os_family" value="linux">
-		<isset property="if.linux"/>
-	</condition>
-
-
-	<!-- Determine the (normalized) processor family -->
-	<condition property="if.x86_64">
-		<contains string="${os.arch}" substring="x86_64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="x86_64">
-		<isset property="if.x86_64"/>
-	</condition>
-	
-	<condition property="if.x86">
-		<and>
-			<contains string="${os.arch}" substring="86"/>
-			<not>
-				<isset property="if.x86_64"/>
-			</not>
-		</and>
-	</condition>
-	<condition property="hy.cpu_family" value="x86">
-		<isset property="if.x86"/>
-	</condition>
-	
-	<condition property="if.ipf">
-		<contains string="${os.arch}" substring="ia64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="ipf">
-		<isset property="if.ipf"/>
-	</condition>
-
-	<!-- Define the platform property dependant upon the OS and platform -->
-	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
@@ -90,7 +43,6 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- AUTH TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml Thu Apr 13 23:49:53 2006
@@ -20,10 +20,10 @@
 	<property file="../../../../make/depends.properties" />
 
 	<property name="hy.auth.src.main.java.platform"
-		value="${hy.auth.src.main.java}/../${hy.os_family}" />
+		value="${hy.auth.src.main.java}/../${hy.os}" />
 
 	<property name="hy.auth.src.test.java.platform"
-		value="${hy.auth.src.test.java}/../${hy.os_family}" />
+		value="${hy.auth.src.test.java}/../${hy.os}" />
 	
 	<target name="compile.java" description="Compile AUTH java code">
 		<echo message="Compiling AUTH classes from ${hy.auth.src.main.java}" />
@@ -32,8 +32,8 @@
 
 		<javac sourcepath=""
 			destdir="${hy.auth.bin.main}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<src>
@@ -63,8 +63,8 @@
 		<mkdir dir="${hy.auth.bin.test}" />
 
 		<javac 	destdir="${hy.auth.bin.test}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<!-- FIXME: AUTH tests should not reach into security module code -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml Thu Apr 13 23:49:53 2006
@@ -18,58 +18,11 @@
 <project name="AWT Build" default="build" basedir="..">
 	<description>Build for AWT component</description>
 
+        <!-- import common properties -->
+        <import file="${basedir}/../../make/properties.xml" />
+
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<property environment="env"/>
-
-	<!-- Determine the (normalized) operating system family -->
-	<condition property="if.win">
-		<os family="Windows" />
-	</condition>
-	<condition property="hy.os_family" value="windows">
-		<isset property="if.win"/>
-	</condition>
-
-	<condition property="if.linux">
-		<and>
-			<os name="linux" />
-			<os family="unix" />
-		</and>
-	</condition>
-	<condition property="hy.os_family" value="linux">
-		<isset property="if.linux"/>
-	</condition>
-
-
-	<!-- Determine the (normalized) processor family -->
-	<condition property="if.x86_64">
-		<contains string="${os.arch}" substring="x86_64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="x86_64">
-		<isset property="if.x86_64"/>
-	</condition>
-	
-	<condition property="if.x86">
-		<and>
-			<contains string="${os.arch}" substring="86"/>
-			<not>
-				<isset property="if.x86_64"/>
-			</not>
-		</and>
-	</condition>
-	<condition property="hy.cpu_family" value="x86">
-		<isset property="if.x86"/>
-	</condition>
-	
-	<condition property="if.ipf">
-		<contains string="${os.arch}" substring="ia64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="ipf">
-		<isset property="if.ipf"/>
-	</condition>
-
-	<!-- Define the platform property dependant upon the OS and platform -->
-	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
@@ -89,7 +42,6 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- AWT TARGETS -->
@@ -97,7 +49,6 @@
 	<target name="build" depends="init">
 		<ant dir="make/common" target="compile.java" />
 		<ant dir="make/common" target="build.jar" />
-	<!--	<ant dir="make/platform/${hy.platform}" target="compile.native" /> -->
 		<ant dir="make/common" target="copy.resources" />
 	</target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml Thu Apr 13 23:49:53 2006
@@ -25,8 +25,8 @@
 		<javac sourcepath=""
 			srcdir="${hy.awt.src.main.java}"
 			destdir="${hy.awt.bin.main}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,8 +53,8 @@
 		<javac srcdir="${hy.awt.src.test.java}"
 			destdir="${hy.awt.bin.test}"
 			sourcepath=""
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml Thu Apr 13 23:49:53 2006
@@ -18,58 +18,11 @@
 <project name="BEANS Build" default="build" basedir="..">
 	<description>Build for BEANS component</description>
 
+        <!-- import common properties -->
+        <import file="${basedir}/../../make/properties.xml" />
+
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<property environment="env"/>
-
-	<!-- Determine the (normalized) operating system family -->
-	<condition property="if.win">
-		<os family="Windows" />
-	</condition>
-	<condition property="hy.os_family" value="windows">
-		<isset property="if.win"/>
-	</condition>
-
-	<condition property="if.linux">
-		<and>
-			<os name="linux" />
-			<os family="unix" />
-		</and>
-	</condition>
-	<condition property="hy.os_family" value="linux">
-		<isset property="if.linux"/>
-	</condition>
-
-
-	<!-- Determine the (normalized) processor family -->
-	<condition property="if.x86_64">
-		<contains string="${os.arch}" substring="x86_64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="x86_64">
-		<isset property="if.x86_64"/>
-	</condition>
-	
-	<condition property="if.x86">
-		<and>
-			<contains string="${os.arch}" substring="86"/>
-			<not>
-				<isset property="if.x86_64"/>
-			</not>
-		</and>
-	</condition>
-	<condition property="hy.cpu_family" value="x86">
-		<isset property="if.x86"/>
-	</condition>
-	
-	<condition property="if.ipf">
-		<contains string="${os.arch}" substring="ia64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="ipf">
-		<isset property="if.ipf"/>
-	</condition>
-
-	<!-- Define the platform property dependant upon the OS and platform -->
-	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
@@ -89,7 +42,6 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- BEANS TARGETS -->
@@ -97,7 +49,6 @@
 	<target name="build" depends="init">
 		<ant dir="make/common" target="compile.java" />
 		<ant dir="make/common" target="build.jar" />
-	<!--	<ant dir="make/platform/${hy.platform}" target="compile.native" /> -->
 		<ant dir="make/common" target="copy.resources" />
 	</target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml Thu Apr 13 23:49:53 2006
@@ -25,8 +25,8 @@
 		<javac sourcepath=""
 			srcdir="${hy.beans.src.main.java}"
 			destdir="${hy.beans.bin.main}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,8 +53,8 @@
 		<javac srcdir="${hy.beans.src.test.java}"
 			destdir="${hy.beans.bin.test}"
 			sourcepath=""
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml Thu Apr 13 23:49:53 2006
@@ -18,58 +18,11 @@
 <project name="CRYPTO Build" default="build" basedir="..">
 	<description>Build for CRYPTO component</description>
 
+        <!-- import common properties -->
+        <import file="${basedir}/../../make/properties.xml" />
+
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<property environment="env"/>
-
-	<!-- Determine the (normalized) operating system family -->
-	<condition property="if.win">
-		<os family="Windows" />
-	</condition>
-	<condition property="hy.os_family" value="windows">
-		<isset property="if.win"/>
-	</condition>
-
-	<condition property="if.linux">
-		<and>
-			<os name="linux" />
-			<os family="unix" />
-		</and>
-	</condition>
-	<condition property="hy.os_family" value="linux">
-		<isset property="if.linux"/>
-	</condition>
-
-
-	<!-- Determine the (normalized) processor family -->
-	<condition property="if.x86_64">
-		<contains string="${os.arch}" substring="x86_64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="x86_64">
-		<isset property="if.x86_64"/>
-	</condition>
-	
-	<condition property="if.x86">
-		<and>
-			<contains string="${os.arch}" substring="86"/>
-			<not>
-				<isset property="if.x86_64"/>
-			</not>
-		</and>
-	</condition>
-	<condition property="hy.cpu_family" value="x86">
-		<isset property="if.x86"/>
-	</condition>
-	
-	<condition property="if.ipf">
-		<contains string="${os.arch}" substring="ia64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="ipf">
-		<isset property="if.ipf"/>
-	</condition>
-
-	<!-- Define the platform property dependant upon the OS and platform -->
-	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
@@ -89,7 +42,6 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- CRYPTO TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml Thu Apr 13 23:49:53 2006
@@ -27,8 +27,8 @@
 		<javac sourcepath=""
 			srcdir="${hy.crypto.src.main.java}"
 			destdir="${hy.crypto.bin.main}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,8 +53,8 @@
 		<mkdir dir="${hy.crypto.bin.test}" />
 
 		<javac 	destdir="${hy.crypto.bin.test}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
                     <!-- FIXME: CRYPTO tests should not reach into security module code -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml Thu Apr 13 23:49:53 2006
@@ -18,58 +18,11 @@
 <project name="JNDI Build" default="build" basedir="..">
 	<description>Build for JNDI component</description>
 
+        <!-- import common properties -->
+        <import file="${basedir}/../../make/properties.xml" />
+
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<property environment="env"/>
-
-	<!-- Determine the (normalized) operating system family -->
-	<condition property="if.win">
-		<os family="Windows" />
-	</condition>
-	<condition property="hy.os_family" value="windows">
-		<isset property="if.win"/>
-	</condition>
-
-	<condition property="if.linux">
-		<and>
-			<os name="linux" />
-			<os family="unix" />
-		</and>
-	</condition>
-	<condition property="hy.os_family" value="linux">
-		<isset property="if.linux"/>
-	</condition>
-
-
-	<!-- Determine the (normalized) processor family -->
-	<condition property="if.x86_64">
-		<contains string="${os.arch}" substring="x86_64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="x86_64">
-		<isset property="if.x86_64"/>
-	</condition>
-	
-	<condition property="if.x86">
-		<and>
-			<contains string="${os.arch}" substring="86"/>
-			<not>
-				<isset property="if.x86_64"/>
-			</not>
-		</and>
-	</condition>
-	<condition property="hy.cpu_family" value="x86">
-		<isset property="if.x86"/>
-	</condition>
-	
-	<condition property="if.ipf">
-		<contains string="${os.arch}" substring="ia64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="ipf">
-		<isset property="if.ipf"/>
-	</condition>
-
-	<!-- Define the platform property dependant upon the OS and platform -->
-	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
@@ -89,7 +42,6 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- JNDI TARGETS -->
@@ -97,7 +49,6 @@
 	<target name="build" depends="init">
 		<ant dir="make/common" target="compile.java" />
 		<ant dir="make/common" target="build.jar" />
-	<!--	<ant dir="make/platform/${hy.platform}" target="compile.native" /> -->
 		<ant dir="make/common" target="copy.resources" />
 	</target>
 

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml Thu Apr 13 23:49:53 2006
@@ -25,8 +25,8 @@
 		<javac sourcepath=""
 			srcdir="${hy.jndi.src.main.java}"
 			destdir="${hy.jndi.bin.main}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,8 +53,8 @@
 		<javac srcdir="${hy.jndi.src.test.java}"
 			destdir="${hy.jndi.bin.test}"
 			sourcepath=""
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/make/build.xml Thu Apr 13 23:49:53 2006
@@ -18,58 +18,11 @@
 <project name="LOGGING Build" default="build" basedir="..">
 	<description>Build for LOGGING component</description>
 
+        <!-- import common properties -->
+        <import file="${basedir}/../../make/properties.xml" />
+
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<property environment="env"/>
-
-	<!-- Determine the (normalized) operating system family -->
-	<condition property="if.win">
-		<os family="Windows" />
-	</condition>
-	<condition property="hy.os_family" value="windows">
-		<isset property="if.win"/>
-	</condition>
-
-	<condition property="if.linux">
-		<and>
-			<os name="linux" />
-			<os family="unix" />
-		</and>
-	</condition>
-	<condition property="hy.os_family" value="linux">
-		<isset property="if.linux"/>
-	</condition>
-
-
-	<!-- Determine the (normalized) processor family -->
-	<condition property="if.x86_64">
-		<contains string="${os.arch}" substring="x86_64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="x86_64">
-		<isset property="if.x86_64"/>
-	</condition>
-	
-	<condition property="if.x86">
-		<and>
-			<contains string="${os.arch}" substring="86"/>
-			<not>
-				<isset property="if.x86_64"/>
-			</not>
-		</and>
-	</condition>
-	<condition property="hy.cpu_family" value="x86">
-		<isset property="if.x86"/>
-	</condition>
-	
-	<condition property="if.ipf">
-		<contains string="${os.arch}" substring="ia64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="ipf">
-		<isset property="if.ipf"/>
-	</condition>
-
-	<!-- Define the platform property dependant upon the OS and platform -->
-	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
@@ -89,7 +42,6 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- LOGGING TARGETS -->
@@ -97,7 +49,6 @@
 	<target name="build" depends="init">
 		<ant dir="make/common" target="compile.java" />
 		<ant dir="make/common" target="build.jar" />
-	<!--	<ant dir="make/platform/${hy.platform}" target="compile.native" /> -->
 		<ant dir="make/common" target="copy.resources" />
 	</target>
 

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/logging/make/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml Thu Apr 13 23:49:53 2006
@@ -25,8 +25,8 @@
 		<javac sourcepath=""
 			srcdir="${hy.logging.src.main.java}"
 			destdir="${hy.logging.bin.main}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -54,8 +54,8 @@
 		<javac srcdir="${hy.logging.src.test.injected}"
 			destdir="${hy.logging.bin.injected}"
 			sourcepath=""
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -68,8 +68,8 @@
 		<javac srcdir="${hy.logging.src.test.java}"
 			destdir="${hy.logging.bin.test}"
 			sourcepath=""
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml Thu Apr 13 23:49:53 2006
@@ -34,58 +34,11 @@
 <project name="LUNI Build" default="build" basedir="..">
 	<description>Build for LUNI component</description>
 
+        <!-- import common properties -->
+        <import file="${basedir}/../../make/properties.xml" />
+
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<property environment="env"/>
-
-	<!-- Determine the (normalized) operating system family -->
-	<condition property="if.win">
-		<os family="Windows" />
-	</condition>
-	<condition property="hy.os_family" value="windows">
-		<isset property="if.win"/>
-	</condition>
-
-	<condition property="if.linux">
-		<and>
-			<os name="linux" />
-			<os family="unix" />
-		</and>
-	</condition>
-	<condition property="hy.os_family" value="linux">
-		<isset property="if.linux"/>
-	</condition>
-
-
-	<!-- Determine the (normalized) processor family -->
-	<condition property="if.x86_64">
-		<contains string="${os.arch}" substring="x86_64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="x86_64">
-		<isset property="if.x86_64"/>
-	</condition>
-	
-	<condition property="if.x86">
-		<and>
-			<contains string="${os.arch}" substring="86"/>
-			<not>
-				<isset property="if.x86_64"/>
-			</not>
-		</and>
-	</condition>
-	<condition property="hy.cpu_family" value="x86">
-		<isset property="if.x86"/>
-	</condition>
-	
-	<condition property="if.ipf">
-		<contains string="${os.arch}" substring="ia64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="ipf">
-		<isset property="if.ipf"/>
-	</condition>
-
-	<!-- Define the platform property dependant upon the OS and platform -->
-	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
@@ -105,7 +58,6 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- LUNI TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml Thu Apr 13 23:49:53 2006
@@ -25,8 +25,8 @@
 		<javac sourcepath=""
 			srcdir="${hy.luni.src.main.java}"
 			destdir="${hy.luni.bin.main}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -52,8 +52,8 @@
 		<javac srcdir="${hy.luni.src.test.java}"
 			destdir="${hy.luni.bin.test}"
 			sourcepath=""
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/math/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/math/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/math/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/math/make/build.xml Thu Apr 13 23:49:53 2006
@@ -18,58 +18,11 @@
 <project name="MATH Build" default="build" basedir="..">
 	<description>Build for MATH component</description>
 
+        <!-- import common properties -->
+        <import file="${basedir}/../../make/properties.xml" />
+
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<property environment="env"/>
-
-	<!-- Determine the (normalized) operating system family -->
-	<condition property="if.win">
-		<os family="Windows" />
-	</condition>
-	<condition property="hy.os_family" value="windows">
-		<isset property="if.win"/>
-	</condition>
-
-	<condition property="if.linux">
-		<and>
-			<os name="linux" />
-			<os family="unix" />
-		</and>
-	</condition>
-	<condition property="hy.os_family" value="linux">
-		<isset property="if.linux"/>
-	</condition>
-
-
-	<!-- Determine the (normalized) processor family -->
-	<condition property="if.x86_64">
-		<contains string="${os.arch}" substring="x86_64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="x86_64">
-		<isset property="if.x86_64"/>
-	</condition>
-	
-	<condition property="if.x86">
-		<and>
-			<contains string="${os.arch}" substring="86"/>
-			<not>
-				<isset property="if.x86_64"/>
-			</not>
-		</and>
-	</condition>
-	<condition property="hy.cpu_family" value="x86">
-		<isset property="if.x86"/>
-	</condition>
-	
-	<condition property="if.ipf">
-		<contains string="${os.arch}" substring="ia64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="ipf">
-		<isset property="if.ipf"/>
-	</condition>
-
-	<!-- Define the platform property dependant upon the OS and platform -->
-	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
@@ -89,7 +42,6 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- MATH TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml Thu Apr 13 23:49:53 2006
@@ -25,8 +25,8 @@
 		<javac sourcepath=""
 			srcdir="${hy.math.src.main.java}"
 			destdir="${hy.math.bin.main}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,8 +53,8 @@
 		<javac srcdir="${hy.math.src.test.java}"
 			destdir="${hy.math.bin.test}"
 			sourcepath=""
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/make/build.xml Thu Apr 13 23:49:53 2006
@@ -18,58 +18,11 @@
 <project name="NIO Build" default="build" basedir="..">
 	<description>Build for NIO component</description>
 
+        <!-- import common properties -->
+        <import file="${basedir}/../../make/properties.xml" />
+
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<property environment="env"/>
-
-	<!-- Determine the (normalized) operating system family -->
-	<condition property="if.win">
-		<os family="Windows" />
-	</condition>
-	<condition property="hy.os_family" value="windows">
-		<isset property="if.win"/>
-	</condition>
-
-	<condition property="if.linux">
-		<and>
-			<os name="linux" />
-			<os family="unix" />
-		</and>
-	</condition>
-	<condition property="hy.os_family" value="linux">
-		<isset property="if.linux"/>
-	</condition>
-
-
-	<!-- Determine the (normalized) processor family -->
-	<condition property="if.x86_64">
-		<contains string="${os.arch}" substring="x86_64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="x86_64">
-		<isset property="if.x86_64"/>
-	</condition>
-	
-	<condition property="if.x86">
-		<and>
-			<contains string="${os.arch}" substring="86"/>
-			<not>
-				<isset property="if.x86_64"/>
-			</not>
-		</and>
-	</condition>
-	<condition property="hy.cpu_family" value="x86">
-		<isset property="if.x86"/>
-	</condition>
-	
-	<condition property="if.ipf">
-		<contains string="${os.arch}" substring="ia64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="ipf">
-		<isset property="if.ipf"/>
-	</condition>
-
-	<!-- Define the platform property dependant upon the OS and platform -->
-	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
@@ -89,7 +42,6 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- NIO TARGETS -->
@@ -97,7 +49,6 @@
 	<target name="build" depends="init">
 		<ant dir="make/common" target="compile.java" />
 		<ant dir="make/common" target="build.jar" />
-	<!--	<ant dir="make/platform/${hy.platform}" target="compile.native" /> -->
 		<ant dir="make/common" target="copy.resources" />
 	</target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml Thu Apr 13 23:49:53 2006
@@ -25,8 +25,8 @@
 		<javac sourcepath=""
 			srcdir="${hy.nio.src.main.java}"
 			destdir="${hy.nio.bin.main}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,8 +53,8 @@
 		<javac srcdir="${hy.nio.src.test.java}"
 			destdir="${hy.nio.bin.test}"
 			sourcepath=""
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/build.xml Thu Apr 13 23:49:53 2006
@@ -18,58 +18,11 @@
 <project name="NIO_CHAR Build" default="build" basedir="..">
 	<description>Build for NIO_CHAR component</description>
 
+        <!-- import common properties -->
+        <import file="${basedir}/../../make/properties.xml" />
+
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<property environment="env"/>
-
-	<!-- Determine the (normalized) operating system family -->
-	<condition property="if.win">
-		<os family="Windows" />
-	</condition>
-	<condition property="hy.os_family" value="windows">
-		<isset property="if.win"/>
-	</condition>
-
-	<condition property="if.linux">
-		<and>
-			<os name="linux" />
-			<os family="unix" />
-		</and>
-	</condition>
-	<condition property="hy.os_family" value="linux">
-		<isset property="if.linux"/>
-	</condition>
-
-
-	<!-- Determine the (normalized) processor family -->
-	<condition property="if.x86_64">
-		<contains string="${os.arch}" substring="x86_64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="x86_64">
-		<isset property="if.x86_64"/>
-	</condition>
-	
-	<condition property="if.x86">
-		<and>
-			<contains string="${os.arch}" substring="86"/>
-			<not>
-				<isset property="if.x86_64"/>
-			</not>
-		</and>
-	</condition>
-	<condition property="hy.cpu_family" value="x86">
-		<isset property="if.x86"/>
-	</condition>
-	
-	<condition property="if.ipf">
-		<contains string="${os.arch}" substring="ia64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="ipf">
-		<isset property="if.ipf"/>
-	</condition>
-
-	<!-- Define the platform property dependant upon the OS and platform -->
-	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
@@ -88,15 +41,13 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.5" />
 	</target>
 	
-	<!-- TEXT TARGETS -->
+	<!-- NIO_CHAR TARGETS -->
 
 	<target name="build" depends="init">
 		<ant dir="make/common" target="compile.java" />
 		<ant dir="make/common" target="build.jar" />
-	<!--	<ant dir="make/platform/${hy.platform}" target="compile.native" /> -->
 		<ant dir="make/common" target="copy.resources" />
 	</target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml Thu Apr 13 23:49:53 2006
@@ -25,8 +25,8 @@
 		<javac sourcepath=""
 			srcdir="${hy.nio_char.src.main.java}"
 			destdir="${hy.nio_char.bin.main}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,8 +53,8 @@
 		<javac srcdir="${hy.nio_char.src.test.java}"
 			destdir="${hy.nio_char.bin.test}"
 			sourcepath=""
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/build.xml Thu Apr 13 23:49:53 2006
@@ -18,58 +18,11 @@
 <project name="PREFS Build" default="build" basedir="..">
 	<description>Build for PREFS component</description>
 
+        <!-- import common properties -->
+        <import file="${basedir}/../../make/properties.xml" />
+
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<property environment="env"/>
-
-	<!-- Determine the (normalized) operating system family -->
-	<condition property="if.win">
-		<os family="Windows" />
-	</condition>
-	<condition property="hy.os_family" value="windows">
-		<isset property="if.win"/>
-	</condition>
-
-	<condition property="if.linux">
-		<and>
-			<os name="linux" />
-			<os family="unix" />
-		</and>
-	</condition>
-	<condition property="hy.os_family" value="linux">
-		<isset property="if.linux"/>
-	</condition>
-
-
-	<!-- Determine the (normalized) processor family -->
-	<condition property="if.x86_64">
-		<contains string="${os.arch}" substring="x86_64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="x86_64">
-		<isset property="if.x86_64"/>
-	</condition>
-	
-	<condition property="if.x86">
-		<and>
-			<contains string="${os.arch}" substring="86"/>
-			<not>
-				<isset property="if.x86_64"/>
-			</not>
-		</and>
-	</condition>
-	<condition property="hy.cpu_family" value="x86">
-		<isset property="if.x86"/>
-	</condition>
-	
-	<condition property="if.ipf">
-		<contains string="${os.arch}" substring="ia64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="ipf">
-		<isset property="if.ipf"/>
-	</condition>
-
-	<!-- Define the platform property dependant upon the OS and platform -->
-	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
@@ -89,7 +42,6 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- PREFS TARGETS -->
@@ -97,7 +49,6 @@
 	<target name="build" depends="init">
 		<ant dir="make/common" target="compile.java" />
 		<ant dir="make/common" target="build.jar" />
-	<!--	<ant dir="make/platform/${hy.platform}" target="compile.native" /> -->
 		<ant dir="make/common" target="copy.resources" />
 	</target>
 

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml Thu Apr 13 23:49:53 2006
@@ -25,8 +25,8 @@
 		<javac sourcepath=""
 			srcdir="${hy.prefs.src.main.java}"
 			destdir="${hy.prefs.bin.main}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,8 +53,8 @@
 		<javac srcdir="${hy.prefs.src.test.java}"
 			destdir="${hy.prefs.bin.test}"
 			sourcepath=""
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml Thu Apr 13 23:49:53 2006
@@ -18,58 +18,11 @@
 <project name="RMI Build" default="build" basedir="..">
 	<description>Build for RMI component</description>
 
+        <!-- import common properties -->
+        <import file="${basedir}/../../make/properties.xml" />
+
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<property environment="env"/>
-
-	<!-- Determine the (normalized) operating system family -->
-	<condition property="if.win">
-		<os family="Windows" />
-	</condition>
-	<condition property="hy.os_family" value="windows">
-		<isset property="if.win"/>
-	</condition>
-
-	<condition property="if.linux">
-		<and>
-			<os name="linux" />
-			<os family="unix" />
-		</and>
-	</condition>
-	<condition property="hy.os_family" value="linux">
-		<isset property="if.linux"/>
-	</condition>
-
-
-	<!-- Determine the (normalized) processor family -->
-	<condition property="if.x86_64">
-		<contains string="${os.arch}" substring="x86_64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="x86_64">
-		<isset property="if.x86_64"/>
-	</condition>
-	
-	<condition property="if.x86">
-		<and>
-			<contains string="${os.arch}" substring="86"/>
-			<not>
-				<isset property="if.x86_64"/>
-			</not>
-		</and>
-	</condition>
-	<condition property="hy.cpu_family" value="x86">
-		<isset property="if.x86"/>
-	</condition>
-	
-	<condition property="if.ipf">
-		<contains string="${os.arch}" substring="ia64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="ipf">
-		<isset property="if.ipf"/>
-	</condition>
-
-	<!-- Define the platform property dependant upon the OS and platform -->
-	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
@@ -89,7 +42,6 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- RMI TARGETS -->
@@ -97,7 +49,6 @@
 	<target name="build" depends="init">
 		<ant dir="make/common" target="compile.java" />
 		<ant dir="make/common" target="build.jar" />
-	<!--	<ant dir="make/platform/${hy.platform}" target="compile.native" /> -->
 		<ant dir="make/common" target="copy.resources" />
 	</target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml Thu Apr 13 23:49:53 2006
@@ -25,8 +25,8 @@
 		<javac sourcepath=""
 			srcdir="${hy.rmi.src.main.java}"
 			destdir="${hy.rmi.bin.main}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,8 +53,8 @@
 		<javac srcdir="${hy.rmi.src.test.java}"
 			destdir="${hy.rmi.bin.test}"
 			sourcepath=""
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml Thu Apr 13 23:49:53 2006
@@ -19,58 +19,11 @@
 <project name="SECURITY Build" default="build" basedir="..">
 	<description>Build for SECURITY component</description>
 
+        <!-- import common properties -->
+        <import file="${basedir}/../../make/properties.xml" />
+
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<property environment="env"/>
-
-	<!-- Determine the (normalized) operating system family -->
-	<condition property="if.win">
-		<os family="Windows" />
-	</condition>
-	<condition property="hy.os_family" value="windows">
-		<isset property="if.win"/>
-	</condition>
-
-	<condition property="if.linux">
-		<and>
-			<os name="linux" />
-			<os family="unix" />
-		</and>
-	</condition>
-	<condition property="hy.os_family" value="linux">
-		<isset property="if.linux"/>
-	</condition>
-
-
-	<!-- Determine the (normalized) processor family -->
-	<condition property="if.x86_64">
-		<contains string="${os.arch}" substring="x86_64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="x86_64">
-		<isset property="if.x86_64"/>
-	</condition>
-	
-	<condition property="if.x86">
-		<and>
-			<contains string="${os.arch}" substring="86"/>
-			<not>
-				<isset property="if.x86_64"/>
-			</not>
-		</and>
-	</condition>
-	<condition property="hy.cpu_family" value="x86">
-		<isset property="if.x86"/>
-	</condition>
-	
-	<condition property="if.ipf">
-		<contains string="${os.arch}" substring="ia64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="ipf">
-		<isset property="if.ipf"/>
-	</condition>
-
-	<!-- Define the platform property dependant upon the OS and platform -->
-	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
@@ -90,7 +43,6 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- SECURITY TARGETS -->

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml Thu Apr 13 23:49:53 2006
@@ -27,8 +27,8 @@
 		<javac sourcepath=""
 			srcdir="${hy.security.src.main.java}"
 			destdir="${hy.security.bin.main}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,8 +53,8 @@
 
 		<javac 	destdir="${hy.security.bin.test}"
 			srcdir="${hy.security.src.test.java}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			sourcepath=""
 			debug="${java.debug.option}">
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/make/build.xml Thu Apr 13 23:49:53 2006
@@ -18,58 +18,11 @@
 <project name="SQL Build" default="build" basedir="..">
 	<description>Build for SQL component</description>
 
+        <!-- import common properties -->
+        <import file="${basedir}/../../make/properties.xml" />
+
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<property environment="env"/>
-
-	<!-- Determine the (normalized) operating system family -->
-	<condition property="if.win">
-		<os family="Windows" />
-	</condition>
-	<condition property="hy.os_family" value="windows">
-		<isset property="if.win"/>
-	</condition>
-
-	<condition property="if.linux">
-		<and>
-			<os name="linux" />
-			<os family="unix" />
-		</and>
-	</condition>
-	<condition property="hy.os_family" value="linux">
-		<isset property="if.linux"/>
-	</condition>
-
-
-	<!-- Determine the (normalized) processor family -->
-	<condition property="if.x86_64">
-		<contains string="${os.arch}" substring="x86_64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="x86_64">
-		<isset property="if.x86_64"/>
-	</condition>
-	
-	<condition property="if.x86">
-		<and>
-			<contains string="${os.arch}" substring="86"/>
-			<not>
-				<isset property="if.x86_64"/>
-			</not>
-		</and>
-	</condition>
-	<condition property="hy.cpu_family" value="x86">
-		<isset property="if.x86"/>
-	</condition>
-	
-	<condition property="if.ipf">
-		<contains string="${os.arch}" substring="ia64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="ipf">
-		<isset property="if.ipf"/>
-	</condition>
-
-	<!-- Define the platform property dependant upon the OS and platform -->
-	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
@@ -89,7 +42,6 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- SQL TARGETS -->
@@ -97,7 +49,6 @@
 	<target name="build" depends="init">
 		<ant dir="make/common" target="compile.java" />
 		<ant dir="make/common" target="build.jar" />
-	<!--	<ant dir="make/platform/${hy.platform}" target="compile.native" /> -->
 		<ant dir="make/common" target="copy.resources" />
 	</target>
 

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/sql/make/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml Thu Apr 13 23:49:53 2006
@@ -25,8 +25,8 @@
 		<javac sourcepath=""
 			srcdir="${hy.sql.src.main.java}"
 			destdir="${hy.sql.bin.main}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,8 +53,8 @@
 		<javac srcdir="${hy.sql.src.test.java}"
 			destdir="${hy.sql.bin.test}"
 			sourcepath=""
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/make/build.xml Thu Apr 13 23:49:53 2006
@@ -16,60 +16,13 @@
 -->
 
 <project name="TEXT Build" default="build" basedir="..">
-	<description>Build for LUNI component</description>
+	<description>Build for TEXT component</description>
+
+        <!-- import common properties -->
+        <import file="${basedir}/../../make/properties.xml" />
 
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<property environment="env"/>
-
-	<!-- Determine the (normalized) operating system family -->
-	<condition property="if.win">
-		<os family="Windows" />
-	</condition>
-	<condition property="hy.os_family" value="windows">
-		<isset property="if.win"/>
-	</condition>
-
-	<condition property="if.linux">
-		<and>
-			<os name="linux" />
-			<os family="unix" />
-		</and>
-	</condition>
-	<condition property="hy.os_family" value="linux">
-		<isset property="if.linux"/>
-	</condition>
-
-
-	<!-- Determine the (normalized) processor family -->
-	<condition property="if.x86_64">
-		<contains string="${os.arch}" substring="x86_64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="x86_64">
-		<isset property="if.x86_64"/>
-	</condition>
-	
-	<condition property="if.x86">
-		<and>
-			<contains string="${os.arch}" substring="86"/>
-			<not>
-				<isset property="if.x86_64"/>
-			</not>
-		</and>
-	</condition>
-	<condition property="hy.cpu_family" value="x86">
-		<isset property="if.x86"/>
-	</condition>
-	
-	<condition property="if.ipf">
-		<contains string="${os.arch}" substring="ia64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="ipf">
-		<isset property="if.ipf"/>
-	</condition>
-
-	<!-- Define the platform property dependant upon the OS and platform -->
-	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
@@ -89,7 +42,6 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- TEXT TARGETS -->
@@ -97,7 +49,6 @@
 	<target name="build" depends="init">
 		<ant dir="make/common" target="compile.java" />
 		<ant dir="make/common" target="build.jar" />
-	<!--	<ant dir="make/platform/${hy.platform}" target="compile.native" /> -->
 		<ant dir="make/common" target="copy.resources" />
 	</target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml Thu Apr 13 23:49:53 2006
@@ -25,8 +25,8 @@
 		<javac sourcepath=""
 			srcdir="${hy.text.src.main.java}"
 			destdir="${hy.text.bin.main}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -53,8 +53,8 @@
 		<javac srcdir="${hy.text.src.test.java}"
 			destdir="${hy.text.bin.test}"
 			sourcepath=""
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/build.xml Thu Apr 13 23:49:53 2006
@@ -18,58 +18,11 @@
 <project name="X-NET Build" default="build" basedir="..">
 	<description>Build for X-NET component</description>
 
+        <!-- import common properties -->
+        <import file="${basedir}/../../make/properties.xml" />
+
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<property environment="env"/>
-
-	<!-- Determine the (normalized) operating system family -->
-	<condition property="if.win">
-		<os family="Windows" />
-	</condition>
-	<condition property="hy.os_family" value="windows">
-		<isset property="if.win"/>
-	</condition>
-
-	<condition property="if.linux">
-		<and>
-			<os name="linux" />
-			<os family="unix" />
-		</and>
-	</condition>
-	<condition property="hy.os_family" value="linux">
-		<isset property="if.linux"/>
-	</condition>
-
-
-	<!-- Determine the (normalized) processor family -->
-	<condition property="if.x86_64">
-		<contains string="${os.arch}" substring="x86_64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="x86_64">
-		<isset property="if.x86_64"/>
-	</condition>
-	
-	<condition property="if.x86">
-		<and>
-			<contains string="${os.arch}" substring="86"/>
-			<not>
-				<isset property="if.x86_64"/>
-			</not>
-		</and>
-	</condition>
-	<condition property="hy.cpu_family" value="x86">
-		<isset property="if.x86"/>
-	</condition>
-	
-	<condition property="if.ipf">
-		<contains string="${os.arch}" substring="ia64"/>
-	</condition>
-	<condition property="hy.cpu_family" value="ipf">
-		<isset property="if.ipf"/>
-	</condition>
-
-	<!-- Define the platform property dependant upon the OS and platform -->
-	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
 
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
@@ -89,7 +42,6 @@
 		<property name="java.debug.option" value="on" />
 		<property name="native.debug.option" value="on" />
 
-		<property name="source.ver" value="1.5" />
 	</target>
 	
 	<!-- X-NET TARGETS -->
@@ -97,7 +49,6 @@
 	<target name="build" depends="init">
 		<ant dir="make/common" target="compile.java" />
 		<ant dir="make/common" target="build.jar" />
-	<!--	<ant dir="make/platform/${hy.platform}" target="compile.native" /> -->
 		<ant dir="make/common" target="copy.resources" />
 	</target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml?rev=394034&r1=394033&r2=394034&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml Thu Apr 13 23:49:53 2006
@@ -25,8 +25,8 @@
 		<javac sourcepath=""
 			srcdir="${hy.x-net.src.main.java}"
 			destdir="${hy.x-net.bin.main}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>
@@ -51,8 +51,8 @@
 		<mkdir dir="${hy.x-net.bin.test}" />
 
 		<javac 	destdir="${hy.x-net.bin.test}"
-			source="${source.ver}"
-			target="jsr14"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
                     <!-- FIXME: X-NET tests should not reach into security module code -->



Mime
View raw message