You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sm...@apache.org on 2006/04/13 08:02:18 UTC
svn commit: r393723 - in /incubator/harmony/enhanced/classlib/trunk/modules:
regex-beans-math/ regex/make/build.xml regex/make/common/build.xml
regex/make/common/hyproperties.xml
Author: smishura
Date: Wed Apr 12 23:02:17 2006
New Revision: 393723
URL: http://svn.apache.org/viewcvs?rev=393723&view=rev
Log:
Clean up after HARMONY-221
Removed:
incubator/harmony/enhanced/classlib/trunk/modules/regex-beans-math/
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/regex/make/build.xml (contents, props changed)
incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml (props changed)
incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml (contents, props changed)
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=393723&r1=393722&r2=393723&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/make/build.xml Wed Apr 12 23:02:17 2006
@@ -1,115 +1,115 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<project name="REGEX Build" default="build" basedir="..">
- <description>Build for REGEX component</description>
-
- <!-- 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" />
-
- <target name="init">
- <tstamp>
- <format property="build-date" pattern="yyyyMMdd" locale="en" />
- </tstamp>
- <tstamp>
- <format property="build-time" pattern="yyyyMMdd_HHmm" />
- </tstamp>
- <echo message="build-date=${build-date}" />
- <echo message="build-time=${build-time}" />
- <echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
-
- <property name="java.debug.option" value="on" />
- <property name="native.debug.option" value="on" />
-
- <property name="source.ver" value="1.5" />
- </target>
-
- <!-- REGEX 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>
-
-
- <target name="test" depends="build">
- <ant dir="make/common" target="compile.tests" />
- <ant dir="make/common" target="run.tests" />
- </target>
-
- <target name="clean">
- <delete dir="${hy.regex.bin.main}"/>
- <delete dir="${hy.regex.bin.test}"/>
- </target>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project name="REGEX Build" default="build" basedir="..">
+ <description>Build for REGEX component</description>
+
+ <!-- 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" />
+
+ <target name="init">
+ <tstamp>
+ <format property="build-date" pattern="yyyyMMdd" locale="en" />
+ </tstamp>
+ <tstamp>
+ <format property="build-time" pattern="yyyyMMdd_HHmm" />
+ </tstamp>
+ <echo message="build-date=${build-date}" />
+ <echo message="build-time=${build-time}" />
+ <echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
+
+ <property name="java.debug.option" value="on" />
+ <property name="native.debug.option" value="on" />
+
+ <property name="source.ver" value="1.5" />
+ </target>
+
+ <!-- REGEX 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>
+
+
+ <target name="test" depends="build">
+ <ant dir="make/common" target="compile.tests" />
+ <ant dir="make/common" target="run.tests" />
+ </target>
+
+ <target name="clean">
+ <delete dir="${hy.regex.bin.main}"/>
+ <delete dir="${hy.regex.bin.test}"/>
+ </target>
+
+</project>
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/regex/make/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml?rev=393723&r1=393722&r2=393723&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml Wed Apr 12 23:02:17 2006
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<hy>
- <regex location=".">
- <src>
- <main>
- <java location="src/main/java" />
- <resources location="src/main/resources" />
- </main>
- <test>
- <java location="src/test/java" />
- <resources location="src/main/resources" />
- </test>
- <natives location="src/natives" />
- </src>
- <bin>
- <main location="bin/main" />
- <test location="bin/test" />
- </bin>
- <packaging>
- </packaging>
- </regex>
-
- <target location="../../deploy" />
-
- <tests>
- <reports location="../../build/test_report" />
- </tests>
-</hy>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<hy>
+ <regex location=".">
+ <src>
+ <main>
+ <java location="src/main/java" />
+ <resources location="src/main/resources" />
+ </main>
+ <test>
+ <java location="src/test/java" />
+ <resources location="src/main/resources" />
+ </test>
+ <natives location="src/natives" />
+ </src>
+ <bin>
+ <main location="bin/main" />
+ <test location="bin/test" />
+ </bin>
+ <packaging>
+ </packaging>
+ </regex>
+
+ <target location="../../deploy" />
+
+ <tests>
+ <reports location="../../build/test_report" />
+ </tests>
+</hy>
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml
------------------------------------------------------------------------------
svn:eol-style = native