You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by nd...@apache.org on 2007/04/21 02:28:21 UTC
svn commit: r530956 - /harmony/enhanced/drlvm/trunk/build/make/targets/
Author: ndbeyer
Date: Fri Apr 20 17:28:20 2007
New Revision: 530956
URL: http://svn.apache.org/viewvc?view=rev&rev=530956
Log:
clean up build scripts; set eol-style, convert tabs to spaces, add missing xml declarations
Modified:
harmony/enhanced/drlvm/trunk/build/make/targets/build.jar.xml
harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml
harmony/enhanced/drlvm/trunk/build/make/targets/build.native.xml
harmony/enhanced/drlvm/trunk/build/make/targets/build.xml
harmony/enhanced/drlvm/trunk/build/make/targets/common.xml
harmony/enhanced/drlvm/trunk/build/make/targets/common_extra.xml
harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml
harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml
harmony/enhanced/drlvm/trunk/build/make/targets/ehwa.test.xml (contents, props changed)
harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml (contents, props changed)
harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml
harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml
harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml
harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
harmony/enhanced/drlvm/trunk/build/make/targets/test.xml
harmony/enhanced/drlvm/trunk/build/make/targets/unit.test.xml
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/build.jar.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/build.jar.xml?view=diff&rev=530956&r1=530955&r2=530956
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/build.jar.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/build.jar.xml Fri Apr 20 17:28:20 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
@@ -12,10 +13,6 @@
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.
--->
-<!--
-Author: Marina V. Goldburt, Sergey V. Dmitriev
-Version: $Revision: 1.3.2.5 $
-->
<project name="BUILD_JAR_TARGET">
<target name="build.jar" depends="init_component" if="java.files">
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml?view=diff&rev=530956&r1=530955&r2=530956
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml Fri Apr 20 17:28:20 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
@@ -12,10 +13,6 @@
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.
--->
-<!--
-Author: Marina V. Goldburt
-Version: $Revision: 1.4.2.2 $
-->
<project name="BUILD_JAVA_TARGET">
<target name="build.java" depends="init_component" if="java.build.dir">
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/build.native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/build.native.xml?view=diff&rev=530956&r1=530955&r2=530956
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/build.native.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/build.native.xml Fri Apr 20 17:28:20 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
@@ -12,10 +13,6 @@
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.
--->
-<!--
-Author: Marina V. Goldburt
-Version: $Revision: 1.5.2.6 $
-->
<project name="BUILD_NATIVE_TARGET">
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/build.xml?view=diff&rev=530956&r1=530955&r2=530956
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/build.xml Fri Apr 20 17:28:20 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
@@ -12,10 +13,6 @@
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.
--->
-<!--
-Author: Marina V. Goldburt
-Version: $Revision: 1.3.2.2 $
-->
<!-- the main target, that builds the component -->
<project name="BUILD_TARGET">
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/common.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/common.xml?view=diff&rev=530956&r1=530955&r2=530956
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/common.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/common.xml Fri Apr 20 17:28:20 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
@@ -12,10 +13,6 @@
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.
--->
-<!--
-Author: Marina V. Goldburt
-Version: $Revision: 1.4.2.2 $
-->
<project name="COMMON_TARGET">
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/common_extra.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/common_extra.xml?view=diff&rev=530956&r1=530955&r2=530956
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/common_extra.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/common_extra.xml Fri Apr 20 17:28:20 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
@@ -12,10 +13,6 @@
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.
--->
-<!--
-Author: Marina V. Goldburt
-Version: $Revision: 1.2.2.3 $
-->
<project name="COMMON_EXTRA_TARGET">
<target name="common_extra" description="common descriptor for EXTRA components">
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml?view=diff&rev=530956&r1=530955&r2=530956
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml Fri Apr 20 17:28:20 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
@@ -12,10 +13,6 @@
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.
--->
-<!--
-Author: Marina V. Goldburt
-Version: $Revision: 1.6.2.6 $
-->
<project name="COMMON_VM_TARGET">
<target name="common_vm" description="common descriptor for all VM components">
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml?view=diff&rev=530956&r1=530955&r2=530956
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml Fri Apr 20 17:28:20 2007
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
@@ -14,10 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!--
-Author: Sergey V. Dmitriev, Marina V. Goldburt
-Version: $Revision$
--->
<project name="C UNIT TESTS">
<target name="cunit.test" depends="init_component">
<path id="unit.test.c.include">
@@ -49,14 +45,14 @@
<compilerarg value="-g" />
<compilerarg value="-O0" />
</select>
- <select arch="ia32">
- <defineset define="_IA32_" />
- </select>
- <select arch="em64t">
- <defineset define="_EM64T_" />
- <defineset define="POINTER64" />
- <defineset define="LAZY_LOCK" />
- </select>
+ <select arch="ia32">
+ <defineset define="_IA32_" />
+ </select>
+ <select arch="em64t">
+ <defineset define="_EM64T_" />
+ <defineset define="POINTER64" />
+ <defineset define="LAZY_LOCK" />
+ </select>
</compiler>
<!-- Compiling framework -->
<echo message="## Compiling framework..." />
@@ -148,21 +144,37 @@
<select os="lnx">
<syslibset type="shared" libs="stdc++, gcc_s, pthread, rt" />
<select arch="ia32">
+<<<<<<< .mine
+ <libset type="shared" libs="icuuc"
+=======
<libset type="shared" libs="icuuc"
+>>>>>>> .r530955
dir="${external.dep.CLASSLIB}/depends/libs/linux.x86" />
+<<<<<<< .mine
+ <libset type="shared" libs="icudata"
+=======
<libset type="shared" libs="icudata"
+>>>>>>> .r530955
dir="${external.dep.CLASSLIB}/depends/libs/linux.x86" />
</select>
<select arch="em64t">
<libset type="shared" libs="icuuc"
dir="${external.dep.CLASSLIB}/depends/libs/linux.x86_64" />
+<<<<<<< .mine
+ <libset type="shared" libs="icudata"
+=======
<libset type="shared" libs="icudata"
+>>>>>>> .r530955
dir="${external.dep.CLASSLIB}/depends/libs/linux.x86_64" />
</select>
<select arch="ipf">
<libset type="shared" libs="icuuc"
dir="${external.dep.CLASSLIB}/depends/libs/linux.ia64" />
+<<<<<<< .mine
+ <libset type="shared" libs="icudata"
+=======
<libset type="shared" libs="icudata"
+>>>>>>> .r530955
dir="${external.dep.CLASSLIB}/depends/libs/linux.ia64" />
</select>
</select>
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/ehwa.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/ehwa.test.xml?view=diff&rev=530956&r1=530955&r2=530956
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/ehwa.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/ehwa.test.xml Fri Apr 20 17:28:20 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,7 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<project name="Eclipse HelloWorld test scenario">
<property name="test.jvm.exe" value="${build.deploy.dir}/jdk/jre/bin/java"/>
Propchange: harmony/enhanced/drlvm/trunk/build/make/targets/ehwa.test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml?view=diff&rev=530956&r1=530955&r2=530956
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml Fri Apr 20 17:28:20 2007
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
@@ -140,10 +140,10 @@
<propertycopy property="mode.name" from="${jvmti.tests.mode}.name" override="on"/>
<propertycopy property="mode.switch" from="${jvmti.tests.mode}.switch" override="on"/>
<echo>
- ==================================
- Run JVMTI tests using ${mode.name}
- ==================================
- </echo>
+ ==================================
+ Run JVMTI tests using ${mode.name}
+ ==================================
+ </echo>
<property name="exclude.file" location="./excludes/exclude.drlvm_jvmti.${hy.platform}.${jvmti.tests.mode}" />
<if>
<available file="${exclude.file}" />
Propchange: harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml?view=diff&rev=530956&r1=530955&r2=530956
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml Fri Apr 20 17:28:20 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,7 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<project name="KERNEL TESTS">
<property name="kernel.test.javasrc" location="${build.VM.home}/tests/kernel" />
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml?view=diff&rev=530956&r1=530955&r2=530956
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml Fri Apr 20 17:28:20 2007
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml?view=diff&rev=530956&r1=530955&r2=530956
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.xml Fri Apr 20 17:28:20 2007
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,7 +14,6 @@
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="REGRESSION TESTS">
<import file="${basedir}/targets/reg.test.run.xml"/>
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml?view=diff&rev=530956&r1=530955&r2=530956
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml Fri Apr 20 17:28:20 2007
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
@@ -13,10 +13,6 @@
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.
--->
-<!--
-Author: Marina V. Goldburt
-Version: $Revision: 1.4.2.11 $
-->
<project name="SMOKE TESTS">
<property name="smoke.test.src" location="${build.VM.home}/tests/smoke" />
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/test.xml?view=diff&rev=530956&r1=530955&r2=530956
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/test.xml Fri Apr 20 17:28:20 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/unit.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/unit.test.xml?view=diff&rev=530956&r1=530955&r2=530956
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/unit.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/unit.test.xml Fri Apr 20 17:28:20 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright 2005-2006 The Apache Software Foundation or its licensors, as applicable.
@@ -13,11 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!--
-Author: Marina V. Goldburt
-Version: $Revision: 1.4.2.4 $
--->
-
<project name="UNIT TESTS">
<target name="unit.test" depends="java_test_unit" />
<target name="java_test_unit" depends="init_component">