Merge

Tue, 30 Oct 2012 23:26:21 -0700

author
lana
date
Tue, 30 Oct 2012 23:26:21 -0700
changeset 417
aac74d377a03
parent 416
643e7612cf6d
parent 412
9094cd4a614f
child 418
54d599a5b4aa

Merge

     1.1 --- a/.hgtags	Mon Oct 29 14:10:49 2012 +0100
     1.2 +++ b/.hgtags	Tue Oct 30 23:26:21 2012 -0700
     1.3 @@ -182,3 +182,5 @@
     1.4  18462a19f7bd66d38015f61ea549a5e0c0c889a3 jdk8-b58
     1.5  d54dc53e223ed9ce7d5f4d2cd02ad9d5def3c2db jdk8-b59
     1.6  207ef43ba69ead6cbbab415d81834545e4d46747 jdk8-b60
     1.7 +0e08ba7648fb3faa0986cb217887d7c4990977f3 jdk8-b61
     1.8 +08afb9c6f44f11c3595b01fd0985db64b29834dd jdk8-b62
     2.1 --- a/make/common/shared/Defs-utils.gmk	Mon Oct 29 14:10:49 2012 +0100
     2.2 +++ b/make/common/shared/Defs-utils.gmk	Tue Oct 30 23:26:21 2012 -0700
     2.3 @@ -151,16 +151,26 @@
     2.4  ifeq ($(PLATFORM),windows)
     2.5    ifdef USING_CYGWIN
     2.6      # Intrinsic unix command, with backslash-escaped character interpretation
     2.7 -    ECHO = $(UNIXCOMMAND_PATH)echo -e
     2.8 -    ZIPEXE = $(UNIXCOMMAND_PATH)zip
     2.9 -    UNZIP  = $(UNIXCOMMAND_PATH)unzip
    2.10 +    ECHO     = $(UNIXCOMMAND_PATH)echo -e
    2.11 +    ZIPEXE   = $(UNIXCOMMAND_PATH)zip
    2.12 +    UNZIP    = $(UNIXCOMMAND_PATH)unzip
    2.13 +    # Some CYGWIN nawk versions require BINMODE=w for proper '\r' interpretation
    2.14 +    NAWK     = $(UNIXCOMMAND_PATH)awk -v BINMODE=w
    2.15    else
    2.16 -    ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
    2.17 -    UNZIP  = $(UTILS_DEVTOOL_PATH)unzip
    2.18 +    ifdef USING_MSYS
    2.19 +      ECHO   = $(UTILS_COMMAND_PATH)echo -e
    2.20 +      ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
    2.21 +      UNZIP  = $(UTILS_DEVTOOL_PATH)unzip
    2.22 +      NAWK   = $(UNIXCOMMAND_PATH)awk
    2.23 +    else
    2.24 +      ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
    2.25 +      UNZIP  = $(UTILS_DEVTOOL_PATH)unzip
    2.26 +      NAWK   = $(UNIXCOMMAND_PATH)awk
    2.27 +    endif
    2.28    endif
    2.29    # Re-define some utilities
    2.30    LEX            =# override GNU Make intrinsic: no lex on windows
    2.31 -  NAWK           = $(UNIXCOMMAND_PATH)awk
    2.32 +  SHA1SUM        = $(UNIXCOMMAND_PATH)openssl sha1
    2.33  endif
    2.34  
    2.35  # Linux specific
     3.1 --- a/make/common/shared/Defs-windows.gmk	Mon Oct 29 14:10:49 2012 +0100
     3.2 +++ b/make/common/shared/Defs-windows.gmk	Tue Oct 30 23:26:21 2012 -0700
     3.3 @@ -91,6 +91,15 @@
     3.4  $(shell if [ "$1" != "" -a -d "$1" ]; then $(CYGPATH_CMD) "$1"; else echo "$1"; fi)
     3.5  endef
     3.6  else
     3.7 +ifdef USING_MSYS
     3.8 +DOSPATH_CMD:=$(shell cd $(JDK_TOPDIR) 2> $(DEV_NULL) && pwd)/make/tools/msys_build_scripts/dospath.sh
     3.9 +define FullPath
    3.10 +$(subst \,/,$(shell $(DOSPATH_CMD) $1))
    3.11 +endef
    3.12 +define OptFullPath
    3.13 +$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
    3.14 +endef
    3.15 +else
    3.16  # Temporary until we upgrade to MKS 8.7, MKS pwd returns mixed mode path
    3.17  define FullPath
    3.18  $(shell cd $1 2> $(DEV_NULL) && pwd)
    3.19 @@ -99,6 +108,7 @@
    3.20  $(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
    3.21  endef
    3.22  endif
    3.23 +endif
    3.24  
    3.25  # System drive
    3.26  ifdef SYSTEMDRIVE
    3.27 @@ -112,14 +122,21 @@
    3.28  
    3.29  # UNIXCOMMAND_PATH: path to where the most common Unix commands are.
    3.30  #  NOTE: Must end with / so that it could be empty, allowing PATH usage.
    3.31 -ifndef UNIXCOMMAND_PATH
    3.32 -  ifdef ALT_UNIXCOMMAND_PATH
    3.33 +#        With cygwin, use this as is; don't use FullPath on it.
    3.34 +ifdef ALT_UNIXCOMMAND_PATH
    3.35 +  ifdef USING_CYGWIN
    3.36 +    UNIXCOMMAND_PATH       :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
    3.37 +  else
    3.38      xALT_UNIXCOMMAND_PATH  :="$(subst \,/,$(ALT_UNIXCOMMAND_PATH))"
    3.39      fxALT_UNIXCOMMAND_PATH :=$(call FullPath,$(xALT_UNIXCOMMAND_PATH))
    3.40      UNIXCOMMAND_PATH       :=$(call PrefixPath,$(fxALT_UNIXCOMMAND_PATH))
    3.41 +  endif
    3.42 +else
    3.43 +  ifdef USING_CYGWIN
    3.44 +    UNIXCOMMAND_PATH :=$(call PrefixPath,/usr/bin)
    3.45    else
    3.46 -    ifdef USING_CYGWIN
    3.47 -      UNIXCOMMAND_PATH :=$(call PrefixPath,/usr/bin)
    3.48 +    ifdef USING_MSYS
    3.49 +      UNIXCOMMAND_PATH :=$(call PrefixPath,/bin)
    3.50      else
    3.51        ifdef ROOTDIR
    3.52          xROOTDIR :="$(subst \,/,$(ROOTDIR))"
    3.53 @@ -131,41 +148,35 @@
    3.54        ifneq ($(_rootdir),)
    3.55          UNIXCOMMAND_PATH :=$(call PrefixPath,$(_rootdir)/mksnt)
    3.56        endif
    3.57 -    endif
    3.58 -  endif
    3.59 -  UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH)
    3.60 -  export UNIXCOMMAND_PATH
    3.61 +    endif # USING_MSYS
    3.62 +  endif # USING_CYGWIN
    3.63  endif
    3.64 +UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH)
    3.65 +export UNIXCOMMAND_PATH
    3.66  
    3.67  # Get version of MKS or CYGWIN
    3.68 -ifdef USING_CYGWIN
    3.69 -  ifndef CYGWIN_VER
    3.70 -    _CYGWIN_VER :=$(shell $(UNAME))
    3.71 -    CYGWIN_VER  :=$(call GetVersion,$(_CYGWIN_VER))
    3.72 -    export CYGWIN_VER
    3.73 +ifdef USING_MKS
    3.74 +  _MKS_VER :=$(shell $(MKSINFO) 2>&1 | $(GREP) Release | $(TAIL) -1 | $(SED) -e 's@.*\(Release.*\)@\1@')
    3.75 +  MKS_VER  :=$(call GetVersion,$(_MKS_VER))
    3.76 +  # At this point, we can re-define FullPath to use DOSNAME_CMD
    3.77 +  CHECK_MKS87:=$(call CheckVersions,$(MKS_VER),8.7)
    3.78 +  TRY_DOSNAME:=false
    3.79 +  ifeq ($(CHECK_MKS87),same)
    3.80 +    TRY_DOSNAME:=true
    3.81    endif
    3.82 -else # MKS
    3.83 -_MKS_VER :=$(shell $(MKSINFO) 2>&1 | $(GREP) Release | $(TAIL) -1 | $(SED) -e 's@.*\(Release.*\)@\1@')
    3.84 -MKS_VER  :=$(call GetVersion,$(_MKS_VER))
    3.85 -# At this point, we can re-define FullPath to use DOSNAME_CMD
    3.86 -CHECK_MKS87:=$(call CheckVersions,$(MKS_VER),8.7)
    3.87 -TRY_DOSNAME:=false
    3.88 -ifeq ($(CHECK_MKS87),same)
    3.89 -TRY_DOSNAME:=true
    3.90 -endif
    3.91 -# Newer should be ok
    3.92 -ifeq ($(CHECK_MKS87),newer)
    3.93 -TRY_DOSNAME:=true
    3.94 -endif
    3.95 -ifeq ($(TRY_DOSNAME),true)
    3.96 -ifeq ($(shell $(UNIXCOMMAND_PATH)dosname -s $(_system_drive)/ 2> $(DEV_NULL)),$(_system_drive)/)
    3.97 -_DOSNAME=$(UNIXCOMMAND_PATH)dosname
    3.98 -DOSNAME_CMD:=$(_DOSNAME) -s
    3.99 +  # Newer should be ok
   3.100 +  ifeq ($(CHECK_MKS87),newer)
   3.101 +    TRY_DOSNAME:=true
   3.102 +  endif
   3.103 +  ifeq ($(TRY_DOSNAME),true)
   3.104 +    ifeq ($(shell $(UNIXCOMMAND_PATH)dosname -s $(_system_drive)/ 2> $(DEV_NULL)),$(_system_drive)/)
   3.105 +      _DOSNAME=$(UNIXCOMMAND_PATH)dosname
   3.106 +      DOSNAME_CMD:=$(_DOSNAME) -s
   3.107  define FullPath
   3.108  $(subst //,/,$(shell echo $1 | $(DOSNAME_CMD) 2> $(DEV_NULL)))
   3.109  endef
   3.110 -endif # test dosname -s
   3.111 -endif # TRY_DOSNAME
   3.112 +    endif # test dosname -s
   3.113 +  endif # TRY_DOSNAME
   3.114  endif # MKS
   3.115  
   3.116  # We try to get references to what we need via the default component
   3.117 @@ -240,6 +251,8 @@
   3.118  # DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
   3.119  #  NOTE: Must end with / so that it could be empty, allowing PATH usage.
   3.120  ifndef DEVTOOLS_PATH
   3.121 +  # DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
   3.122 +  #  NOTE: Must end with / so that it could be empty, allowing PATH usage.
   3.123    ifdef ALT_DEVTOOLS_PATH
   3.124      xALT_DEVTOOLS_PATH  :="$(subst \,/,$(ALT_DEVTOOLS_PATH))"
   3.125      fxALT_DEVTOOLS_PATH :=$(call FullPath,$(xALT_DEVTOOLS_PATH))
   3.126 @@ -248,10 +261,14 @@
   3.127      ifdef USING_CYGWIN
   3.128        DEVTOOLS_PATH :=$(UNIXCOMMAND_PATH)
   3.129      else
   3.130 -      xDEVTOOLS_PATH  :="$(_system_drive)/utils"
   3.131 -      fxDEVTOOLS_PATH :=$(call FullPath,$(xDEVTOOLS_PATH))
   3.132 -      DEVTOOLS_PATH  :=$(call PrefixPath,$(fxDEVTOOLS_PATH))
   3.133 -    endif
   3.134 +      ifdef USING_MSYS
   3.135 +        DEVTOOLS_PATH :=$(UNIXCOMMAND_PATH)
   3.136 +      else
   3.137 +        xDEVTOOLS_PATH  :="$(_system_drive)/utils"
   3.138 +        fxDEVTOOLS_PATH :=$(call FullPath,$(xDEVTOOLS_PATH))
   3.139 +        DEVTOOLS_PATH  :=$(call PrefixPath,$(fxDEVTOOLS_PATH))
   3.140 +      endif # USING_MSYS
   3.141 +    endif # USING_CYGWIN
   3.142    endif
   3.143    DEVTOOLS_PATH:=$(call AltCheckSpaces,DEVTOOLS_PATH)
   3.144    export DEVTOOLS_PATH
     4.1 --- a/make/common/shared/Platform.gmk	Mon Oct 29 14:10:49 2012 +0100
     4.2 +++ b/make/common/shared/Platform.gmk	Tue Oct 30 23:26:21 2012 -0700
     4.3 @@ -65,6 +65,8 @@
     4.4  #     REQUIRED_WINDOWS_NAME       windows only: basic name of windows
     4.5  #     REQUIRED_WINDOWS_VERSION    windows only: specific version of windows
     4.6  #     USING_CYGWIN                windows only: true or false
     4.7 +#     USING_MSYS                  windows only: true or false
     4.8 +#     USING_MKS                   windows only: true or false
     4.9  #     WINDOWS_NT_VERSION_STRING   windows only: long version name
    4.10  #     REQUIRED_OS_VERSION         required OS version, e.g. 5.10, 2.4
    4.11  #     REQUIRED_FREE_SPACE         minimum disk space needed for outputdir
    4.12 @@ -327,6 +329,8 @@
    4.13  # Windows with and without CYGWIN will be slightly different
    4.14  ifeq ($(SYSTEM_UNAME), Windows_NT)
    4.15    PLATFORM = windows
    4.16 +  USING_MKS = true
    4.17 +  export USING_MKS
    4.18    OS_VERSION := $(shell uname -r)
    4.19    WINDOWS_NT_VERSION_STRING=Windows_NT
    4.20    REQUIRED_MKS_VER=6.1
    4.21 @@ -339,6 +343,11 @@
    4.22    WINDOWS_NT_VERSION_STRING=CYGWIN_NT
    4.23    REQUIRED_CYGWIN_VER=4.0
    4.24  endif
    4.25 +ifneq (,$(findstring MINGW,$(SYSTEM_UNAME)))
    4.26 +  PLATFORM = windows
    4.27 +  USING_MSYS = true
    4.28 +  export USING_MSYS
    4.29 +endif
    4.30  
    4.31  # Platform settings specific to Windows
    4.32  ifeq ($(PLATFORM), windows)

mercurial