Mercurial > hg > release > icedtea7-forest-2.1 > corba
changeset 60:61116c9789b9
Merge
author | tbell |
---|---|
date | Mon, 23 Mar 2009 17:58:32 -0700 |
parents | 126389a38e7d (current diff) bec82237d694 (diff) |
children | 3c4d73194f6f |
files | |
diffstat | 5 files changed, 39 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Mar 23 17:43:15 2009 -0700 +++ b/.hgtags Mon Mar 23 17:58:32 2009 -0700 @@ -25,3 +25,4 @@ 0be222241fd405e48915647facfaa176621b39b9 jdk7-b48 d70978bc64bc7a04be7797ab0dcd9b7b1b3a6bff jdk7-b49 0edbd0074b02b42b2b83cc47cb391d4869b7a8ec jdk7-b50 +3eb8f1047a7402a9a79937d1c39560e931e91da2 jdk7-b51
--- a/make/common/Rules.gmk Mon Mar 23 17:43:15 2009 -0700 +++ b/make/common/Rules.gmk Mon Mar 23 17:58:32 2009 -0700 @@ -191,14 +191,18 @@ # Make sure all newer sources are compiled (in a batch) classes : $(CLASSES_INIT) .delete.classlist .compile.classlist +# Use this javac option to force it to favor the sourcepath file classes +# rather than any bootclasspath classes. +JAVAC_PREFER_SOURCE = -Xprefer:source + .compile.classlist : $(JAVA_SOURCE_LIST) @$(MKDIR) -p $(CLASSDESTDIR) @if [ `$(CAT) $(JAVA_SOURCE_LIST) | $(WC) -l` -ge 1 ] ; then \ $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \ $(CAT) $(JAVA_SOURCE_LIST); \ $(ECHO) "# Running javac:"; \ - $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ - $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ + $(ECHO) $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ + $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ fi @$(java-vm-cleanup)
--- a/make/common/shared/Compiler-msvc.gmk Mon Mar 23 17:43:15 2009 -0700 +++ b/make/common/shared/Compiler-msvc.gmk Mon Mar 23 17:58:32 2009 -0700 @@ -128,9 +128,19 @@ endif endif endif - # This will cause problems if ALT_COMPILER_PATH is defined to "" - # which is a directive to use the PATH. - REBASE = $(COMPILER_PATH)../REBASE + ifeq ($(CC_MAJORVER), 15) + # This should be: CC_VER=15.00.21022.8 LINK_VER=9.00.21022.8 + REQUIRED_CC_VER = 15.00.21022.8 + REQUIRED_LINK_VER = 9.00.21022.8 + COMPILER_NAME=Windows SDK 6.1 Visual Studio 9 + COMPILER_VERSION=VS2008 + RC = $(MSSDK61)/bin/x64/rc + REBASE = $(MSSDK61/bin/x64/rebase + else + # This will cause problems if ALT_COMPILER_PATH is defined to "" + # which is a directive to use the PATH. + REBASE = $(COMPILER_PATH)../REBASE + endif ifndef COMPILER_PATH COMPILER_PATH := $(error COMPILER_PATH cannot be empty here) endif
--- a/make/common/shared/Defs-windows.gmk Mon Mar 23 17:43:15 2009 -0700 +++ b/make/common/shared/Defs-windows.gmk Mon Mar 23 17:58:32 2009 -0700 @@ -282,13 +282,27 @@ # Compilers for 64bit are from SDK ifeq ($(ARCH_DATA_MODEL), 64) - ifneq ($(_ms_sdk),) + xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/" + MSSDK61 :=$(call FullPath,$(xMSSDK61)) + xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/" + _vs2008 :=$(call FullPath,$(xVS2008)) + ifneq ($(_vs2008),) ifeq ($(ARCH), ia64) - _compiler_bin :=$(_ms_sdk)/Bin/Win64 + _compiler_bin :=$(_vs2008)/VC/Bin/x86_ia64 endif ifeq ($(ARCH), amd64) - _compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH) - _redist_sdk :=$(_ms_sdk)/redist/win64/AMD64 + _compiler_bin :=$(_vs2008)/VC/Bin/$(ARCH) + _redist_sdk :=$(MSSDK61)/VC/redist + endif + else + ifneq ($(_ms_sdk),) + ifeq ($(ARCH), ia64) + _compiler_bin :=$(_ms_sdk)/Bin/Win64 + endif + ifeq ($(ARCH), amd64) + _compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH) + _redist_sdk :=$(_ms_sdk)/redist/win64/AMD64 + endif endif endif endif
--- a/src/windows/resource/version.rc Mon Mar 23 17:43:15 2009 -0700 +++ b/src/windows/resource/version.rc Mon Mar 23 17:58:32 2009 -0700 @@ -23,7 +23,7 @@ // have any questions. // -#include "afxres.h" +#include "windows.h" // Need 2 defines so macro argument to XSTR will get expanded before quoting. #define XSTR(x) STR(x)