Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/.hgtags	Mon Mar 23 17:43:15 2009 -0700
     1.2 +++ b/.hgtags	Mon Mar 23 17:58:32 2009 -0700
     1.3 @@ -25,3 +25,4 @@
     1.4  0be222241fd405e48915647facfaa176621b39b9 jdk7-b48
     1.5  d70978bc64bc7a04be7797ab0dcd9b7b1b3a6bff jdk7-b49
     1.6  0edbd0074b02b42b2b83cc47cb391d4869b7a8ec jdk7-b50
     1.7 +3eb8f1047a7402a9a79937d1c39560e931e91da2 jdk7-b51

     2.1 --- a/make/common/Rules.gmk	Mon Mar 23 17:43:15 2009 -0700
     2.2 +++ b/make/common/Rules.gmk	Mon Mar 23 17:58:32 2009 -0700
     2.3 @@ -191,14 +191,18 @@
     2.4  # Make sure all newer sources are compiled (in a batch)
     2.5  classes : $(CLASSES_INIT) .delete.classlist .compile.classlist
     2.6  
     2.7 +# Use this javac option to force it to favor the sourcepath file classes
     2.8 +#   rather than any bootclasspath classes.
     2.9 +JAVAC_PREFER_SOURCE = -Xprefer:source
    2.10 +
    2.11  .compile.classlist : $(JAVA_SOURCE_LIST)
    2.12  	@$(MKDIR) -p $(CLASSDESTDIR)
    2.13  	@if [ `$(CAT) $(JAVA_SOURCE_LIST) | $(WC) -l` -ge 1 ] ; then \
    2.14  	  $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
    2.15  	  $(CAT) $(JAVA_SOURCE_LIST); \
    2.16  	  $(ECHO) "# Running javac:"; \
    2.17 -	  $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
    2.18 -	  $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
    2.19 +	  $(ECHO) $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
    2.20 +	  $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
    2.21  	fi
    2.22  	@$(java-vm-cleanup)
    2.23  

     3.1 --- a/make/common/shared/Compiler-msvc.gmk	Mon Mar 23 17:43:15 2009 -0700
     3.2 +++ b/make/common/shared/Compiler-msvc.gmk	Mon Mar 23 17:58:32 2009 -0700
     3.3 @@ -128,9 +128,19 @@
     3.4          endif
     3.5        endif
     3.6      endif
     3.7 -    # This will cause problems if ALT_COMPILER_PATH is defined to ""
     3.8 -    # which is a directive to use the PATH.
     3.9 -    REBASE         = $(COMPILER_PATH)../REBASE
    3.10 +    ifeq ($(CC_MAJORVER), 15)
    3.11 +      # This should be: CC_VER=15.00.21022.8 LINK_VER=9.00.21022.8
    3.12 +      REQUIRED_CC_VER = 15.00.21022.8
    3.13 +      REQUIRED_LINK_VER = 9.00.21022.8
    3.14 +      COMPILER_NAME=Windows SDK 6.1 Visual Studio 9
    3.15 +      COMPILER_VERSION=VS2008
    3.16 +      RC = $(MSSDK61)/bin/x64/rc
    3.17 +      REBASE = $(MSSDK61/bin/x64/rebase
    3.18 +    else
    3.19 +      # This will cause problems if ALT_COMPILER_PATH is defined to ""
    3.20 +      # which is a directive to use the PATH.
    3.21 +      REBASE         = $(COMPILER_PATH)../REBASE
    3.22 +    endif
    3.23      ifndef COMPILER_PATH
    3.24        COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
    3.25      endif

     4.1 --- a/make/common/shared/Defs-windows.gmk	Mon Mar 23 17:43:15 2009 -0700
     4.2 +++ b/make/common/shared/Defs-windows.gmk	Mon Mar 23 17:58:32 2009 -0700
     4.3 @@ -282,13 +282,27 @@
     4.4  
     4.5  # Compilers for 64bit are from SDK
     4.6  ifeq ($(ARCH_DATA_MODEL), 64)
     4.7 -  ifneq ($(_ms_sdk),)
     4.8 +  xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/"
     4.9 +  MSSDK61 :=$(call FullPath,$(xMSSDK61))
    4.10 +  xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/"
    4.11 +  _vs2008 :=$(call FullPath,$(xVS2008))
    4.12 +  ifneq ($(_vs2008),)
    4.13      ifeq ($(ARCH), ia64)
    4.14 -      _compiler_bin :=$(_ms_sdk)/Bin/Win64
    4.15 +      _compiler_bin :=$(_vs2008)/VC/Bin/x86_ia64
    4.16      endif
    4.17      ifeq ($(ARCH), amd64)
    4.18 -      _compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH)
    4.19 -      _redist_sdk   :=$(_ms_sdk)/redist/win64/AMD64
    4.20 +      _compiler_bin :=$(_vs2008)/VC/Bin/$(ARCH)
    4.21 +      _redist_sdk   :=$(MSSDK61)/VC/redist
    4.22 +    endif
    4.23 +  else
    4.24 +    ifneq ($(_ms_sdk),)
    4.25 +      ifeq ($(ARCH), ia64)
    4.26 +        _compiler_bin :=$(_ms_sdk)/Bin/Win64
    4.27 +      endif
    4.28 +      ifeq ($(ARCH), amd64)
    4.29 +        _compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH)
    4.30 +        _redist_sdk   :=$(_ms_sdk)/redist/win64/AMD64
    4.31 +      endif
    4.32      endif
    4.33    endif
    4.34  endif

     5.1 --- a/src/windows/resource/version.rc	Mon Mar 23 17:43:15 2009 -0700
     5.2 +++ b/src/windows/resource/version.rc	Mon Mar 23 17:58:32 2009 -0700
     5.3 @@ -23,7 +23,7 @@
     5.4  // have any questions.
     5.5  //
     5.6  
     5.7 -#include "afxres.h"
     5.8 +#include "windows.h"
     5.9  
    5.10  // Need 2 defines so macro argument to XSTR will get expanded before quoting.
    5.11  #define XSTR(x) STR(x)