You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/10/26 14:51:06 UTC
svn commit: r1027522 - in /harmony/enhanced/java/branches/mrh: ./ classlib/
classlib/make/ classlib/modules/accessibility/make/
classlib/modules/annotation/make/ classlib/modules/applet/make/
classlib/modules/archive/make/ classlib/modules/auth/make/ c...
Author: hindessm
Date: Tue Oct 26 12:51:04 2010
New Revision: 1027522
URL: http://svn.apache.org/viewvc?rev=1027522&view=rev
Log:
Merge changes from trunk@1027413.
Modified:
harmony/enhanced/java/branches/mrh/ (props changed)
harmony/enhanced/java/branches/mrh/build.xml
harmony/enhanced/java/branches/mrh/classlib/ (props changed)
harmony/enhanced/java/branches/mrh/classlib/make/depends.properties
harmony/enhanced/java/branches/mrh/classlib/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/annotation/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/applet/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/depends.properties
harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/auth/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/depends.properties
harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/beans/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/crypto/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/depends.properties
harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/instrument/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/jmx/make/depends.properties
harmony/enhanced/java/branches/mrh/classlib/modules/jndi/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/logging/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/depends.properties
harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/java/java/util/Timer.java
harmony/enhanced/java/branches/mrh/classlib/modules/math/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/misc/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/nio/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SelectorImpl.java
harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SelectorTest.java
harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/orb/make/depends.properties
harmony/enhanced/java/branches/mrh/classlib/modules/pack200/make/depends.properties
harmony/enhanced/java/branches/mrh/classlib/modules/pack200/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/prefs/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/print/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/regex/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/rmi/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/security/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/sound/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/sql/make/depends.properties
harmony/enhanced/java/branches/mrh/classlib/modules/sql/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/swing/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/text/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/x-net/make/run-test.xml
harmony/enhanced/java/branches/mrh/classlib/modules/xml/make/depends.properties
harmony/enhanced/java/branches/mrh/common_resources/ (props changed)
harmony/enhanced/java/branches/mrh/common_resources/make/depends.properties
harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml
harmony/enhanced/java/branches/mrh/drlvm/ (props changed)
harmony/enhanced/java/branches/mrh/drlvm/build.xml
harmony/enhanced/java/branches/mrh/drlvm/make/build-native.xml
harmony/enhanced/java/branches/mrh/drlvm/make/extra/apr.xml
harmony/enhanced/java/branches/mrh/drlvm/make/tests/ehwa-test.xml
harmony/enhanced/java/branches/mrh/drlvm/make/tests/kernel-test.xml
harmony/enhanced/java/branches/mrh/drlvm/make/tests/lazy-test.xml
harmony/enhanced/java/branches/mrh/drlvm/make/vm/verifier-ext.xml
harmony/enhanced/java/branches/mrh/jdktools/build.xml
harmony/enhanced/java/branches/mrh/jdktools/make/depends.properties
harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/make/run-test.xml
harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/run-test.xml
harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/windows/agent/makefile
harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile
harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile
harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/make/run-test.xml
harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/make/run-test.xml
harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javae
harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javaw
Propchange: harmony/enhanced/java/branches/mrh/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 12:51:04 2010
@@ -1,2 +1,2 @@
/harmony/enhanced/java/branches/mrh:935751
-/harmony/enhanced/java/trunk:935751-1022963
+/harmony/enhanced/java/trunk:935751-1027413
Modified: harmony/enhanced/java/branches/mrh/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/build.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/build.xml Tue Oct 26 12:51:04 2010
@@ -175,13 +175,15 @@ Usage:
<!-- ============================================================== -->
<target name="fetch-depends"
description="Fetches dependencies for all components. Note: Some of Harmony dependencies are licensed under terms other than the Apache License v2."
- depends="fetch-depends-classlib,
+ depends="-init-hdk,
+ fetch-depends-classlib,
fetch-depends-vm,
fetch-depends-jdktools"/>
<target name="check-depends"
description="Checks dependencies for all components."
- depends="check-depends-classlib,
+ depends="-init-hdk,
+ check-depends-classlib,
check-depends-vm,
check-depends-jdktools"/>
@@ -540,14 +542,8 @@ Usage:
</target>
<target name="-init-classlib-hdk-for-clean">
- <!-- <ant antfile="classlib/build.xml"
- target="-init-hdk-for-clean" inheritAll="false" >
- <propertyset refid="required.props" />
- <property name="keep.working" value="true" />
- <property name="hy.target" location="${hy.target}"/>
- <property name="common.resources" location="common_resources" />
- </ant>
---> </target>
+ <init-hdk/>
+ </target>
<target name="-init-hdk">
<ant antfile="${vm.dir.loc}/build.xml"
@@ -847,6 +843,7 @@ harmony.java.version=${harmony.java.vers
<propertyset refid="required.props" />
<property name="svn.info" value="${harmony.long.version}"/>
<property name="svn.revision" value="${harmony.version}"/>
+ <property name="hy.target" location="${hy.target}"/>
<property name="keep.working" value="true" />
<property name="tests.output" location="${hy.target}/test_report"/>
<property name="test.jre.home"
Propchange: harmony/enhanced/java/branches/mrh/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 12:51:04 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/classlib/trunk:926318-926838
/harmony/enhanced/java/branches/mrh/classlib:935751
-/harmony/enhanced/java/trunk/classlib:935751-1022963
+/harmony/enhanced/java/trunk/classlib:935751-1027413
/harmony/enhanced/trunk/classlib:476395-926317
Modified: harmony/enhanced/java/branches/mrh/classlib/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/make/depends.properties?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/classlib/make/depends.properties Tue Oct 26 12:51:04 2010
@@ -13,12 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-depends.dir=depends
-depends.jars=${depends.dir}/jars
-depends.oss=${depends.dir}/oss
-depends.libs=${depends.dir}/libs/${hy.platform}
-depends.files=${depends.dir}/files
-depends.manifests=${depends.dir}/manifests
+hy.depends=depends
+depends.jars=${hy.depends}/jars
+depends.oss=${hy.depends}/oss
+depends.libs=${hy.depends}/libs/${hy.platform}
+depends.files=${hy.depends}/files
+depends.manifests=${hy.depends}/manifests
xalan.dir=${depends.jars}/xalan-j_2.7.0
xalan.orig.jar=${xalan.dir}/xalan.orig.jar
@@ -41,13 +41,13 @@ hamcrest-library.jar=${hamcrest-library.
hamcrest-library.url=${maven2.base}/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar
hamcrest-library.md5=271f78edc4333f0f44df617676e0a874
-findbugs.dir=${depends.dir}/oss/findbugs-1.3.9
+findbugs.dir=${hy.depends}/oss/findbugs-1.3.9
findbugs.zip=${findbugs.dir}/findbugs-1.3.9.zip
findbugs.url=http://downloads.sourceforge.net/project/findbugs/findbugs/1.3.9/findbugs-1.3.9.zip
findbugs.md5=73702d533a505bd98d0c2c585a29a08b
-msvcr.dir=${depends.dir}/libs/${hy.platform}
-msvcp.dir=${depends.dir}/libs/${hy.platform}
+msvcr.dir=${hy.depends}/libs/${hy.platform}
+msvcp.dir=${hy.depends}/libs/${hy.platform}
msvcr.dll@x86@=${msvcr.dir}/msvcr71.dll
msvcr.url@x86@=file:///${hyenv.SystemRoot}/system32/msvcr71.dll
Modified: harmony/enhanced/java/branches/mrh/classlib/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,13 +23,13 @@
<property file="test.properties" />
<!-- These two parameters could be assigned by user -->
- <property name="hy.target" value="." />
+ <property name="hy.test.root" value="." />
<property name="hy.component" value="test" />
<property name="hy.module" value="toplevel" />
- <property name="work.dir" value="${hy.target}" />
+ <property name="work.dir" value="${test.root}" />
<property name="tests.output" value="${work.dir}/report" />
<property name="report.dir" value="${tests.output}/html" />
- <property name="junit.jar" value="${hy.target}/junit.jar" />
+ <property name="junit.jar" value="${test.root}/junit.jar" />
<property name="gen.report" value="true" />
<condition property="do.full.report" value="true">
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="accessibility" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/annotation/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/annotation/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/annotation/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/annotation/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="annotation" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/applet/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/applet/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/applet/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/applet/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="applet" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/depends.properties?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/depends.properties Tue Oct 26 12:51:04 2010
@@ -13,14 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-depends.dir=depends
+hy.depends=depends
# ZLIB, version 1.2.5 or above
# http://www.zlib.net/
zlib.ver=1.2.5
zlib.md5=c735eab2d659a96e5a594c9e8541ad63
zlib.basename=zlib-${zlib.ver}
-zlib.dir=${depends.dir}/oss/${zlib.basename}
+zlib.dir=${hy.depends}/oss/${zlib.basename}
zlib.tarname=zlib-${zlib.ver}.tar.gz
zlib.tar=${zlib.dir}/${zlib.tarname}
zlib.url=http://zlib.net/${zlib.tarname}
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="archive" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/auth/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/auth/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/auth/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/auth/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="auth" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/depends.properties?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/depends.properties Tue Oct 26 12:51:04 2010
@@ -13,13 +13,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-dejavu-fonts.dir=${depends.dir}/dejavu-fonts
-dejavu-fonts.fonts.dir=${depends.dir}/dejavu-fonts/dejavu-ttf-2.18
+dejavu-fonts.dir=${hy.depends}/dejavu-fonts
+dejavu-fonts.fonts.dir=${hy.depends}/dejavu-fonts/dejavu-ttf-2.18
dejavu-fonts.zip=${dejavu-fonts.dir}/dejavu-ttf-2.18-1.zip
dejavu-fonts.url=http://downloads.sourceforge.net/sourceforge/dejavu/dejavu-ttf-2.18-1.zip?use_mirror=autoselect
dejavu-fonts.md5=72e0a87ec1f9c5c26c66eabcf1e2018e
-depends.lib.dir=${depends.dir}/libs/${hy.platform}
+depends.lib.dir=${hy.depends}/libs/${hy.platform}
awt.base=http://people.apache.org/~hindessm/classlib-depends/${hy.platform}
jpeg.ver=6b
jpeg.dir=${depends.lib.dir}/jpeg-${jpeg.ver}
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="awt" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/beans/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/beans/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/beans/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/beans/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="beans" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="concurrent" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/crypto/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/crypto/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/crypto/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/crypto/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="crypto" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/depends.properties?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/depends.properties Tue Oct 26 12:51:04 2010
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-depends.dir=depends
-depends.lib.dir=${depends.dir}/libs/${hy.platform}
+hy.depends=depends
+depends.lib.dir=${hy.depends}/libs/${hy.platform}
awt.base=http://people.apache.org/~hindessm/classlib-depends/${hy.platform}
jpeg.ver=6b
jpeg.dir=${depends.lib.dir}/jpeg-${jpeg.ver}
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="imageio" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/instrument/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/instrument/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/instrument/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/instrument/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="instrument" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/jmx/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/jmx/make/depends.properties?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/jmx/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/jmx/make/depends.properties Tue Oct 26 12:51:04 2010
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-depends.jars=${depends.dir}/jars
+depends.jars=${hy.depends}/jars
mx4j.version=3.0.2
mx4j.dir=${depends.jars}/mx4j_${mx4j.version}
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/jndi/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/jndi/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/jndi/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/jndi/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="jndi" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="lang-management" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/logging/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/logging/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/logging/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/logging/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="logging" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml Tue Oct 26 12:51:04 2010
@@ -133,7 +133,7 @@
<mapper type="glob" from="*" to="*.orig" />
</move>
- <chmod dir="src/main/native/fdlibm_dist" perm="ugo+r" />
+ <chmod dir="${fdlibm.dist}" perm="ugo+r" />
</target>
<target name="-ascii2ebcdic-conversion" unless="skip.native.build"
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/depends.properties?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/depends.properties Tue Oct 26 12:51:04 2010
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-fdlibm.dir=${depends.dir}/oss/fdlibm-5.3
+fdlibm.dir=${hy.depends}/oss/fdlibm-5.3
fdlibm.tar=${fdlibm.dir}/fdlibm53.tar.gz
fdlibm.url=http://www.validlab.com/software/fdlibm53.tar.gz
fdlibm.md5=e56ca86c077dee87faf6a2c2cc1c10a5
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="luni" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/java/java/util/Timer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/java/java/util/Timer.java?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/java/java/util/Timer.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/java/java/util/Timer.java Tue Oct 26 12:51:04 2010
@@ -18,6 +18,8 @@
package java.util;
import org.apache.harmony.luni.internal.nls.Messages;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
/**
* {@code Timer}s are used to schedule jobs for execution in a background process. A
@@ -191,6 +193,11 @@ public class Timer {
* @param name thread's name
* @param isDaemon daemon thread or not
*/
+ TimerImpl(boolean isDaemon) {
+ this.setDaemon(isDaemon);
+ this.start();
+ }
+
TimerImpl(String name, boolean isDaemon) {
this.setName(name);
this.setDaemon(isDaemon);
@@ -204,7 +211,7 @@ public class Timer {
@Override
public void run() {
while (true) {
- TimerTask task;
+ final TimerTask task;
synchronized (this) {
// need to check cancelled inside the synchronized block
if (cancelled) {
@@ -370,6 +377,18 @@ public class Timer {
}
this.impl = new TimerImpl(name, isDaemon);
this.finalizer = new FinalizerHelper(impl);
+ if (isDaemon) {
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ public Object run() {
+ Runtime.getRuntime().addShutdownHook(new Thread() {
+ public void run() {
+ cancel();
+ }
+ });
+ return null;
+ }
+ });
+ }
}
/**
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/math/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/math/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/math/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/math/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="math" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/misc/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/misc/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/misc/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/misc/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="misc" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/nio/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/nio/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/nio/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/nio/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="nio" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SelectorImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SelectorImpl.java?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SelectorImpl.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SelectorImpl.java Tue Oct 26 12:51:04 2010
@@ -560,11 +560,7 @@ final class SelectorImpl extends Abstrac
selectedOp = ACCEPT_OR_READ & ops;
break;
case WRITEABLE:
- if (key.isConnected()) {
- selectedOp = OP_WRITE & ops;
- } else {
- selectedOp = (OP_CONNECT | OP_WRITE) & ops;
- }
+ selectedOp = (OP_CONNECT | OP_WRITE) & ops;
break;
}
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SelectorTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SelectorTest.java?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SelectorTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/SelectorTest.java Tue Oct 26 12:51:04 2010
@@ -449,6 +449,22 @@ public class SelectorTest extends TestCa
}
}
+ public void test_nonBlockingConnect() throws IOException {
+ SocketChannel channel = null;
+ try {
+ channel = SocketChannel.open();
+ channel.configureBlocking(false);
+ Selector selector = Selector.open();
+ channel.register(selector, SelectionKey.OP_CONNECT);
+ channel.connect(LOCAL_ADDRESS);
+ channel.finishConnect();
+ selector.select();
+ assertEquals(1, selector.selectedKeys().size());
+ } finally {
+ channel.close();
+ }
+ }
+
private void assert_select_SelectorClosed(SelectType type, int timeout)
throws IOException {
// selector is closed
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="nio_char" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/orb/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/orb/make/depends.properties?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/orb/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/orb/make/depends.properties Tue Oct 26 12:51:04 2010
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-depends.jars=${depends.dir}/jars
+depends.jars=${hy.depends}/jars
yoko.base=${maven2.base}/org/apache/yoko
yoko.version=1.0
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/pack200/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/pack200/make/depends.properties?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/pack200/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/pack200/make/depends.properties Tue Oct 26 12:51:04 2010
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-depends.jars=${depends.dir}/jars
+depends.jars=${hy.depends}/jars
asm.ver=asm-3.1
asm.dir=${depends.jars}/${asm.ver}
asm.jar=${asm.dir}/${asm.ver}.jar
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/pack200/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/pack200/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/pack200/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/pack200/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="pack200" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/prefs/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/prefs/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/prefs/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/prefs/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="prefs" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="print" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/regex/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/regex/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/regex/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/regex/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="regex" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/rmi/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/rmi/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/rmi/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/rmi/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="rmi" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/security/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/security/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/security/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/security/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="security" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/sound/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/sound/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/sound/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/sound/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="sound" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/sql/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/sql/make/depends.properties?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/sql/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/sql/make/depends.properties Tue Oct 26 12:51:04 2010
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-depends.jars=${depends.dir}/jars
+depends.jars=${hy.depends}/jars
derby.dir=${depends.jars}/derby-10.3.1.4
derby.jar=${derby.dir}/derby.jar
derby.url=${maven2.base}/org/apache/derby/derby/10.3.1.4/derby-10.3.1.4.jar
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/sql/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/sql/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/sql/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/sql/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="sql" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="suncompat" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="swing" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/text/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/text/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/text/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/text/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="text" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/x-net/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/x-net/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/x-net/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/x-net/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="classlib" />
<property name="hy.module" value="x-net" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/xml/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/xml/make/depends.properties?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/xml/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/xml/make/depends.properties Tue Oct 26 12:51:04 2010
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-depends.jars=${depends.dir}/jars
+depends.jars=${hy.depends}/jars
xalan.version=2.7.0
xalan.base=xalan-j_${xalan.version}
Propchange: harmony/enhanced/java/branches/mrh/common_resources/
('svn:ignore' removed)
Propchange: harmony/enhanced/java/branches/mrh/common_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 12:51:04 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/java/branches/mrh/common_resources:935751
-/harmony/enhanced/java/trunk/common_resources:935751-1022963
+/harmony/enhanced/java/trunk/common_resources:935751-1027413
/harmony/enhanced/trunk/common_resources:476395-921782
/incubator/harmony/enhanced/trunk/common_resources:292550-476394
Modified: harmony/enhanced/java/branches/mrh/common_resources/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/make/depends.properties?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/make/depends.properties Tue Oct 26 12:51:04 2010
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-depends.jars=${depends.dir}/jars
-depends.oss=${depends.dir}/oss
+depends.jars=${hy.depends}/jars
+depends.oss=${hy.depends}/oss
depends.url=http://svn.apache.org/repos/asf/harmony/standard/depends
eclipse.base=http://download.eclipse.org/eclipse/downloads/drops
@@ -44,7 +44,7 @@ icuhdr=${depends.oss}/icu4c/icu4c-3.4-ha
icuhdr.url=${depends.url}/oss/icu4c-3.4-harmony-includes.zip
icuhdr.md5=46dbe39e5f6c4ea206a9daad9e29f8b0
-icudll=${depends.dir}/libs/${hy.platform.variant}/icu-3.4/icu-3.4.zip
+icudll=${hy.depends}/libs/${hy.platform.variant}/icu-3.4/icu-3.4.zip
icudll.url=${depends.url}/libs/${hy.platform.variant}/icu-3.4.zip
icuuc.linkname@windows@=icuuc.lib
icuuc.linkname@unix@=libicuuc.so.34
@@ -78,7 +78,7 @@ xerces.zip=${xerces.dir}/xerces.zip
xerces.url=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.10.0.zip
xerces.md5=8da14a7b2848eff131b7cc10668887e8
-msvcr.dir.x86=${depends.dir}/libs/windows.x86
+msvcr.dir.x86=${hy.depends}/libs/windows.x86
msvcr.dll.x86=${msvcr.dir.x86}/msvcr71.dll
msvcr.url.x86=file:///${hyenv.SystemRoot}/system32/msvcr71.dll
# This is the md5 hash for the VS2003 version, 7.10.3052.4
@@ -86,7 +86,7 @@ msvcr_VS2003.md5.x86=86f1895ae8c5e8b17d9
# This is the md5 hash for the VS2003 SP1 version, 7.10.6030.0
msvcr_VS2003SP1.md5.x86=ca2f560921b7b8be1cf555a5a18d54c3
-msvcp.dir.x86=${depends.dir}/libs/windows.x86
+msvcp.dir.x86=${hy.depends}/libs/windows.x86
msvcp.dll.x86=${msvcr.dir.x86}/msvcp71.dll
msvcp.url.x86=file:///${hyenv.SystemRoot}/system32/msvcp71.dll
# This is the md5 hash for the VS2003 version, 7.10.3077.0
@@ -94,13 +94,13 @@ msvcp_VS2003.md5.x86=561fa2abb31dfa8fab7
# This is the md5 hash for the VS2003 SP1 version, 7.10.6030.0
msvcp_VS2003SP1.md5.x86=a94dc60a90efd7a35c36d971e3ee7470
-msvcr.dir.x86_64=${depends.dir}/libs/windows.x86_64
+msvcr.dir.x86_64=${hy.depends}/libs/windows.x86_64
msvcr.dll.x86_64=${msvcr.dir.x86_64}/msvcr80.dll
msvcr.url.x86_64=file:///C:/Program%20Files%20(x86)/Microsoft%20Visual%20Studio%208/VC/redist/amd64/Microsoft.VC80.CRT/msvcr80.dll
# VS2005 version 8.00.50727.42
msvcr.md5.x86_64=465cebd7da2ceaba5e552fc9118a1415
-msvcp.dir.x86_64=${depends.dir}/libs/windows.x86_64
+msvcp.dir.x86_64=${hy.depends}/libs/windows.x86_64
msvcp.dll.x86_64=${msvcp.dir.x86_64}/msvcp80.dll
msvcp.url.x86_64=file:///C:/Program%20Files%20(x86)/Microsoft%20Visual%20Studio%208/VC/redist/amd64/Microsoft.VC80.CRT/msvcp80.dll
# VS2005 version 8.00.50727.42
@@ -135,23 +135,23 @@ servlet-api.md5=c27c02fb0a00cc3a7d05ea99
servlet-api.url=${maven2.base}/jetty/servlet-api/2.5-6.0.0/servlet-api-2.5-6.0.0.jar
awtdeps.base.x86=http://people.apache.org/~geirm/harmony/
-awtdeps.dir.x86=${depends.dir}/libs/windows.x86
+awtdeps.dir.x86=${hy.depends}/libs/windows.x86
awtdeps.tar.x86=${awtdeps.dir.x86}/swing_awt_deps_winxp_2006-09-28.tgz
awtdeps.url.x86=${awtdeps.base.x86}swing_awt_deps_winxp_2006-09-28.tgz
awtdeps.md5.x86=d61a27e4b305d9fcabaaacf34f8f534a
-awtdeps.extract.dir.x86=${depends.dir}/libs/build
+awtdeps.extract.dir.x86=${hy.depends}/libs/build
awtdeps.testfile.x86=${awtdeps.extract.dir.x86}/winxp_2006-09-28.txt
awtdeps.base.x86_64=http://people.apache.org/~ayza/harmony/64bit/
-awtdeps.dir.x86_64=${depends.dir}/libs/windows.x86_64
+awtdeps.dir.x86_64=${hy.depends}/libs/windows.x86_64
awtdeps.tar.x86_64=${awtdeps.dir.x86_64}/swing_awt_deps_win64_2007-02-08.tgz
awtdeps.url.x86_64=${awtdeps.base.x86_64}swing_awt_deps_win64_2007-02-08.tgz
awtdeps.md5.x86_64=f2bbb1f4f23100393783fd02a77fcc68
-awtdeps.extract.dir.x86_64=${depends.dir}/libs/build
+awtdeps.extract.dir.x86_64=${hy.depends}/libs/build
awtdeps.testfile.x86_64=${awtdeps.extract.dir.x86_64}/win64_2007-02-08.txt
-dejavu-fonts.dir=${depends.dir}/dejavu-fonts
-dejavu-fonts.fonts.dir=${depends.dir}/dejavu-fonts/dejavu-ttf-2.18
+dejavu-fonts.dir=${hy.depends}/dejavu-fonts
+dejavu-fonts.fonts.dir=${hy.depends}/dejavu-fonts/dejavu-ttf-2.18
dejavu-fonts.zip=${dejavu-fonts.dir}/dejavu-ttf-2.18-1.zip
dejavu-fonts.url=http://downloads.sourceforge.net/sourceforge/dejavu/dejavu-ttf-2.18-1.zip?use_mirror=autoselect
dejavu-fonts.md5=72e0a87ec1f9c5c26c66eabcf1e2018e
Modified: harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml Tue Oct 26 12:51:04 2010
@@ -55,7 +55,7 @@
<property name="hy.build.mod" location="${hy.build}/${hy.module}" />
<!-- Root directory of the common dependency pool -->
- <property name="depends.dir" location="${hy.target}/depends" />
+ <property name="hy.depends" location="${hy.target}/depends" />
<!-- Debug or release version -->
<property name="hy.cfg" value="debug" />
@@ -615,7 +615,7 @@ Alternatively, you can switch to another
<sequential>
<echo message="Running @{module} Unit Test from @{jar}" />
<echo message="Tested jre: ${test.jre.home}/bin/java" />
- <property name="test.module.dir" value="${hy.target}/@{module}" />
+ <property name="test.module.dir" value="${hy.test.root}/@{module}" />
<property name="test.excludes.dir" value="${test.module.dir}/excludes" />
<property name="test.resources.dir" value="${test.module.dir}/resources" />
<property name="module.work.dir" location="${work.dir}/@{module}" />
@@ -651,7 +651,7 @@ Alternatively, you can switch to another
<jvmarg line="-Duser.home=${junit.user.home}" />
<classpath>
- <fileset dir="${hy.target}">
+ <fileset dir="${hy.test.root}">
<include name="*.jar" />
</fileset>
<pathelement path="${test.resources.dir}/" />
@@ -710,7 +710,7 @@ Alternatively, you can switch to another
<sequential>
<echo message="Running @{module} Unit Test from @{jar}" />
<echo message="Tested jre: ${test.jre.home}/bin/java" />
- <property name="test.module.dir" value="${hy.target}/@{module}" />
+ <property name="test.module.dir" value="${hy.test.root}/@{module}" />
<property name="test.excludes.dir" value="${test.module.dir}/excludes" />
<property name="test.resources.dir" value="${test.module.dir}/resources" />
<property name="module.work.dir" location="${work.dir}/@{module}" />
@@ -746,7 +746,7 @@ Alternatively, you can switch to another
<jvmarg line="-Duser.home=${junit.user.home}" />
<classpath>
- <fileset dir="${hy.target}">
+ <fileset dir="${hy.test.root}">
<include name="*.jar" />
</fileset>
<pathelement path="${test.resources.dir}/" />
Propchange: harmony/enhanced/java/branches/mrh/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 12:51:04 2010
@@ -1,5 +1,5 @@
/harmony/enhanced/java/branches/mrh/drlvm:935751
-/harmony/enhanced/java/trunk/drlvm:935751-1022963
+/harmony/enhanced/java/trunk/drlvm:935751-1027413
/harmony/enhanced/trunk/drlvm:476395-926313
/harmony/enhanced/trunk/working_vm:476396-920147
/incubator/harmony/enhanced/trunk/working_vm:423974-476394
Modified: harmony/enhanced/java/branches/mrh/drlvm/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/build.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/build.xml Tue Oct 26 12:51:04 2010
@@ -31,6 +31,15 @@
</condition>
</fail>
+ <mkdir dir="${hy.target}/hdk/build/ant" />
+ <copy todir="${hy.target}/hdk/build/ant" preservelastmodified="true">
+ <fileset dir="${common.resources}/make" includes="*.xml"/>
+ </copy>
+
+ <!-- import properties for snapshot targets -->
+ <import file="${hy.target}/hdk/build/ant/properties.xml" />
+ <init-hdk/>
+
<import file="make/properties.xml"/>
<target name="help">
@@ -204,7 +213,7 @@ Usage:
</target>
<target name="-init-hdk">
- <copy todir="${hy.hdk}/jdk/include">
+ <copy todir="${hy.hdk}/jdk/include" preservelastmodified="true">
<fileset dir="vm/include">
<include name="jvmti.h" />
<include name="jvmti_types.h" />
@@ -235,7 +244,8 @@ Usage:
deploy the rest of product
================================================================-->
<target name="deploy">
- <copy todir="${drlvm.deploy.dir}/jdk/include">
+ <copy todir="${drlvm.deploy.dir}/jdk/include"
+ preservelastmodified="true">
<fileset dir="${vm.home}/include">
<include name="jni_types.h" />
<include name="jvmti_types.h" />
@@ -256,7 +266,8 @@ Usage:
</delete>
<!-- launcher should use our hythr -->
- <copy todir="${drlvm.deploy.dir}/jdk/jre/bin" overwrite="yes">
+ <copy todir="${drlvm.deploy.dir}/jdk/jre/bin"
+ preservelastmodified="true" overwrite="yes">
<fileset dir="${drlvm.bin.dir}">
<include name="*hythr*"/>
</fileset>
Modified: harmony/enhanced/java/branches/mrh/drlvm/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/build-native.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/build-native.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/build-native.xml Tue Oct 26 12:51:04 2010
@@ -189,7 +189,7 @@
<attribute name="from" default="component.bin.dir"/>
<sequential>
<mkdir dir="${drlvm.lib.dir}" />
- <copy todir="${drlvm.lib.dir}">
+ <copy todir="${drlvm.lib.dir}" preservelastmodified="true">
<fileset dir="${@{from}}">
<include name="*${linklib.suffix}" unless="shlib.is.linklib"/>
<include name="*.exp" if="is.windows"/>
@@ -197,7 +197,7 @@
</fileset>
</copy>
<mkdir dir="${drlvm.bin.dir}" />
- <copy todir="${drlvm.bin.dir}">
+ <copy todir="${drlvm.bin.dir}" preservelastmodified="true">
<fileset dir="${@{from}}">
<include name="*${shlib.suffix}"/>
<include name="*.pdb" if="is.windows"/>
Modified: harmony/enhanced/java/branches/mrh/drlvm/make/extra/apr.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/extra/apr.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/extra/apr.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/extra/apr.xml Tue Oct 26 12:51:04 2010
@@ -68,7 +68,7 @@
<target name="build" depends="-make-apr-unix,-build-win">
<mkdir dir="${drlvm.include.dir}" />
- <copy todir="${drlvm.include.dir}">
+ <copy todir="${drlvm.include.dir}" preservelastmodified="true">
<fileset dir="${apr.src}/include" includes="*.h" />
</copy>
</target>
@@ -76,11 +76,13 @@
<target name="-make-apr-unix" if="is.unix" depends="apr-configure">
<!-- simply invoke make to let it build as the APR people suggest -->
<exec executable="make" dir="${apr.src}" failonerror="true"/>
- <copy file="${apr.src}/.libs/libapr-1.a" todir="${drlvm.lib.dir}" />
+ <copy file="${apr.src}/.libs/libapr-1.a" preservelastmodified="true"
+ todir="${drlvm.lib.dir}" />
</target>
<target name="-build-win" if="is.windows" depends="get-src, setup-native-build" >
- <copy file="${apr.src}/include/apr.hw" tofile="${apr.src}/include/apr.h"/>
+ <copy file="${apr.src}/include/apr.hw" preservelastmodified="true"
+ tofile="${apr.src}/include/apr.h"/>
<init-native />
<make-native libname="apr-1" type="static">
Modified: harmony/enhanced/java/branches/mrh/drlvm/make/tests/ehwa-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/tests/ehwa-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/tests/ehwa-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/tests/ehwa-test.xml Tue Oct 26 12:51:04 2010
@@ -20,7 +20,7 @@
<import file="test-common.xml"/>
<property name="ehwa.test.dir" location="${base.test.dir}/ehwa"/>
<property name="ehwa.test.summary" location="${ehwa.test.dir}/status.txt"/>
- <property name="ECLIPSE_ARCHIVE.home" location="${depends.dir}/eclipse"/>
+ <property name="ECLIPSE_ARCHIVE.home" location="${hy.depends}/eclipse"/>
<target name="ehwa" depends="-init-test,setup-ehwa, run-ehwa, check-ehwa-result"/>
@@ -101,7 +101,8 @@
</target>
<target name="touch-failures-file" if="test.failed">
- <copy file="${ehwa.test.summary}" tofile="${base.test.dir}/ehwa.test.failed">
+ <copy file="${ehwa.test.summary}"
+ tofile="${base.test.dir}/ehwa.test.failed">
<filterchain>
<linecontains>
<contains value="FAILED"/>
Modified: harmony/enhanced/java/branches/mrh/drlvm/make/tests/kernel-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/tests/kernel-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/tests/kernel-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/tests/kernel-test.xml Tue Oct 26 12:51:04 2010
@@ -77,7 +77,8 @@
</target>
<target name="touch-failures-file" if="test.failed">
- <copy file="${kernel.test.summary}" tofile="${base.test.dir}/kernel.test.failed">
+ <copy file="${kernel.test.summary}"
+ tofile="${base.test.dir}/kernel.test.failed">
<filterchain>
<linecontains>
<contains value="FAILED"/>
Modified: harmony/enhanced/java/branches/mrh/drlvm/make/tests/lazy-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/tests/lazy-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/tests/lazy-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/tests/lazy-test.xml Tue Oct 26 12:51:04 2010
@@ -76,7 +76,8 @@
</target>
<target name="touch-failures-file" if="test.failed">
- <copy file="${lazy.test.summary}" tofile="${base.test.dir}/lazy.test.failed">
+ <copy file="${lazy.test.summary}"
+ tofile="${base.test.dir}/lazy.test.failed">
<filterchain>
<linecontains>
<contains value="FAILED"/>
Modified: harmony/enhanced/java/branches/mrh/drlvm/make/vm/verifier-ext.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/vm/verifier-ext.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/vm/verifier-ext.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/vm/verifier-ext.xml Tue Oct 26 12:51:04 2010
@@ -26,7 +26,8 @@
<target name="build" depends="-common-vm">
<mkdir dir="${drlvm.verifier-ext.includes}"/>
- <copy todir="${drlvm.verifier-ext.includes}">
+ <copy todir="${drlvm.verifier-ext.includes}"
+ preservelastmodified="true">
<fileset dir="${vm.home}/include">
<include name="open/common.h"/>
<include name="open/hycomp.h"/>
Modified: harmony/enhanced/java/branches/mrh/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/build.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/build.xml Tue Oct 26 12:51:04 2010
@@ -81,8 +81,14 @@ module:
</condition>
</fail>
+ <mkdir dir="${hy.target}/hdk/build/ant" />
+ <copy todir="${hy.target}/hdk/build/ant" preservelastmodified="true">
+ <fileset dir="${common.resources}/make" includes="*.xml"/>
+ </copy>
+
<!-- import properties for snapshot targets -->
<import file="${hy.target}/hdk/build/ant/properties.xml" />
+ <init-hdk/>
<!-- ================================
target : rebuild
Modified: harmony/enhanced/java/branches/mrh/jdktools/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/make/depends.properties?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/make/depends.properties Tue Oct 26 12:51:04 2010
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-depends.jars=${depends.dir}/jars
+depends.jars=${hy.depends}/jars
icu.dir=${depends.jars}/eclipse-ICU4J
icu=${icu.dir}/com.ibm.icu.base-3.3.zip
Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="jdktools" />
<property name="hy.module" value="jdktools" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="jdktools" />
<property name="hy.module" value="jpda" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/windows/agent/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/windows/agent/makefile?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/windows/agent/makefile (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/windows/agent/makefile Tue Oct 26 12:51:04 2010
@@ -17,7 +17,8 @@
# Makefile for module jdwp
#
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\jdktools\jpda\native\jdwp\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
COMMON=..\..\common\# comment to avoid \ being treated as continuation
CMNAGENT=$(COMMON)agent\# comment to avoid \ being treated as continuation
@@ -35,35 +36,42 @@ HYCFLAGS = $(HYCFLAGS) $(INCLUDES) -GX -
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
BUILDFILES = \
- $(CMNAGENT)commands\ArrayReference.obj \
- $(CMNAGENT)commands\ArrayType.obj \
- $(CMNAGENT)commands\ClassLoaderReference.obj \
- $(CMNAGENT)commands\ClassObjectReference.obj \
- $(CMNAGENT)commands\ClassType.obj \
- $(CMNAGENT)commands\EventRequest.obj \
- $(CMNAGENT)commands\Method.obj \
- $(CMNAGENT)commands\ObjectReference.obj \
- $(CMNAGENT)commands\ReferenceType.obj \
- $(CMNAGENT)commands\StackFrame.obj \
- $(CMNAGENT)commands\StringReference.obj \
- $(CMNAGENT)commands\ThreadGroupReference.obj \
- $(CMNAGENT)commands\ThreadReference.obj \
- $(CMNAGENT)commands\VirtualMachine.obj \
- $(CMNAGENT)core\Agent.obj $(CMNAGENT)core\AgentEventRequest.obj $(CMNAGENT)core\AgentMonitor.obj \
- $(CMNAGENT)core\ClassManager.obj $(CMNAGENT)core\CommandDispatcher.obj $(CMNAGENT)core\CommandHandler.obj \
- $(CMNAGENT)core\EventDispatcher.obj $(CMNAGENT)core\LogManager.obj $(CMNAGENT)core\MemoryManager.obj \
- $(CMNAGENT)core\ObjectManager.obj $(CMNAGENT)core\OptionParser.obj $(CMNAGENT)core\PacketDispatcher.obj \
- $(CMNAGENT)core\PacketParser.obj $(CMNAGENT)core\RequestManager.obj $(CMNAGENT)core\RequestModifier.obj \
- $(CMNAGENT)core\ThreadManager.obj $(CMNAGENT)core\TransportManager.obj $(CMNAGENT)core\AgentManager.obj \
- core\TransportManager_pd.obj
+ $(HY_BIN)ArrayReference.obj $(HY_BIN)ArrayType.obj \
+ $(HY_BIN)ClassLoaderReference.obj $(HY_BIN)ClassObjectReference.obj \
+ $(HY_BIN)ClassType.obj $(HY_BIN)EventRequest.obj $(HY_BIN)Method.obj \
+ $(HY_BIN)ObjectReference.obj $(HY_BIN)ReferenceType.obj \
+ $(HY_BIN)StackFrame.obj $(HY_BIN)StringReference.obj \
+ $(HY_BIN)ThreadGroupReference.obj $(HY_BIN)ThreadReference.obj \
+ $(HY_BIN)VirtualMachine.obj $(HY_BIN)Agent.obj \
+ $(HY_BIN)AgentEventRequest.obj $(HY_BIN)AgentMonitor.obj \
+ $(HY_BIN)ClassManager.obj $(HY_BIN)CommandDispatcher.obj \
+ $(HY_BIN)CommandHandler.obj $(HY_BIN)EventDispatcher.obj \
+ $(HY_BIN)LogManager.obj $(HY_BIN)MemoryManager.obj \
+ $(HY_BIN)ObjectManager.obj $(HY_BIN)OptionParser.obj \
+ $(HY_BIN)PacketDispatcher.obj $(HY_BIN)PacketParser.obj \
+ $(HY_BIN)RequestManager.obj $(HY_BIN)RequestModifier.obj \
+ $(HY_BIN)ThreadManager.obj $(HY_BIN)TransportManager.obj \
+ $(HY_BIN)AgentManager.obj $(HY_BIN)TransportManager_pd.obj
VIRTFILES =
SYSLIBFILES =
MDLLIBFILES =
-
+
DLLBASE=0x13200000
COMMENT=/comment:"JDWP agent native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."
!include <$(HY_HDK)\build\make\rules.mak>
+
+{core}.cpp{$(HY_BIN)}.obj:
+ -mkdir $(*D)
+ $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(CMNAGENT)core}.cpp{$(HY_BIN)}.obj:
+ -mkdir $(*D)
+ $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(CMNAGENT)commands}.cpp{$(HY_BIN)}.obj:
+ -mkdir $(*D)
+ $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile Tue Oct 26 12:51:04 2010
@@ -17,7 +17,8 @@
# Makefile for module jdwp - dt_shmem transport
#
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\jdktools\jpda\native\dt_shmem\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
COMMON=..\..\..\common\# comment to avoid \ being treated as continuation
CMNTRANS=$(COMMON)transport\# comment to avoid \ being treated as continuation
@@ -35,9 +36,7 @@ HYCFLAGS = $(HYCFLAGS) $(INCLUDES) -GX -
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
-BUILDFILES = \
- $(CMNTRANS)common\LastTransportError.obj \
- SharedMemTransport.obj
+BUILDFILES = $(HY_BIN)LastTransportError.obj $(HY_BIN)SharedMemTransport.obj
VIRTFILES =
@@ -47,3 +46,11 @@ DLLBASE=0x13200000
COMMENT=/comment:"JDWP shmem transport native code. (c) Copyright 2008 The Apache Software Foundation or its licensors, as applicable."
!include <$(HY_HDK)\build\make\rules.mak>
+
+{$(CMNTRANS)common}.cpp{$(HY_BIN)}.obj:
+ -mkdir $(*D)
+ $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(CMNTRANS)dt_shmem}.cpp{$(HY_BIN)}.obj:
+ -mkdir $(*D)
+ $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile Tue Oct 26 12:51:04 2010
@@ -17,7 +17,8 @@
# Makefile for module jdwp - dt_socket transport
#
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\jdktools\jpda\native\dt_socket\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
COMMON=..\..\..\common\# comment to avoid \ being treated as continuation
CMNTRANS=$(COMMON)transport\# comment to avoid \ being treated as continuation
@@ -35,17 +36,23 @@ HYCFLAGS = $(HYCFLAGS) $(INCLUDES) -GX -
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
-BUILDFILES = \
- $(CMNTRANS)common\LastTransportError.obj \
- $(CMNTRANS)dt_socket\SocketTransport.obj
+BUILDFILES = $(HY_BIN)LastTransportError.obj $(HY_BIN)SocketTransport.obj
VIRTFILES =
SYSLIBFILES =
MDLLIBFILES =
-
+
DLLBASE=0x13200000
COMMENT=/comment:"JDWP socket transport native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."
!include <$(HY_HDK)\build\make\rules.mak>
+
+{$(CMNTRANS)common}.cpp{$(HY_BIN)}.obj:
+ -mkdir $(*D)
+ $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(CMNTRANS)dt_socket}.cpp{$(HY_BIN)}.obj:
+ -mkdir $(*D)
+ $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="jdktools" />
<property name="hy.module" value="jretools" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/make/run-test.xml?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/make/run-test.xml Tue Oct 26 12:51:04 2010
@@ -23,7 +23,7 @@
<property file="../test.properties" />
<property name="work.dir" value=".." />
- <property name="hy.target" value=".." />
+ <property name="hy.test.root" value=".." />
<property name="hy.component" value="jdktools" />
<property name="hy.module" value="samsa" />
<property name="tests.output" location="../report" />
Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javae
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javae?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javae (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javae Tue Oct 26 12:51:04 2010
@@ -17,11 +17,13 @@
# Makefile for module samsa
#
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\jdktools\samsa\native\samsa\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
+SHAREDSUB=..\# trailing slash not continuation
EXEBASE = samsa
EXENAME = $(LIBPATH)$(EXEBASE).exe
-BUILDFILES = ..\samsa.obj
+BUILDFILES = $(HY_BIN)samsa.obj
EXEFLAGS=$(conlflags) -subsystem:console
EXEDLLFILES=$(conlibsdll)
Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javaw
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javaw?rev=1027522&r1=1027521&r2=1027522&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javaw (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javaw Tue Oct 26 12:51:04 2010
@@ -17,11 +17,13 @@
# Makefile for javaw
#
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\jdktools\samsa\native\samsa\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
+SHAREDSUB=..\# trailing slash not continuation
EXEBASE = samsaw
EXENAME = $(LIBPATH)$(EXEBASE).exe
-BUILDFILES = javaw.obj ..\samsa.obj
+BUILDFILES = $(HY_BIN)javaw.obj $(HY_BIN)samsa.obj
EXEFLAGS=$(conlflags) -subsystem:windows
EXEDLLFILES=$(guilibsdll)