You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/10/02 17:35:15 UTC
svn commit: r452076 - in /incubator/harmony/enhanced/classlib/trunk: ./
make/ modules/accessibility/ modules/annotation/ modules/applet/
modules/archive/ modules/auth/ modules/awt/ modules/beans/
modules/concurrent/ modules/crypto/ modules/instrument/ ...
Author: tellison
Date: Mon Oct 2 08:35:14 2006
New Revision: 452076
URL: http://svn.apache.org/viewvc?view=rev&rev=452076
Log:
Fix for HARMONY-1646 ([launcher] Improper java.home detection when JAVA_HOME set)
Modified:
incubator/harmony/enhanced/classlib/trunk/README.txt
incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/libhlp.c
incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/regex/README.TXT
incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml
Modified: incubator/harmony/enhanced/classlib/trunk/README.txt
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/README.txt?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/README.txt (original)
+++ incubator/harmony/enhanced/classlib/trunk/README.txt Mon Oct 2 08:35:14 2006
@@ -212,15 +212,6 @@
Troubleshooting & Known Problems
--------------------------------
-The java launcher has a bug which makes it sensitive to the JAVA_HOME
-environment setting. Until this bug is fixed users should be aware that When
-running Java applications with the built class library components on a
-compatible VM the JAVA_HOME variable should either be unset or else explicitly
-set to EXTRACT_DIR>/deploy/jdk/jre. Any other value risks crashing
-the launcher.
-
- ----------
-
Linux users may need to install an appropriate libc compatibility patch to their
operating system if they see the following error message when attempting to run
a Java application with the built class library components on a compatible VM :
Modified: incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-test.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-test.xml Mon Oct 2 08:35:14 2006
@@ -181,7 +181,7 @@
jvm="${harmony.vm.exe}"
errorproperty="tests.failed"
failureproperty="tests.failed">
- <env key="JAVA_HOME" value="${hy.jdk}/jre" />
+
<env key="LD_LIBRARY_PATH" value="" />
<!-- required to be unset on Linux -->
Modified: incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Mon Oct 2 08:35:14 2006
@@ -125,8 +125,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<jvmarg value="-Xbootclasspath/a:${hy.accessibility.bin.test}${path.separator}../../${junit.jar}${path.separator}${hy.hdk}/build/test/support.jar"/>
<formatter type="xml" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml Mon Oct 2 08:35:14 2006
@@ -124,8 +124,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<classpath>
<pathelement path="${hy.annotation.bin.test}"/>
</classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml Mon Oct 2 08:35:14 2006
@@ -122,8 +122,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<classpath>
<pathelement path="${hy.applet.bin.test}"/>
</classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml Mon Oct 2 08:35:14 2006
@@ -183,8 +183,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<classpath>
<pathelement path="${hy.archive.bin.test}"/>
</classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml Mon Oct 2 08:35:14 2006
@@ -172,8 +172,6 @@
<!-- to pick up junit.jar -->
<jvmarg value="-Xbootclasspath/a:${hy.auth.bin.test}${path.separator}../../${junit.jar}${path.separator}${hy.hdk}/build/test/support.jar"/>
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<classpath>
<pathelement path="${hy.auth.src.test.resources}"/>
</classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml Mon Oct 2 08:35:14 2006
@@ -250,7 +250,6 @@
<jvmarg value="-DTEST_SRC_DIR=${hy.awt.bin.test}"/>
<jvmarg value="-Xbootclasspath/a:${hy.awt.bin.test}${path.separator}${basedir}/../../${junit.jar}"/>
- <env key="JAVA_HOME" value="${test.jre.home}"/>
<formatter type="xml" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml Mon Oct 2 08:35:14 2006
@@ -167,8 +167,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<jvmarg value="-Xbootclasspath/a:${hy.beans.bin.internal}${path.separator}../../${junit.jar}"/>
<classpath>
@@ -202,8 +200,6 @@
showoutput="on"
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
-
- <env key="JAVA_HOME" value="${test.jre.home}"/>
<classpath>
<pathelement path="${hy.beans.bin.test}"/>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml Mon Oct 2 08:35:14 2006
@@ -115,8 +115,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<classpath>
<pathelement path="${hy.concurrent.bin.test}"/>
</classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml Mon Oct 2 08:35:14 2006
@@ -264,7 +264,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
<junit-elements />
<classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml Mon Oct 2 08:35:14 2006
@@ -151,8 +151,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<classpath>
<pathelement path="${hy.instrument.bin.test}"/>
</classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml Mon Oct 2 08:35:14 2006
@@ -122,8 +122,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<classpath>
<pathelement path="${hy.jndi.bin.test}"/>
</classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml Mon Oct 2 08:35:14 2006
@@ -114,8 +114,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<classpath>
<pathelement path="${hy.lang-management.bin.test}"/>
</classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml Mon Oct 2 08:35:14 2006
@@ -136,8 +136,6 @@
<!-- Required by various tests that set security manager etc -->
<jvmarg value="-Djava.security.policy=../../support/src/test/resources/config/testing.policy" />
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<jvmarg value="-Xbootclasspath/a:${hy.logging.bin.internal}"/>
<classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Mon Oct 2 08:35:14 2006
@@ -397,7 +397,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
<junit-elements />
<formatter type="xml" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/libhlp.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/libhlp.c?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/libhlp.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/libhlp.c Mon Oct 2 08:35:14 2006
@@ -86,30 +86,8 @@
char *javaHomeModifiablePart = NULL;
char *p;
IDATA retval = -1;
- I_32 rc;
- UDATA isUpper = TRUE;
- char *envvars = "JAVA_HOME\0java_home\0";
- char *envvar;
PORT_ACCESS_FROM_PORT (portLib);
-
- for (envvar = envvars; *envvar; envvar += strlen (envvar) + 1)
- {
- rc = hysysinfo_get_env (envvar, NULL, 0);
- if (rc > 0)
- {
- *finalJavaHome = strBufferEnsure (portLib, *finalJavaHome, rc);
- if (*finalJavaHome == NULL)
- return -1;
- hysysinfo_get_env (envvar,
- (*finalJavaHome)->data +
- strlen ((*finalJavaHome)->data), rc);
- (*finalJavaHome)->remaining -= rc;
- return 0;
- }
- }
-
- /* Compute the proper value for the var. */
if ((argc < 1) || !argv)
return -1;
Modified: incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml Mon Oct 2 08:35:14 2006
@@ -122,8 +122,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<classpath>
<pathelement path="${hy.math.bin.test}"/>
</classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml Mon Oct 2 08:35:14 2006
@@ -139,8 +139,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<classpath>
<pathelement path="${hy.misc.bin.test}"/>
</classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml Mon Oct 2 08:35:14 2006
@@ -148,8 +148,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}" />
-
<classpath>
<pathelement path="${hy.nio.bin.test}" />
<pathelement path="${hy.hdk}/build/test/support.jar" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Mon Oct 2 08:35:14 2006
@@ -125,8 +125,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<classpath>
<pathelement path="${hy.nio_char.bin.test}"/>
<pathelement path="../../build/tests" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml Mon Oct 2 08:35:14 2006
@@ -145,8 +145,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<classpath>
<pathelement path="${hy.prefs.bin.test}"/>
</classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/README.TXT
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/README.TXT?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/README.TXT (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/README.TXT Mon Oct 2 08:35:14 2006
@@ -75,7 +75,6 @@
Set up the environment variables in the following way:
+ PATH must point to the location of Ant.
-+ JAVA_HOME must point to the location of the Harmony execution environment
+ CLASSPATH must point to the Eclipse* compiler .jar files, to the Harmony class libraries, and to kernel.jar
from the Harmony execution environment. An example of the CLASSPATH variable on Windows*:
@@ -151,7 +150,6 @@
+ PATH must point to the location of Ant.
+ CLASSPATH must point to the location of JUnit classes (normally, junit.jar).
-+ JAVA_HOME must point to the Harmony execution environment.
+ <EXTRACT_DIR>/Harmony/make/external_tools.properties must contain valid
paths to JUnit and Xerces implementation classes (normally "junit.jar", "xercesImpl.jar" and "xml-apis.jar").
Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml Mon Oct 2 08:35:14 2006
@@ -1,161 +1,159 @@
-<?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 this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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>
-
- <!-- import common properties -->
- <import file="${basedir}/../../make/properties.xml" />
-
- <!-- set global properties for this build. -->
- <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
-
- <fileset id="classes" dir="${hy.build}">
- <includesfile name="${hy.regex}/make/patternset.txt" />
- <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
- <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
- </fileset>
-
- <target name="build" depends="compile-java, copy-resources, build-jar" />
-
- <target name="test" depends="build, compile-tests, run-tests" />
-
- <target name="clean">
- <delete file="${hy.jdk}/jre/lib/boot/regex.jar" />
- <delete failonerror="false">
- <fileset refid="classes" />
- <fileset dir="${hy.regex.bin.test}" />
- </delete>
- </target>
-
- <target name="compile-java">
- <echo message="Compiling REGEX classes" />
-
- <mkdir dir="${hy.build}" />
-
- <javac sourcepath=""
- srcdir="${hy.regex.src.main.java}"
- destdir="${hy.build}"
+<?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 this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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>
+
+ <!-- import common properties -->
+ <import file="${basedir}/../../make/properties.xml" />
+
+ <!-- set global properties for this build. -->
+ <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+
+ <fileset id="classes" dir="${hy.build}">
+ <includesfile name="${hy.regex}/make/patternset.txt" />
+ <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+ <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+ </fileset>
+
+ <target name="build" depends="compile-java, copy-resources, build-jar" />
+
+ <target name="test" depends="build, compile-tests, run-tests" />
+
+ <target name="clean">
+ <delete file="${hy.jdk}/jre/lib/boot/regex.jar" />
+ <delete failonerror="false">
+ <fileset refid="classes" />
+ <fileset dir="${hy.regex.bin.test}" />
+ </delete>
+ </target>
+
+ <target name="compile-java">
+ <echo message="Compiling REGEX classes" />
+
+ <mkdir dir="${hy.build}" />
+
+ <javac sourcepath=""
+ srcdir="${hy.regex.src.main.java}"
+ destdir="${hy.build}"
compiler="${hy.javac.compiler}"
memoryMaximumSize="${hy.javac.maxmem}"
source="${hy.javac.source}"
target="${hy.javac.target}"
- debug="${hy.javac.debug}">
-
- <bootclasspath>
- <fileset dir="${hy.jdk}/jre/lib/boot">
- <include name="**/*.jar" />
- </fileset>
- </bootclasspath>
- </javac>
- </target>
-
- <target name="copy-resources">
- <mkdir dir="${hy.build}" />
- <copy todir="${hy.build}" includeemptydirs="false">
- <fileset dir="${hy.regex.src.main.java}">
- <exclude name="**/*.java" />
- </fileset>
- </copy>
- </target>
-
- <target name="build-jar" depends="svn-info">
- <jar destfile="${hy.jdk}/jre/lib/boot/regex.jar"
- manifest="${hy.regex}/META-INF/MANIFEST.MF">
- <fileset refid="classes" />
- <manifest>
- <attribute name="Implementation-Version" value="${svn.info}"/>
- </manifest>
- </jar>
- </target>
-
- <target name="compile-tests">
- <echo message="Compiling REGEX tests" />
-
- <mkdir dir="${hy.regex.bin.test}" />
-
- <javac srcdir="${hy.regex.src.test.java}"
- destdir="${hy.regex.bin.test}"
- sourcepath=""
+ debug="${hy.javac.debug}">
+
+ <bootclasspath>
+ <fileset dir="${hy.jdk}/jre/lib/boot">
+ <include name="**/*.jar" />
+ </fileset>
+ </bootclasspath>
+ </javac>
+ </target>
+
+ <target name="copy-resources">
+ <mkdir dir="${hy.build}" />
+ <copy todir="${hy.build}" includeemptydirs="false">
+ <fileset dir="${hy.regex.src.main.java}">
+ <exclude name="**/*.java" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="build-jar" depends="svn-info">
+ <jar destfile="${hy.jdk}/jre/lib/boot/regex.jar"
+ manifest="${hy.regex}/META-INF/MANIFEST.MF">
+ <fileset refid="classes" />
+ <manifest>
+ <attribute name="Implementation-Version" value="${svn.info}"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <target name="compile-tests">
+ <echo message="Compiling REGEX tests" />
+
+ <mkdir dir="${hy.regex.bin.test}" />
+
+ <javac srcdir="${hy.regex.src.test.java}"
+ destdir="${hy.regex.bin.test}"
+ sourcepath=""
compiler="${hy.javac.compiler}"
memoryMaximumSize="${hy.javac.maxmem}"
source="${hy.javac.source}"
target="${hy.javac.target}"
- debug="${hy.javac.debug}">
-
- <bootclasspath>
- <fileset dir="${hy.jdk}/jre/lib/boot">
- <include name="**/*.jar" />
- </fileset>
- </bootclasspath>
- <classpath location="../../build/tests" />
- </javac>
- </target>
-
- <target name="run-tests">
-
- <mkdir dir="${hy.tests.reports}" />
-
- <property name="test.jre.home" value="${hy.jdk}/jre" />
-
- <junit fork="yes"
- forkmode="once"
- printsummary="withOutAndErr"
- errorproperty="test.errors"
- failureproperty="test.failures"
- showoutput="on"
- dir="${basedir}"
- jvm="${test.jre.home}/bin/java">
-
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
- <classpath>
- <pathelement path="${hy.regex.bin.test}"/>
- </classpath>
- <classpath location="../../build/tests" />
-
- <formatter type="xml" />
-
- <test name="${test.case}" todir="${hy.tests.reports}"
- if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no"
- unless="test.case">
-
- <fileset dir="${hy.regex.src.test.java}">
- <include name="**/*Test.java"/>
- </fileset>
- </batchtest>
- </junit>
- <antcall target="touch-failures-file" />
- <antcall target="touch-errors-file" />
- </target>
-
- <target name="touch-failures-file" if="test.failures">
- <echo file="${hy.tests.reports}/test.failures"
- append="true">regex${line.separator}</echo>
- </target>
-
- <target name="touch-errors-file" if="test.errors">
- <echo file="${hy.tests.reports}/test.errors"
- append="true">regex${line.separator}</echo>
- </target>
-
-</project>
+ debug="${hy.javac.debug}">
+
+ <bootclasspath>
+ <fileset dir="${hy.jdk}/jre/lib/boot">
+ <include name="**/*.jar" />
+ </fileset>
+ </bootclasspath>
+ <classpath location="../../build/tests" />
+ </javac>
+ </target>
+
+ <target name="run-tests">
+
+ <mkdir dir="${hy.tests.reports}" />
+
+ <property name="test.jre.home" value="${hy.jdk}/jre" />
+
+ <junit fork="yes"
+ forkmode="once"
+ printsummary="withOutAndErr"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
+ showoutput="on"
+ dir="${basedir}"
+ jvm="${test.jre.home}/bin/java">
+
+ <classpath>
+ <pathelement path="${hy.regex.bin.test}"/>
+ </classpath>
+ <classpath location="../../build/tests" />
+
+ <formatter type="xml" />
+
+ <test name="${test.case}" todir="${hy.tests.reports}"
+ if="test.case" />
+
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+ unless="test.case">
+
+ <fileset dir="${hy.regex.src.test.java}">
+ <include name="**/*Test.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ <antcall target="touch-failures-file" />
+ <antcall target="touch-errors-file" />
+ </target>
+
+ <target name="touch-failures-file" if="test.failures">
+ <echo file="${hy.tests.reports}/test.failures"
+ append="true">regex${line.separator}</echo>
+ </target>
+
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true">regex${line.separator}</echo>
+ </target>
+
+</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml Mon Oct 2 08:35:14 2006
@@ -189,7 +189,6 @@
<jvmarg value="-Djava.security.policy=make/all.policy"/>
- <env key="JAVA_HOME" value="${test.jre.home}"/>
<junit-elements />
<classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml Mon Oct 2 08:35:14 2006
@@ -333,7 +333,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
<junit-elements />
<classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml Mon Oct 2 08:35:14 2006
@@ -123,8 +123,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<classpath>
<pathelement path="${hy.sound.bin.test}"/>
</classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml Mon Oct 2 08:35:14 2006
@@ -120,8 +120,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<classpath>
<pathelement path="${hy.sql.bin.test}"/>
<pathelement path="${hy.sql.src.test.resources}"/>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml Mon Oct 2 08:35:14 2006
@@ -120,8 +120,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<classpath>
<pathelement path="${hy.suncompat.bin.test}"/>
</classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml Mon Oct 2 08:35:14 2006
@@ -136,8 +136,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<formatter type="xml" />
<test name="${test.case}" todir="${hy.tests.reports}"
Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml Mon Oct 2 08:35:14 2006
@@ -156,8 +156,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<classpath>
<pathelement path="${hy.text.bin.test}"/>
</classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml Mon Oct 2 08:35:14 2006
@@ -131,8 +131,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
-
<classpath>
<pathelement path="${hy.tools.bin.test}"/>
</classpath>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml?view=diff&rev=452076&r1=452075&r2=452076
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml Mon Oct 2 08:35:14 2006
@@ -240,7 +240,6 @@
dir="${basedir}"
jvm="${test.jre.home}/bin/java">
- <env key="JAVA_HOME" value="${test.jre.home}"/>
<junit-elements />
<classpath>