svn commit: r394834 - in /incubator/harmony/enhanced/classlib/trunk/modules/regex/make: build.xml common/build.xml

[sm...@apache.org]

Author: smishura
Date: Mon Apr 17 21:21:23 2006
New Revision: 394834

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

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/regex/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/regex/make/build.xml?rev=394834&r1=394833&r2=394834&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/make/build.xml Mon Apr 17 21:21:23 2006
@@ -18,58 +18,11 @@
 <project name="REGEX Build" default="build" basedir="..">
 	<description>Build for REGEX 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>
 	
 	<!-- REGEX 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/regex/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml?rev=394834&r1=394833&r2=394834&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml Mon Apr 17 21:21:23 2006
@@ -25,8 +25,8 @@
 		<javac sourcepath=""
 			srcdir="${hy.regex.src.main.java}"
 			destdir="${hy.regex.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.regex.src.test.java}"
 			destdir="${hy.regex.bin.test}"
 			sourcepath=""
-			source="${source.ver}"
-			target="jsr14"
+                        source="${hy.javac.source}"
+                        target="${hy.javac.target}"
 			debug="${java.debug.option}">
 
 			<bootclasspath>