harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r998416 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/build/rules.mak classlib/depends/libs/ drlvm/ jdktools/
Date Sat, 18 Sep 2010 06:35:11 GMT
Author: hindessm
Date: Sat Sep 18 06:35:11 2010
New Revision: 998416

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

  r998010 | regisxu | 2010-09-17 08:39:40 +0100 (Fri, 17 Sep 2010) | 4 lines
  
  Don't create manifest files on Windows by default
  
  See http://markmail.org/thread/4fhcnofc5vn462zl, we could not get any benefits
  from embeded manifest, so disable it.


Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/depends/build/rules.mak
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 18 06:35:11 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986
+/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 18 06:35:11 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
+/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010
 /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/depends/build/rules.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/depends/build/rules.mak?rev=998416&r1=998415&r2=998416&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/depends/build/rules.mak (original)
+++ harmony/enhanced/java/branches/java6/classlib/depends/build/rules.mak Sat Sep 18 06:35:11
2010
@@ -51,7 +51,7 @@ $(DLLNAME): $(LIBNAME)
 	-entry:_DllMainCRTStartup$(DLLENTRY) -dll /BASE:$(DLLBASE) -machine:$(CPU) \
 	-subsystem:windows -out:$@ \
 	-map:$(LIBPATH)$(*F).map -pdb:$(DBGPATH)$(*F).pdb \
-        -manifestfile:$(LIBPATH)$(*F).manifest \
+	-manifest:no \
 	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES) \
 	kernel32.lib  msvcrt.lib ws2_32.lib advapi32.lib user32.lib gdi32.lib \
 	comdlg32.lib winspool.lib  $(LIBPATH)$(*F).exp
@@ -65,7 +65,7 @@ $(EXENAME): $(BUILDFILES) $(VIRTFILES) $
 	-mkdir $(DBGPATH)
 	link /NOLOGO $(EXEFLAGS) /debug /opt:icf /opt:ref $(VMLINK) \
 	-out:$(EXENAME) -pdb:$(DBGPATH)$(*F).pdb \
-        -manifestfile:$(LIBPATH)$(*F).manifest \
+	-manifest:no \
 	-machine:$(CPU) setargv.obj  \
 	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(EXEDLLFILES)
 	if exist $(LIBPATH)$(*F).manifest \

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 18 06:35:11 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
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 18 06:35:11 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986
+/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010
 /harmony/enhanced/trunk/drlvm:476395-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/drlvm:292550-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 18 06:35:11 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986
+/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147



Mime
View raw message