harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r1029056 [1/5] - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/build/ classlib/depends/libs/ classlib/make/ classlib/modules/accessibility/ classlib/modules/accessibility/make/ classlib/modules/activation/ classlib...
Date Sat, 30 Oct 2010 13:11:19 GMT
Author: hindessm
Date: Sat Oct 30 13:11:14 2010
New Revision: 1029056

URL: http://svn.apache.org/viewvc?rev=1029056&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@1027390:

  r1027390 | hindessm | 2010-10-26 08:13:24 +0100 (Tue, 26 Oct 2010) | 1 line

  Merging some changes tested in mrh branch.  As mentioned on dev list.


Added:
    harmony/enhanced/java/branches/java6/common_resources/depends/
      - copied from r1027390, harmony/enhanced/java/trunk/common_resources/depends/
    harmony/enhanced/java/branches/java6/common_resources/depends/build/
      - copied from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/
    harmony/enhanced/java/branches/java6/common_resources/depends/build/defines.mak
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/defines.mak
    harmony/enhanced/java/branches/java6/common_resources/depends/build/defines.mk
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/defines.mk
    harmony/enhanced/java/branches/java6/common_resources/depends/build/platform/
      - copied from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/platform/
    harmony/enhanced/java/branches/java6/common_resources/depends/build/platform/aix.ppc32.mk
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/platform/aix.ppc32.mk
    harmony/enhanced/java/branches/java6/common_resources/depends/build/platform/aix.ppc64.mk
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/platform/aix.ppc64.mk
    harmony/enhanced/java/branches/java6/common_resources/depends/build/platform/freebsd.x86.mk
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/platform/freebsd.x86.mk
    harmony/enhanced/java/branches/java6/common_resources/depends/build/platform/freebsd.x86_64.mk
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/platform/freebsd.x86_64.mk
    harmony/enhanced/java/branches/java6/common_resources/depends/build/platform/linux.ia64.mk
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.ia64.mk
    harmony/enhanced/java/branches/java6/common_resources/depends/build/platform/linux.ppc32.mk
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.ppc32.mk
    harmony/enhanced/java/branches/java6/common_resources/depends/build/platform/linux.ppc64.mk
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.ppc64.mk
    harmony/enhanced/java/branches/java6/common_resources/depends/build/platform/linux.s390.mk
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.s390.mk
    harmony/enhanced/java/branches/java6/common_resources/depends/build/platform/linux.s390x.mk
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.s390x.mk
    harmony/enhanced/java/branches/java6/common_resources/depends/build/platform/linux.x86.mk
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.x86.mk
    harmony/enhanced/java/branches/java6/common_resources/depends/build/platform/linux.x86_64.mk
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/platform/linux.x86_64.mk
    harmony/enhanced/java/branches/java6/common_resources/depends/build/platform/macosx.ppc32.mk
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/platform/macosx.ppc32.mk
    harmony/enhanced/java/branches/java6/common_resources/depends/build/platform/macosx.x86.mk
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/platform/macosx.x86.mk
    harmony/enhanced/java/branches/java6/common_resources/depends/build/platform/macosx.x86_64.mk
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/platform/macosx.x86_64.mk
    harmony/enhanced/java/branches/java6/common_resources/depends/build/platform/zos.s390.mk
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/platform/zos.s390.mk
    harmony/enhanced/java/branches/java6/common_resources/depends/build/platform/zos.s390x.mk
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/platform/zos.s390x.mk
    harmony/enhanced/java/branches/java6/common_resources/depends/build/rules.mak
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/rules.mak
    harmony/enhanced/java/branches/java6/common_resources/depends/build/rules.mk
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/common_resources/depends/build/rules.mk
    harmony/enhanced/java/branches/java6/drlvm/make/extra/make/
      - copied from r1027390, harmony/enhanced/java/trunk/drlvm/make/extra/make/
    harmony/enhanced/java/branches/java6/drlvm/make/extra/make/depends.properties
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/drlvm/make/extra/make/depends.properties
    harmony/enhanced/java/branches/java6/drlvm/make/tests/make/
      - copied from r1027390, harmony/enhanced/java/trunk/drlvm/make/tests/make/
    harmony/enhanced/java/branches/java6/drlvm/make/tests/make/depends.properties
      - copied unchanged from r1027390, harmony/enhanced/java/trunk/drlvm/make/tests/make/depends.properties
Removed:
    harmony/enhanced/java/branches/java6/classlib/depends/build/
    harmony/enhanced/java/branches/java6/classlib/make/depends-common.xml
    harmony/enhanced/java/branches/java6/classlib/make/properties.xml
Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/build.xml
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/build.xml
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/make/depends.xml
    harmony/enhanced/java/branches/java6/classlib/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/accessibility/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/accessibility/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/activation/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/annotation/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/annotation/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/applet/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/applet/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/archive/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/archive/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/modules/archive/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zlib/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zlib/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/auth/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/auth/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/awt/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/modules/awt/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/fontlib/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/fontlib/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/jpegdecoder/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/lcmm/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/lcmm/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/linuxfont/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/winfont/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/beans/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/beans/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/concurrent/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/concurrent/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/crypto/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/crypto/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/instrument/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/instrument/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/native/instrument/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/instrument/src/main/native/instrument/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/jaxb/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/jaxws/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/jmx/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/jmx/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/modules/jndi/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/jndi/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/jws/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/lang-management/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/lang-management/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/logging/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/logging/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/luni-kernel/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/luni/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/luni/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/modules/luni/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/fdlibm/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/fdlibm/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/hyzip/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/launcher/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/launcher/windows/makefile.javae
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/launcher/windows/makefile.javaw
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/luni/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/vmi/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/vmi/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/vmls/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/vmls/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/math/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/math/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/misc/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/misc/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/misc/src/main/native/accessors/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/misc/src/main/native/accessors/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/nio/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/nio/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/native/nio/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/nio/src/main/native/nio/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/nio_char/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/nio_char/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/nio_char/src/main/native/niochar/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/nio_char/src/main/native/niochar/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/orb/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/orb/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/a2e/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/common/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/common/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/pool/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/pool/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/port/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/port/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/thread/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/thread/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/portlib/src/main/native/thrstub/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/prefs/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/prefs/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/prefs/src/main/native/prefs/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/print/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/print/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/print/src/main/native/print/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/regex/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/regex/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/rmi/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/rmi/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/saaj/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/script/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/security-kernel/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/security/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/security/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/native/security/unix/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/security/src/main/native/security/windows/makefile
    harmony/enhanced/java/branches/java6/classlib/modules/sound/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/sound/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/sql/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/sql/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/modules/sql/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/stax/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/suncompat/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/suncompat/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/swing/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/swing/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/text/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/text/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/x-net/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/x-net/make/run-test.xml
    harmony/enhanced/java/branches/java6/classlib/modules/x-tools/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/xml/build.xml
    harmony/enhanced/java/branches/java6/classlib/modules/xml/make/depends.properties
    harmony/enhanced/java/branches/java6/classlib/modules/xmlsec/build.xml
    harmony/enhanced/java/branches/java6/common_resources/   (props changed)
    harmony/enhanced/java/branches/java6/common_resources/make/depends.properties
    harmony/enhanced/java/branches/java6/common_resources/make/depends.xml
    harmony/enhanced/java/branches/java6/common_resources/make/platform.xml
    harmony/enhanced/java/branches/java6/common_resources/make/properties.xml
    harmony/enhanced/java/branches/java6/common_resources/make/svn.xml
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/drlvm/build.xml
    harmony/enhanced/java/branches/java6/drlvm/make/build-java.xml
    harmony/enhanced/java/branches/java6/drlvm/make/build-native.xml
    harmony/enhanced/java/branches/java6/drlvm/make/depends.xml
    harmony/enhanced/java/branches/java6/drlvm/make/extra/apr.xml
    harmony/enhanced/java/branches/java6/drlvm/make/properties.xml
    harmony/enhanced/java/branches/java6/drlvm/make/tests/ehwa-test.xml
    harmony/enhanced/java/branches/java6/drlvm/make/tests/kernel-test.xml
    harmony/enhanced/java/branches/java6/drlvm/make/tests/lazy-test.xml
    harmony/enhanced/java/branches/java6/drlvm/make/tests/test-common.xml
    harmony/enhanced/java/branches/java6/drlvm/make/vm/em.xml
    harmony/enhanced/java/branches/java6/drlvm/make/vm/encoder.xml
    harmony/enhanced/java/branches/java6/drlvm/make/vm/gc_gen.xml
    harmony/enhanced/java/branches/java6/drlvm/make/vm/hythr.xml
    harmony/enhanced/java/branches/java6/drlvm/make/vm/interpreter.xml
    harmony/enhanced/java/branches/java6/drlvm/make/vm/jitrino.xml
    harmony/enhanced/java/branches/java6/drlvm/make/vm/kernel.xml
    harmony/enhanced/java/branches/java6/drlvm/make/vm/port.xml
    harmony/enhanced/java/branches/java6/drlvm/make/vm/port_ch.xml
    harmony/enhanced/java/branches/java6/drlvm/make/vm/verifier-ext.xml
    harmony/enhanced/java/branches/java6/drlvm/make/vm/verifier.xml
    harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml
    harmony/enhanced/java/branches/java6/drlvm/make/vm/vmi.xml
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/build.xml
    harmony/enhanced/java/branches/java6/jdktools/make/depends.properties
    harmony/enhanced/java/branches/java6/jdktools/make/properties.xml
    harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml
    harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/make/run-test.xml
    harmony/enhanced/java/branches/java6/jdktools/modules/jpda/build.xml
    harmony/enhanced/java/branches/java6/jdktools/modules/jpda/make/run-test.xml
    harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile
    harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
    harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/windows/agent/makefile
    harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile
    harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml
    harmony/enhanced/java/branches/java6/jdktools/modules/jretools/make/run-test.xml
    harmony/enhanced/java/branches/java6/jdktools/modules/samsa/build.xml
    harmony/enhanced/java/branches/java6/jdktools/modules/samsa/make/run-test.xml
    harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/unix/makefile
    harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javae
    harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javaw

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 13:11:14 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493,1022832,1022846,1022963,1024556,1025578
+/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493,1022832,1022846,1022963,1024556,1025578,1027390
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Modified: harmony/enhanced/java/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/build.xml (original)
+++ harmony/enhanced/java/branches/java6/build.xml Sat Oct 30 13:11:14 2010
@@ -32,6 +32,8 @@
     <property name="hy.select" value="false" />
 
     <property name="hy.hdk" location="${hy.target}/hdk" />
+    <property name="hy.component" location="federated" />
+    <property name="hy.module" location="toplevel" />
 
     <!-- property to identify when components are being built by the 
          federated build -->
@@ -43,7 +45,15 @@
     <!-- import some vm-specific properties -->
     <property file="${vm.dir.loc}/make/build.properties" />
 
-    <import file="common_resources/make/properties.xml" />
+    <property name="common.resources" location="common_resources" />
+
+    <mkdir dir="${hy.hdk}/build/ant" />
+    <copy todir="${hy.hdk}/build/ant" preservelastmodified="true">
+        <fileset dir="${common.resources}/make" includes="*.xml"/>
+    </copy>
+
+    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <init-hdk />
 
     <description>
         Apache Harmony project federation script
@@ -470,6 +480,8 @@ Usage:
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="keep.working" value="true" />
+            <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
         <!-- hack to make sure the federated build doesn't use the classlib
              LICENSE/NOTICE files as they don't cover ICU4C
@@ -487,6 +499,8 @@ Usage:
             <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="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -497,6 +511,8 @@ Usage:
             <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="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -507,6 +523,8 @@ Usage:
             <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="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -516,16 +534,20 @@ Usage:
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="keep.working" value="true" />
+            <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
     <target name="-init-classlib-hdk-for-clean">
-        <ant antfile="classlib/build.xml"
+ <!--       <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>
+-->    </target>
 
     <target name="-init-hdk">
         <ant antfile="${vm.dir.loc}/build.xml"
@@ -533,6 +555,8 @@ Usage:
             <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="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -548,6 +572,8 @@ Usage:
             <property name="deploy.canonical.flag" value="false"/>
             <property name="drlvm.deploy.dir" location="${hy.hdk}"/>
             <property name="import.hdk" value="false"/>
+            <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -556,6 +582,8 @@ Usage:
             <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="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -566,6 +594,8 @@ Usage:
             <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="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -576,6 +606,8 @@ Usage:
             <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="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -588,6 +620,8 @@ Usage:
             <property name="deploy.canonical.flag" value="false"/>
             <property name="drlvm.deploy.dir" location="${hy.hdk}"/>
             <property name="import.hdk" value="false"/>
+            <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -598,15 +632,17 @@ Usage:
             depends="init,-init-hdk,auto-fetch-depends-jdktools">
         <ant antfile="jdktools/build.xml" target="build" inheritall="false" >
             <propertyset refid="required.props" />
-            <property name="common.resources" location="common_resources" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
+            <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
     <target name="auto-fetch-depends-jdktools" if="auto.fetch">
         <ant target="fetch-depends-jdktools" inheritall="false" >
             <propertyset refid="required.props" />
+            <property name="hy.target" location="${hy.target}"/>
             <property name="common.resources" location="common_resources" />
         </ant>
     </target>
@@ -616,6 +652,7 @@ Usage:
         <ant antfile="jdktools/build.xml" target="fetch-depends"
              inheritall="false" >
             <propertyset refid="required.props" />
+            <property name="hy.target" location="${hy.target}"/>
             <property name="common.resources" location="common_resources" />
         </ant>
     </target>
@@ -625,6 +662,7 @@ Usage:
         <ant antfile="jdktools/build.xml" target="check-depends"
              inheritall="false" >
             <propertyset refid="required.props" />
+            <property name="hy.target" location="${hy.target}"/>
             <property name="common.resources" location="common_resources" />
         </ant>
     </target>
@@ -632,9 +670,10 @@ Usage:
     <target name="clean-jdktools">
         <ant antfile="jdktools/build.xml" target="clean" inheritall="false" >
             <propertyset refid="required.props" />
-            <property name="common.resources" location="common_resources" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
+            <property name="hy.target" location="${hy.target}"/>
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
@@ -653,7 +692,16 @@ Usage:
                  clean-classlib,
                  clean-vm,
                  clean-tests" >
-        <delete dir="${hy.target}" failonerror="false" />
+        <delete includeemptydirs="true" failonerror="false">
+            <fileset dir="${hy.target}">
+                <exclude name="depends/**" />
+            </fileset>
+        </delete>
+    </target>
+
+    <target name="distclean">
+        <delete dir="${hy.target}"
+                includeemptydirs="true" failonerror="false" />
     </target>
 
     <!-- ============================================================== -->
@@ -799,9 +847,11 @@ 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" location="${hy.target}/hdk/jdk/jre" />
+            <property name="tests.output" location="${hy.target}/test_report"/>
+            <property name="test.jre.home"
+                      location="${hy.target}/hdk/jdk/jre" />
         </ant>
     </target>
 

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 13:11:14 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493,1022832,1022846,1022963,1024556,1025578
+/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493,1022832,1022846,1022963,1024556,1025578,1027390
 /harmony/enhanced/trunk/classlib:476395-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/classlib:292550-476394

Modified: harmony/enhanced/java/branches/java6/classlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/build.xml Sat Oct 30 13:11:14 2010
@@ -31,7 +31,7 @@ Usage:
 
   ant build
     Compiles the java and native code to produce a jdk in
-    "deploy/jdk".
+    "target/hdk/jdk".
 
   ant clean
     Removes all the files generated by a build.
@@ -72,16 +72,33 @@ module:
 
     <property file="${user.home}/.harmony-classlib.properties" />
 
-    <property name="hy.hdk" location="deploy" />
+    <property name="hy.target" location="target" />
+    <property name="hy.component" value="classlib" />
+    <property name="hy.module" value="toplevel" />
+
+    <fail message="Property 'common.resources' is not defined">
+        <condition>
+            <not><isset property="common.resources" /></not>
+        </condition>
+    </fail>
 
-    <property name="build.output" location="build/classes" />
-    <property name="tests.output" location="build/test_report" />
-    <property name="tests.support.output" location="build/test_support" />
-    <property name="tests.report.dir" value="${tests.output}/html"/>
+    <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="make/properties.xml" />
-    <import file="make/depends.xml" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
+    <init-hdk/>
+
+    <property name="build.output" location="${hy.build.top}/java" />
+    <property name="tests.output" location="${hy.target}/test_report" />
+    <property name="tests.support.output" location="${hy.build.top}/test" />
+    <property name="tests.report.dir" value="${tests.output}/html"/>
+    <property name="depends.files" location="depends/files"/>
+    <property name="depends.manifests" location="depends/manifests"/>
+
+    <import file="${hy.hdk}/build/ant/depends.xml" />
     <property file="make/depends.properties" />
 
     <condition property="needs.vme.v3.hack" value="true">
@@ -91,6 +108,12 @@ module:
         </or>
     </condition>
 
+    <propertyset id="toplevel.props">
+        <propertyref name="hy.target" />
+        <propertyref name="hy.component" />
+        <propertyref name="hy.module" />
+    </propertyset>
+
     <!-- ================================
 	 target : rebuild
 	     
@@ -105,7 +128,7 @@ module:
 
     <target name="clean"
             depends="-init-hdk-for-clean,-clean-modules,-clean-check,
-                     -clean-native,-clean-test,-clean-hdk" 
+                     -clean-native,-clean-test" 
             description="Removes all the files generated by a build" />
 
     <target name="-build-java" unless="skip.java.build"
@@ -313,11 +336,29 @@ ${built.files.list}
             description="Compiles the native code only" >
 
         <!-- these must be run in a specific order due to dependencies -->
-    	<ant dir="modules/portlib" target="-build-native" />
-        <ant dir="modules/luni" target="-build-native-core" />
-    	<ant dir="modules/archive" target="-build-native" />
-    	<ant dir="modules/luni" target="-build-native-secondary" />
+    	<ant dir="modules/portlib" target="-build-native"
+             inheritall="false">
+            <property name="hy.target" location="${hy.target}"/>
+            <propertyset refid="module.props" />
+        </ant>
+
+        <ant dir="modules/luni" target="-build-native-core"
+             inheritall="false">
+            <property name="hy.target" location="${hy.target}"/>
+            <propertyset refid="module.props" />
+        </ant>
 
+    	<ant dir="modules/archive" target="-build-native"
+             inheritall="false">
+            <property name="hy.target" location="${hy.target}"/>
+            <propertyset refid="module.props" />
+        </ant>
+
+    	<ant dir="modules/luni" target="-build-native-secondary"
+             inheritall="false">
+            <property name="hy.target" location="${hy.target}"/>
+            <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="-layout-natives" unless="skip.native.build"
@@ -440,7 +481,7 @@ Generating HTML using Doxygen...
     <!-- ================================= 
           target: -properties
          ================================= -->
-    <target name="-properties" depends="-svn-prop">
+    <target name="-properties" depends="-svn-info">
         <property name="deploy.file.prefix"
                   value="harmony-classlib-r${svn.revision}" />
         <property name="deploy.tar"
@@ -524,12 +565,17 @@ Generating snapshot zip
     </target>
 
     <target name="-check-depends" description="Check top-level dependencies">
-        <ant antfile="make/depends.xml" inheritall="false" target="check" />
+        <ant antfile="make/depends.xml" inheritall="false" target="check">
+            <propertyset refid="toplevel.props" />
+        </ant>
     </target>
 
     <target name="fetch-depends" depends="-init-hdk"
         description="Fetches dependencies. Note: Some of Harmony's dependencies are licensed under terms other than the Apache License v2.">
-        <ant antfile="make/depends.xml" inheritall="false" target="download" />
+        <ant antfile="make/depends.xml" inheritall="false" target="download">
+            <propertyset refid="toplevel.props" />
+        </ant>
+
         <poll-modules target="fetch-depends" />
     </target>
 
@@ -611,11 +657,6 @@ Generating snapshot zip
         <init-hdk />
     </target>
 
-    <target name="-clean-hdk">
-        <delete dir="${hy.hdk}/build/ant" />
-	<delete dir="${hy.hdk}/build/make" />
-    </target>
-    
     <macrodef name="chksum">
         <attribute name="file" />
         <attribute name="type" default="md5" />
@@ -627,47 +668,5 @@ Generating snapshot zip
         </sequential>
     </macrodef>
 
-    <macrodef name="init-hdk">
-        <sequential>
-            <mkdir dir="${hy.hdk}/build/ant" />
-            <copy file="make/properties.xml"
-                  tofile="${hy.hdk}/build/ant/properties.xml"
-                  outputencoding="UTF-8" >
-                <filterchain>
-                    <tokenfilter>
-                        <replacestring from="Top-Level property definitions"
-                                       to="Classlib property definitions" />
-                    </tokenfilter>
-                </filterchain>
-            </copy>
-            <copy file="make/make.xml"
-                  tofile="${hy.hdk}/build/ant/make.xml"
-                  outputencoding="UTF-8" >
-            </copy>
-            <copy file="make/depends-common.xml"
-                  tofile="${hy.hdk}/build/ant/depends.xml"
-                  outputencoding="UTF-8" >
-                <filterchain>
-                    <tokenfilter>
-                        <replacestring from="Common dependency definitions"
-                                       to="Classlib dependency definitions" />
-                    </tokenfilter>
-                </filterchain>
-            </copy>
-            <copy file="make/depends.properties"
-                  tofile="${hy.hdk}/build/ant/depends.properties"
-                  outputencoding="UTF-8" >
-            </copy>
-
-	    <mkdir dir="${hy.hdk}/build/make" />
-	    <copy todir="${hy.hdk}/build/make" overwrite="yes">
-                <fileset dir="depends/build">
-                    <include name="**" />
-                </fileset>
-            </copy>
-
-        </sequential>
-    </macrodef>
-
 </project>
 

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 13:11:14 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493,1022832,1022846,1022963,1024556,1025578
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493,1022832,1022846,1022963,1024556,1025578,1027390
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Modified: harmony/enhanced/java/branches/java6/classlib/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/make/depends.properties?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/classlib/make/depends.properties Sat Oct 30 13:11:14 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/java6/classlib/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/make/depends.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/make/depends.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/make/depends.xml Sat Oct 30 13:11:14 2010
@@ -25,10 +25,8 @@
     where possible.
     </description>
 
-    <property name="hy.hdk" location="${basedir}/deploy" />
-
-    <import file="${basedir}/make/properties.xml" />
-    <import file="${basedir}/make/depends-common.xml" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
+    <import file="${hy.target}/hdk/build/ant/depends.xml" />
 
     <target name="check" description="Check whether dependencies are available"
             depends="-check,-check-win,-extract" />

Modified: harmony/enhanced/java/branches/java6/classlib/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/make/run-test.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/make/run-test.xml Sat Oct 30 13:11:14 2010
@@ -23,11 +23,13 @@
     <property file="test.properties" />
 
     <!-- These two parameters could be assigned by user -->
-    <property name="target.dir" value="." />
-    <property name="work.dir" value="${target.dir}" />
+    <property name="hy.test.root" value="." />
+    <property name="hy.component" value="test" />
+    <property name="hy.module" value="toplevel" />
+    <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="${target.dir}/junit.jar" />
+    <property name="junit.jar" value="${test.root}/junit.jar" />
 
     <property name="gen.report" value="true" />
     <condition property="do.full.report" value="true">
@@ -54,7 +56,7 @@
 
     <target name="-test">
         <echo message="Test Work Dir: ${work.dir}" />
-        <echo message="Test Target Dir: ${target.dir}" />
+        <echo message="Test Target Dir: ${hy.target}" />
         <mkdir dir="${work.dir}" /> 
         <delete dir="${tests.output}" quiet="true"/>
         <poll-modules dir="." target="test-module" />

Modified: harmony/enhanced/java/branches/java6/classlib/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/accessibility/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/accessibility/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/accessibility/build.xml Sat Oct 30 13:11:14 2010
@@ -19,10 +19,10 @@
 <project name="ACCESSIBILITY Build" default="build" basedir=".">
     <description>Build for ACCESSIBILITY component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="accessibility" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
 
@@ -57,7 +57,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -97,7 +97,7 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/accessibility/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/accessibility/make/run-test.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/accessibility/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/accessibility/make/run-test.xml Sat Oct 30 13:11:14 2010
@@ -23,7 +23,9 @@
     <property file="../test.properties" />
 
     <property name="work.dir" value=".." />
-    <property name="target.dir" 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" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/activation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/activation/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/activation/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/activation/build.xml Sat Oct 30 13:11:14 2010
@@ -21,10 +21,10 @@
 <project name="Activation Build" default="build" basedir=".">
     <description>Build for activation component</description>
 
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="hy.jdk" location="${hy.hdk}/jdk" />
-    <property name="depends.dir" location="${basedir}/../../depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.component" value="classlib" />
+    <property name="hy.module" value="activation" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
     <import file="${hy.hdk}/build/ant/depends.xml" />
 
     <target name="build" depends="check-depends" />

Modified: harmony/enhanced/java/branches/java6/classlib/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/annotation/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/annotation/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/annotation/build.xml Sat Oct 30 13:11:14 2010
@@ -19,10 +19,10 @@
 <project name="ANNOTATION Build" default="build" basedir=".">
     <description>Build for ANNOTATION component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="annotation" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
 
@@ -57,7 +57,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -95,7 +95,7 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/annotation/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/annotation/make/run-test.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/annotation/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/annotation/make/run-test.xml Sat Oct 30 13:11:14 2010
@@ -23,7 +23,9 @@
     <property file="../test.properties" />
 
     <property name="work.dir" value=".." />
-    <property name="target.dir" 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" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/applet/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/applet/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/applet/build.xml Sat Oct 30 13:11:14 2010
@@ -19,10 +19,10 @@
 <project name="APPLET Build" default="build" basedir=".">
     <description>Build for APPLET component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="applet" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
 
@@ -57,7 +57,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -96,7 +96,7 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/applet/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/applet/make/run-test.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/applet/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/applet/make/run-test.xml Sat Oct 30 13:11:14 2010
@@ -23,7 +23,9 @@
     <property file="../test.properties" />
 
     <property name="work.dir" value=".." />
-    <property name="target.dir" 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" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/build.xml Sat Oct 30 13:11:14 2010
@@ -19,15 +19,18 @@
 <project name="ARCHIVE Build" default="build" basedir=".">
     <description>Build for ARCHIVE component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="archive" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
     <import file="${hy.hdk}/build/ant/depends.xml" />
 
     <property file="../../make/depends.properties" />
     <property file="make/depends.properties" />
 
+    <property name="zlib.dist"
+              location="${hy.target}/depends/native/zlib_dist"/>
+
     <target name="build" depends="check-depends,-build-no-check"/>
     <target name="-build-no-check" depends="-build-jar,-test-jar" />
     
@@ -50,7 +53,7 @@
     <target name="-copy-zlib-include" unless="hy.skip.zlib">
         <!-- TOFIX: should add property for: unless="skip.native.build" -->
         <copy todir="${hy.hdk}/include" preservelastmodified="true">
-            <fileset dir="src/main/native/zlib_dist">
+            <fileset dir="${zlib.dist}">
                 <include name="zlib.h" />
                 <include name="zconf.h" />
             </fileset>
@@ -73,7 +76,7 @@
     <target name="-extract-props" unless="hy.skip.zlib">
         <uptodate property="zlib.extracted"
                   srcfile="${zlib.tar}"
-                  targetfile="src/main/native/zlib_dist/README" />
+                  targetfile="${zlib.dist}/README" />
         <condition property="zlib.uptodate" value="true">
             <or>
                 <isset property="hy.skip.zlib" />
@@ -83,31 +86,31 @@
     </target>
 
     <target name="-unzip-oss" unless="zlib.uptodate">
-        <mkdir dir="src/main/native/zlib_dist" />
-        <untar src="${zlib.tar}" dest="src/main/native/zlib_dist"
+        <mkdir dir="${zlib.dist}" />
+        <untar src="${zlib.tar}" dest="${zlib.dist}"
                compression="gzip">
             <mapper type="flatten"/>
         </untar>
-        <chmod dir="src/main/native/zlib_dist" perm="ugo+r" />
-        <touch file="src/main/native/zlib_dist/README" />
+        <chmod dir="${zlib.dist}" perm="ugo+r" />
+        <touch file="${zlib.dist}/README" />
     </target>
 
     <target name="-ascii2ebcdic-conversion" if="is.zos" unless="zlib.uptodate">
-        <move todir="src/main/native/zlib_dist_ascii">
-            <fileset dir="src/main/native/zlib_dist">
+        <move todir="${zlib.dist}_ascii">
+            <fileset dir="${zlib.dist}">
                 <include name="**/*" />
                 <exclude name="**/*.o" />
             </fileset>
         </move>
-        <copy todir="src/main/native/zlib_dist" outputencoding="IBM-1047" >
-            <fileset dir="src/main/native/zlib_dist_ascii">
+        <copy todir="${zlib.dist}" outputencoding="IBM-1047" >
+            <fileset dir="${zlib.dist}_ascii">
                 <include name="**/*" />
                 <exclude name="**/*.o" />
             </fileset>               
         </copy>
-        <fixcrlf srcdir="src/main/native/zlib_dist"
+        <fixcrlf srcdir="${zlib.dist}"
                  includes="**/*" excludes="**/*.o" eol="unix" />
-        <delete dir="src/main/native/zlib_dist_ascii" />
+        <delete dir="${zlib.dist}_ascii" />
     </target>
     
     <!-- Build native code -->
@@ -152,7 +155,7 @@
     </target>
 
     <target name="-clean-overlay-oss" unless="hy.skip.zlib" >
-        <delete dir="src/main/native/zlib_dist" quiet="true" />
+        <delete dir="${zlib.dist}" quiet="true" />
     </target>
     
     <target name="test" depends="-test-module">
@@ -181,7 +184,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -219,11 +222,11 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_internal_tests.jar">
-            <fileset dir="bin/test-internal" />
+            <fileset dir="${hy.build.mod}/test/internal" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>
@@ -244,7 +247,7 @@
 
     <target name="-compile-tests" unless="skip.test.build">
         <compile-tests description="${hy.module} internal tests"
-                       destdir="bin/test-internal">
+                       destdir="${hy.build.mod}/test/internal">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java-internal" />

Modified: harmony/enhanced/java/branches/java6/classlib/modules/archive/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/make/depends.properties?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/make/depends.properties Sat Oct 30 13:11:14 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/java6/classlib/modules/archive/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/make/run-test.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/make/run-test.xml Sat Oct 30 13:11:14 2010
@@ -23,7 +23,9 @@
     <property file="../test.properties" />
 
     <property name="work.dir" value=".." />
-    <property name="target.dir" 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" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/unix/makefile?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/unix/makefile Sat Oct 30 13:11:14 2010
@@ -17,13 +17,13 @@
 # Makefile for module 'archive'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/archive/native/archive/
+include $(HY_TARGET)/hdk/build/make/defines.mk
+ZLIB_DIST = $(HY_TARGET)/depends/native/zlib_dist/
+INCLUDES += -I$(SHARED)common -I$(ZLIB_DIST) -I../../include/shared
 
-INCLUDES += -I$(SHARED)common -I../../zlib_dist -I../../include/shared
-
-BUILDFILES = $(SHAREDSUB)archive_copyright.o $(SHAREDSUB)jclcrc32.o \
-	$(SHAREDSUB)zip.o $(SHAREDSUB)adler32.o $(SHAREDSUB)inflater.o \
-	$(SHAREDSUB)jarfile.o $(SHAREDSUB)deflater.o $(SHAREDSUB)archiveglob.o
+BUILDFILES = archive_copyright.o jclcrc32.o zip.o adler32.o inflater.o \
+  jarfile.o deflater.o archiveglob.o
 
 ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES +=	$(LIBPATH)libhyzip.a
@@ -48,4 +48,4 @@ MDLLIBFILES += \
 DLLNAME=$(DLLPATH)libhyarchive$(HY_SHLIB_SUFFIX)
 EXPNAME=HYARCHIVE_0.1
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/windows/makefile?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/archive/windows/makefile Sat Oct 30 13:11:14 2010
@@ -17,7 +17,8 @@
 # Makefile for module 'archive'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\archive\native\archive\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hyarchive
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -27,10 +28,9 @@ HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-	$(SHAREDSUB)archive_copyright.obj $(SHAREDSUB)jclcrc32.obj \
-	$(SHAREDSUB)zip.obj $(SHAREDSUB)adler32.obj $(SHAREDSUB)inflater.obj \
-	$(SHAREDSUB)jarfile.obj $(SHAREDSUB)deflater.obj \
-	$(SHAREDSUB)archiveglob.obj
+	$(HY_BIN)archive_copyright.obj $(HY_BIN)jclcrc32.obj \
+	$(HY_BIN)zip.obj $(HY_BIN)adler32.obj $(HY_BIN)inflater.obj \
+	$(HY_BIN)jarfile.obj $(HY_BIN)deflater.obj $(HY_BIN)archiveglob.obj
 
 VIRTFILES = $(LIBBASE).res
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/unix/makefile?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/unix/makefile Sat Oct 30 13:11:14 2010
@@ -17,12 +17,12 @@
 # Makefile for module 'zip'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/archive/native/zip/
+include $(HY_TARGET)/hdk/build/make/defines.mk
+ZLIB_DIST = $(HY_TARGET)/depends/native/zlib_dist/
+INCLUDES += -I$(ZLIB_DIST)
 
-INCLUDES += -I../../zlib_dist
-
-BUILDFILES = $(SHAREDSUB)zcpool.o $(SHAREDSUB)zipalloc.o \
-	$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o pool.o pool_cap.o
+BUILDFILES = zcpool.o zipalloc.o zipcache.o zipsup.o pool.o pool_cap.o
 
 ifeq ($(HY_LOCAL_ZLIB),true)
 DEFINES += -DHY_LOCAL_ZLIB
@@ -38,7 +38,7 @@ endif
 
 LIBNAME = $(LIBPATH)libhyzip.a
 
-%.o: $(LIBPATH)libhypool.a(%.o)
-	ar $(ARFLAGS) $(AREXTRACT) $(LIBPATH)libhypool.a $@
+$(HY_BIN)%.o: $(LIBPATH)libhypool.a(%.o)
+	( cd $(HY_BIN) && ar $(ARFLAGS) $(AREXTRACT) $(LIBPATH)libhypool.a $@ )
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/windows/makefile?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/windows/makefile Sat Oct 30 13:11:14 2010
@@ -17,13 +17,15 @@
 # Makefile for module 'zip'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\archive\native\zip\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hyzip
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
-BUILDFILES = $(SHAREDSUB)zcpool.obj $(SHAREDSUB)zipalloc.obj \
-	$(SHAREDSUB)zipcache.obj $(SHAREDSUB)zipsup.obj \
+BUILDFILES = $(HY_BIN)zcpool.obj $(HY_BIN)zipalloc.obj \
+	$(HY_BIN)zipcache.obj $(HY_BIN)zipsup.obj \
         $(LIBPATH)hypool$(HY_LINKLIB_SUFFIX)
-HYCFLAGS = $(HYCFLAGS) /I..\..\zlib_dist
+ZLIB_DIST = $(HY_TARGET)\depends\native\zlib_dist\# trailing slash
+HYCFLAGS = $(HYCFLAGS) /I$(ZLIB_DIST)
 
 !include <$(HY_HDK)\build\make\rules.mak>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zlib/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zlib/unix/makefile?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zlib/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zlib/unix/makefile Sat Oct 30 13:11:14 2010
@@ -20,7 +20,8 @@
 # We don't need to debug into zlib
 HY_CFG=release
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/archive/native/zlib/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 HYRELEASECFLAGS = -O2
 
@@ -29,12 +30,11 @@ ifneq (,$(findstring x86,$(HY_ARCH)))
 HYRELEASECFLAGS += -DUNALIGNED_OK
 endif
 
-ZLIB_DIST=../../zlib_dist/# Path to zlib
+OSS_DIST=$(HY_TARGET)/depends/native/zlib_dist/# Path to zlib
 
 BUILDFILES = \
-	$(SHAREDSUB)zlib_copyright.o $(ZLIB_DIST)adler32.o $(ZLIB_DIST)compress.o \
-	$(ZLIB_DIST)crc32.o $(ZLIB_DIST)deflate.o $(ZLIB_DIST)infback.o $(ZLIB_DIST)inffast.o \
-	$(ZLIB_DIST)inflate.o $(ZLIB_DIST)inftrees.o $(ZLIB_DIST)trees.o $(ZLIB_DIST)uncompr.o $(ZLIB_DIST)zutil.o
+  zlib_copyright.o adler32.o compress.o crc32.o deflate.o infback.o \
+  inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
 
 DLLNAME = $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX)
 EXPNAME = HYZLIB_0.1
@@ -51,4 +51,4 @@ ifeq ($(HY_OS),zos)
 OPT += -DSTDC
 endif
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zlib/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zlib/windows/makefile?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zlib/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zlib/windows/makefile Sat Oct 30 13:11:14 2010
@@ -17,21 +17,22 @@
 # Makefile for module 'zlib'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\archive\native\zlib\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hyzlib
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 
-ZLIB_DIST=..\..\zlib_dist\# Path to zlib
+OSS_DIST = $(HY_TARGET)\depends\native\zlib_dist\# trailing slash
 
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-  $(SHAREDSUB)zlib_copyright.obj $(ZLIB_DIST)adler32.obj $(ZLIB_DIST)compress.obj \
-  $(ZLIB_DIST)crc32.obj $(ZLIB_DIST)deflate.obj $(ZLIB_DIST)infback.obj \
-  $(ZLIB_DIST)inffast.obj $(ZLIB_DIST)inflate.obj $(ZLIB_DIST)inftrees.obj $(ZLIB_DIST)trees.obj \
-  $(ZLIB_DIST)uncompr.obj $(ZLIB_DIST)zutil.obj
+  $(HY_BIN)zlib_copyright.obj $(HY_BIN)adler32.obj $(HY_BIN)compress.obj \
+  $(HY_BIN)crc32.obj $(HY_BIN)deflate.obj $(HY_BIN)infback.obj \
+  $(HY_BIN)inffast.obj $(HY_BIN)inflate.obj $(HY_BIN)inftrees.obj \
+  $(HY_BIN)trees.obj $(HY_BIN)uncompr.obj $(HY_BIN)zutil.obj
 
 VIRTFILES = $(LIBBASE).res
 DLLBASE=0x11700000

Modified: harmony/enhanced/java/branches/java6/classlib/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/auth/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/auth/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/auth/build.xml Sat Oct 30 13:11:14 2010
@@ -20,10 +20,10 @@
 <project name="AUTH Build" default="build" basedir=".">
     <description>Build for AUTH component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="auth" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
 
@@ -68,7 +68,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -110,7 +110,7 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <copy todir="${tests.resources.hdk.dir}">

Modified: harmony/enhanced/java/branches/java6/classlib/modules/auth/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/auth/make/run-test.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/auth/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/auth/make/run-test.xml Sat Oct 30 13:11:14 2010
@@ -23,7 +23,9 @@
     <property file="../test.properties" />
 
     <property name="work.dir" value=".." />
-    <property name="target.dir" 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" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/unix/makefile?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/unix/makefile Sat Oct 30 13:11:14 2010
@@ -17,13 +17,14 @@
 # Makefile for module 'auth'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/auth/native/auth/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
-BUILDFILES = $(SHAREDSUB)auth_copyright.o authnix.o
+BUILDFILES = auth_copyright.o authnix.o
 
 MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 DLLNAME = $(DLLPATH)libhyauth$(HY_SHLIB_SUFFIX)
 EXPNAME = HYAUTH_0.1
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/windows/makefile?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/windows/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/auth/src/main/native/auth/windows/makefile Sat Oct 30 13:11:14 2010
@@ -17,12 +17,13 @@
 # Makefile for module 'auth'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\auth\native\auth\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hyauth
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
-BUILDFILES = $(SHAREDSUB)auth_copyright.obj authwin32.obj
+BUILDFILES = $(HY_BIN)auth_copyright.obj $(HY_BIN)authwin32.obj
 VIRTFILES = $(LIBBASE).res
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/build.xml Sat Oct 30 13:11:14 2010
@@ -19,10 +19,10 @@
 <project name="AWT Build" default="build" basedir=".">
     <description>Build for AWT component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="awt" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
     <import file="${hy.hdk}/build/ant/depends.xml" />
 
     <property file="../../make/depends.properties" />
@@ -163,7 +163,7 @@ ${line.separator}For Fedora try: yum ins
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -298,15 +298,15 @@ ${line.separator}For Fedora try: yum ins
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_boot_tests.jar">
-            <fileset dir="bin/test/boot">
+            <fileset dir="${hy.build.mod}/test/boot">
                 <exclude name="**/*Headless*Test.class" />
             </fileset>
         </hy.jar.bin>
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test/classes" />
+            <fileset dir="${hy.build.mod}/test/classes" />
         </hy.jar.bin>
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_headless_tests.jar">
-            <fileset dir="bin/test/boot">
+            <fileset dir="${hy.build.mod}/test/boot">
                 <include name="**/*Headless*Test.class" />
             </fileset>
         </hy.jar.bin>
@@ -329,7 +329,7 @@ ${line.separator}For Fedora try: yum ins
 
     <target name="-compile-tests" unless="skip.test.build">
         <compile-tests description="${hy.module} boot tests"
-                       destdir="bin/test/boot">
+                       destdir="${hy.build.mod}/test/boot">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/impl/boot" />
@@ -337,7 +337,7 @@ ${line.separator}For Fedora try: yum ins
             </javac-elements>
         </compile-tests>
         <compile-tests description="${hy.module} tests"
-                       destdir="bin/test/classes">
+                       destdir="${hy.build.mod}/test/classes">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/api/java" />

Modified: harmony/enhanced/java/branches/java6/classlib/modules/awt/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/make/depends.properties?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/make/depends.properties Sat Oct 30 13:11:14 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/java6/classlib/modules/awt/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/awt/make/run-test.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/awt/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/awt/make/run-test.xml Sat Oct 30 13:11:14 2010
@@ -23,7 +23,9 @@
     <property file="../test.properties" />
 
     <property name="work.dir" value=".." />
-    <property name="target.dir" 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" />
     <property name="junit.jar" location="../junit.jar" />
 



Mime
View raw message