harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r941416 - in /harmony/enhanced/java/branches/mrh: ./ classlib/ classlib/make/properties.xml classlib/modules/archive/src/main/native/zlib/windows/makefile common_resources/ drlvm/
Date Wed, 05 May 2010 18:31:09 GMT
Author: hindessm
Date: Wed May  5 18:31:09 2010
New Revision: 941416

URL: http://svn.apache.org/viewvc?rev=941416&view=rev
Log:
Merging from trunk@940795.

Modified:
    harmony/enhanced/java/branches/mrh/   (props changed)
    harmony/enhanced/java/branches/mrh/classlib/   (props changed)
    harmony/enhanced/java/branches/mrh/classlib/make/properties.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zlib/windows/makefile
    harmony/enhanced/java/branches/mrh/common_resources/   (props changed)
    harmony/enhanced/java/branches/mrh/drlvm/   (props changed)

Propchange: harmony/enhanced/java/branches/mrh/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 18:31:09 2010
@@ -1 +1 @@
-/harmony/enhanced/java/trunk:935751-939820
+/harmony/enhanced/java/trunk:935751-940795

Propchange: harmony/enhanced/java/branches/mrh/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 18:31:09 2010
@@ -1,2 +1,2 @@
 /harmony/enhanced/classlib/trunk:926318-926838
-/harmony/enhanced/java/trunk/classlib:935751-939820
+/harmony/enhanced/java/trunk/classlib:935751-940795

Modified: harmony/enhanced/java/branches/mrh/classlib/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/make/properties.xml?rev=941416&r1=941415&r2=941416&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/make/properties.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/make/properties.xml Wed May  5 18:31:09 2010
@@ -285,6 +285,10 @@
     
     <!-- default property for poll-modules macro - i.e. all modules -->
     <property name="build.module" value="*" />
+    <condition property="exclude.module"
+            value="accessibility,applet,awt,imageio,orb,print,rmi,sound,swing">
+        <istrue value="${hy.select}" />
+    </condition>
     <property name="exclude.module" value="nothing" />
     <property name="build.java" value="true" />
     <property name="build.native" value="true" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zlib/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zlib/windows/makefile?rev=941416&r1=941415&r2=941416&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zlib/windows/makefile
(original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zlib/windows/makefile
Wed May  5 18:31:09 2010
@@ -29,7 +29,7 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE)
 
 BUILDFILES = \
   $(SHAREDSUB)zlib_copyright.obj $(ZLIB_DIST)adler32.obj $(ZLIB_DIST)compress.obj \
-  $(ZLIB_DIST)crc32.obj $(ZLIB_DIST)deflate.obj $(ZLIB_DIST)gzio.obj $(ZLIB_DIST)infback.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
 

Propchange: harmony/enhanced/java/branches/mrh/common_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 18:31:09 2010
@@ -1,3 +1,3 @@
-/harmony/enhanced/java/trunk/common_resources:935751-939820
+/harmony/enhanced/java/trunk/common_resources:935751-940795
 /harmony/enhanced/trunk/common_resources:476396-920147
 /incubator/harmony/enhanced/trunk/common_resources:423974-476394

Propchange: harmony/enhanced/java/branches/mrh/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 18:31:09 2010
@@ -1,3 +1,3 @@
-/harmony/enhanced/java/trunk/drlvm:935751-939820
+/harmony/enhanced/java/trunk/drlvm:935751-940795
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/working_vm:423974-476394



Mime
View raw message