1.1 --- a/make/common/shared/Defs-windows.gmk Tue Sep 01 23:44:41 2009 +0100
1.2 +++ b/make/common/shared/Defs-windows.gmk Wed Sep 02 09:20:17 2009 -0700
1.3 @@ -113,32 +113,38 @@
1.4
1.5 # UNIXCOMMAND_PATH: path to where the most common Unix commands are.
1.6 # NOTE: Must end with / so that it could be empty, allowing PATH usage.
1.7 -ifdef ALT_UNIXCOMMAND_PATH
1.8 - xALT_UNIXCOMMAND_PATH :="$(subst \,/,$(ALT_UNIXCOMMAND_PATH))"
1.9 - fxALT_UNIXCOMMAND_PATH :=$(call FullPath,$(xALT_UNIXCOMMAND_PATH))
1.10 - UNIXCOMMAND_PATH :=$(call PrefixPath,$(fxALT_UNIXCOMMAND_PATH))
1.11 -else
1.12 - ifdef USING_CYGWIN
1.13 - UNIXCOMMAND_PATH :=$(call PrefixPath,/usr/bin)
1.14 +ifndef UNIXCOMMAND_PATH
1.15 + ifdef ALT_UNIXCOMMAND_PATH
1.16 + xALT_UNIXCOMMAND_PATH :="$(subst \,/,$(ALT_UNIXCOMMAND_PATH))"
1.17 + fxALT_UNIXCOMMAND_PATH :=$(call FullPath,$(xALT_UNIXCOMMAND_PATH))
1.18 + UNIXCOMMAND_PATH :=$(call PrefixPath,$(fxALT_UNIXCOMMAND_PATH))
1.19 else
1.20 - ifdef ROOTDIR
1.21 - xROOTDIR :="$(subst \,/,$(ROOTDIR))"
1.22 - _rootdir :=$(call FullPath,$(xROOTDIR))
1.23 + ifdef USING_CYGWIN
1.24 + UNIXCOMMAND_PATH :=$(call PrefixPath,/usr/bin)
1.25 else
1.26 - xROOTDIR :="$(_system_drive)/mksnt"
1.27 - _rootdir :=$(call FullPath,$(xROOTDIR))
1.28 - endif
1.29 - ifneq ($(_rootdir),)
1.30 - UNIXCOMMAND_PATH :=$(call PrefixPath,$(_rootdir)/mksnt)
1.31 + ifdef ROOTDIR
1.32 + xROOTDIR :="$(subst \,/,$(ROOTDIR))"
1.33 + _rootdir :=$(call FullPath,$(xROOTDIR))
1.34 + else
1.35 + xROOTDIR :="$(_system_drive)/mksnt"
1.36 + _rootdir :=$(call FullPath,$(xROOTDIR))
1.37 + endif
1.38 + ifneq ($(_rootdir),)
1.39 + UNIXCOMMAND_PATH :=$(call PrefixPath,$(_rootdir)/mksnt)
1.40 + endif
1.41 endif
1.42 endif
1.43 + UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH)
1.44 + export UNIXCOMMAND_PATH
1.45 endif
1.46 -UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH)
1.47
1.48 # Get version of MKS or CYGWIN
1.49 ifdef USING_CYGWIN
1.50 -_CYGWIN_VER :=$(shell $(UNAME))
1.51 -CYGWIN_VER :=$(call GetVersion,$(_CYGWIN_VER))
1.52 + ifndef CYGWIN_VER
1.53 + _CYGWIN_VER :=$(shell $(UNAME))
1.54 + CYGWIN_VER :=$(call GetVersion,$(_CYGWIN_VER))
1.55 + export CYGWIN_VER
1.56 + endif
1.57 else # MKS
1.58 _MKS_VER :=$(shell $(MKSINFO) 2>&1 | $(GREP) Release | $(TAIL) -1 | $(SED) -e 's@.*\(Release.*\)@\1@')
1.59 MKS_VER :=$(call GetVersion,$(_MKS_VER))
1.60 @@ -168,235 +174,234 @@
1.61
1.62 # Process Windows values into FullPath values, these paths may have \ chars
1.63
1.64 -# System root
1.65 -ifdef SYSTEMROOT
1.66 - xSYSTEMROOT :="$(subst \,/,$(SYSTEMROOT))"
1.67 - _system_root :=$(call FullPath,$(xSYSTEMROOT))
1.68 -else
1.69 - ifdef SystemRoot
1.70 - xSYSTEMROOT :="$(subst \,/,$(SystemRoot))"
1.71 - _system_root :=$(call FullPath,$(xSYSTEMROOT))
1.72 +# Program Files directory
1.73 +ifndef SHORTPROGRAMFILES
1.74 + ifdef PROGRAMFILES
1.75 + xPROGRAMFILES :="$(subst \,/,$(PROGRAMFILES))"
1.76 else
1.77 - ifdef WINDIR
1.78 - xWINDIR :="$(subst \,/,$(WINDIR))"
1.79 - _system_root :=$(call FullPath,$(xWINDIR))
1.80 + ifeq ($(ARCH_DATA_MODEL), 32)
1.81 + xPROGRAMFILES :="$(_system_drive)/Program Files"
1.82 else
1.83 - ifdef windir
1.84 - xWINDIR :="$(subst \,/,$(windir))"
1.85 - _system_root :=$(call FullPath,$(xWINDIR))
1.86 - endif
1.87 + xPROGRAMFILES :="$(_system_drive)/Program Files (x86)"
1.88 endif
1.89 endif
1.90 -endif
1.91 -_system_root:=$(call CheckValue,_system_root,$(_system_drive)/WINNT)
1.92 -
1.93 -# Program Files directory
1.94 -ifdef PROGRAMFILES
1.95 - xPROGRAMFILES :="$(subst \,/,$(PROGRAMFILES))"
1.96 -else
1.97 ifeq ($(ARCH_DATA_MODEL), 32)
1.98 - xPROGRAMFILES :="$(_system_drive)/Program Files"
1.99 + SHORTPROGRAMFILES :=$(call FullPath,$(xPROGRAMFILES))
1.100 else
1.101 - xPROGRAMFILES :="$(_system_drive)/Program Files (x86)"
1.102 + ifdef PROGRAMW6432
1.103 + xPROGRAMW6432 :="$(subst \,/,$(PROGRAMW6432))"
1.104 + else
1.105 + xPROGRAMW6432 :="$(_system_drive)/Program Files"
1.106 + endif
1.107 + SHORTPROGRAMFILES :=$(call FullPath,$(xPROGRAMW6432))
1.108 endif
1.109 -endif
1.110 -ifeq ($(ARCH_DATA_MODEL), 32)
1.111 - _program_files :=$(call FullPath,$(xPROGRAMFILES))
1.112 -else
1.113 - ifdef PROGRAMW6432
1.114 - xPROGRAMW6432 :="$(subst \,/,$(PROGRAMW6432))"
1.115 - else
1.116 - xPROGRAMW6432 :="$(_system_drive)/Program Files"
1.117 + ifneq ($(word 1,$(SHORTPROGRAMFILES)),$(SHORTPROGRAMFILES))
1.118 + SHORTPROGRAMFILES :=
1.119 endif
1.120 - _program_files :=$(call FullPath,$(xPROGRAMW6432))
1.121 - _program_files32 :=$(call FullPath,$(xPROGRAMFILES))
1.122 - ifneq ($(word 1,$(_program_files32)),$(_program_files32))
1.123 - _program_files32:=
1.124 - endif
1.125 -endif
1.126 -ifneq ($(word 1,$(_program_files)),$(_program_files))
1.127 - _program_files:=
1.128 + export SHORTPROGRAMFILES
1.129 endif
1.130
1.131 # Compilers, SDK, and Visual Studio (MSDEV) [32bit is different from 64bit]
1.132 ifeq ($(ARCH_DATA_MODEL), 32)
1.133 - # Try looking in MSVCDIR or MSVCDir area first (set by vcvars32.bat)
1.134 - ifdef MSVCDIR
1.135 - xMSVCDIR :="$(subst \,/,$(MSVCDIR))"
1.136 - _msvc_dir :=$(call FullPath,$(xMSVCDIR))
1.137 - else
1.138 - ifdef MSVCDir
1.139 - xMSVCDIR :="$(subst \,/,$(MSVCDir))"
1.140 - _msvc_dir :=$(call FullPath,$(xMSVCDIR))
1.141 + ifndef SHORTMSVCDIR
1.142 + # Try looking in MSVCDIR or MSVCDir area first (set by vcvars32.bat)
1.143 + ifdef MSVCDIR
1.144 + xMSVCDIR :="$(subst \,/,$(MSVCDIR))"
1.145 + SHORTMSVCDIR :=$(call FullPath,$(xMSVCDIR))
1.146 else
1.147 - ifneq ($(_program_files),)
1.148 - xMSVCDIR :="$(_program_files)/Microsoft Visual Studio .NET 2003/Vc7"
1.149 - _msvc_dir :=$(call FullPath,$(xMSVCDIR))
1.150 + ifdef MSVCDir
1.151 + xMSVCDIR :="$(subst \,/,$(MSVCDir))"
1.152 + SHORTMSVCDIR :=$(call FullPath,$(xMSVCDIR))
1.153 + else
1.154 + ifneq ($(SHORTPROGRAMFILES),)
1.155 + xMSVCDIR :="$(SHORTPROGRAMFILES)/Microsoft Visual Studio .NET 2003/Vc7"
1.156 + SHORTMSVCDIR :=$(call FullPath,$(xMSVCDIR))
1.157 + endif
1.158 endif
1.159 endif
1.160 + ifneq ($(subst MSDev98,OLDOLDOLD,$(SHORTMSVCDIR)),$(SHORTMSVCDIR))
1.161 + SHORTMSVCDIR :=
1.162 + endif
1.163 + # If we still don't have it, look for VS71COMNTOOLS, setup by installer?
1.164 + ifeq ($(SHORTMSVCDIR),)
1.165 + ifdef VS71COMNTOOLS # /Common/Tools directory, use ../../Vc7
1.166 + xVS71COMNTOOLS :="$(subst \,/,$(VS71COMNTOOLS))"
1.167 + _vs71tools :=$(call FullPath,$(xVS71COMNTOOLS))
1.168 + endif
1.169 + ifneq ($(_vs71tools),)
1.170 + SHORTMSVCDIR :=$(_vs71tools)/../../Vc7
1.171 + endif
1.172 + endif
1.173 + export SHORTMSVCDIR
1.174 endif
1.175 - ifneq ($(subst MSDev98,OLDOLDOLD,$(_msvc_dir)),$(_msvc_dir))
1.176 - _msvc_dir :=
1.177 - endif
1.178 - # If we still don't have it, look for VS71COMNTOOLS, setup by installer?
1.179 - ifeq ($(_msvc_dir),)
1.180 - ifdef VS71COMNTOOLS # /Common/Tools directory, use ../../Vc7
1.181 - xVS71COMNTOOLS :="$(subst \,/,$(VS71COMNTOOLS))"
1.182 - _vs71tools :=$(call FullPath,$(xVS71COMNTOOLS))
1.183 - endif
1.184 - ifneq ($(_vs71tools),)
1.185 - _msvc_dir :=$(_vs71tools)/../../Vc7
1.186 - endif
1.187 - endif
1.188 - ifneq ($(_msvc_dir),)
1.189 - _compiler_bin :=$(_msvc_dir)/Bin
1.190 - _redist_sdk :=$(_msvc_dir)/../SDK/v1.1/Bin
1.191 - _ms_sdk :=$(_msvc_dir)/PlatformSDK
1.192 + ifneq ($(SHORTMSVCDIR),)
1.193 + SHORTCOMPILERBIN :=$(SHORTMSVCDIR)/Bin
1.194 + SHORTPSDK :=$(SHORTMSVCDIR)/PlatformSDK
1.195 + export SHORTCOMPILERBIN
1.196 + export SHORTPSDK
1.197 endif
1.198 endif
1.199
1.200 # The Microsoft Platform SDK installed by itself
1.201 -ifneq ($(_program_files),)
1.202 - xPSDK :="$(_program_files)/Microsoft Platform SDK"
1.203 - _psdk :=$(call FullPath,$(xPSDK))
1.204 - ifeq ($(_psdk),)
1.205 - xPSDK :="$(_program_files)/Microsoft SDK"
1.206 - _psdk :=$(call FullPath,$(xMSSDK))
1.207 +ifneq ($(SHORTPROGRAMFILES),)
1.208 + ifndef SHORTPSDK
1.209 + xPSDK :="$(SHORTPROGRAMFILES)/Microsoft Platform SDK"
1.210 + SHORTPSDK :=$(call FullPath,$(xPSDK))
1.211 + ifeq ($(SHORTPSDK),)
1.212 + xPSDK :="$(SHORTPROGRAMFILES)/Microsoft SDK"
1.213 + SHORTPSDK :=$(call FullPath,$(xMSSDK))
1.214 + endif
1.215 + export SHORTPSDK
1.216 endif
1.217 endif
1.218
1.219 # If no SDK found yet, look in other places
1.220 -ifeq ($(_ms_sdk),)
1.221 +ifndef SHORTPSDK
1.222 ifdef MSSDK
1.223 - xMSSDK :="$(subst \,/,$(MSSDK))"
1.224 - _ms_sdk :=$(call FullPath,$(xMSSDK))
1.225 + xMSSDK :="$(subst \,/,$(MSSDK))"
1.226 + SHORTPSDK :=$(call FullPath,$(xMSSDK))
1.227 else
1.228 ifdef MSSdk
1.229 - xMSSDK :="$(subst \,/,$(MSSdk))"
1.230 - _ms_sdk :=$(call FullPath,$(xMSSDK))
1.231 - else
1.232 - _ms_sdk :=$(_psdk)
1.233 + xMSSDK :="$(subst \,/,$(MSSdk))"
1.234 + SHORTPSDK :=$(call FullPath,$(xMSSDK))
1.235 endif
1.236 endif
1.237 + export SHORTPSDK
1.238 endif
1.239
1.240 # Compilers for 64bit are from SDK
1.241 ifeq ($(ARCH_DATA_MODEL), 64)
1.242 - xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/"
1.243 - MSSDK61 :=$(call FullPath,$(xMSSDK61))
1.244 - xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/"
1.245 - _vs2008 :=$(call FullPath,$(xVS2008))
1.246 - ifneq ($(_vs2008),)
1.247 - ifeq ($(ARCH), ia64)
1.248 - _compiler_bin :=$(_vs2008)/VC/Bin/x86_ia64
1.249 - endif
1.250 - ifeq ($(ARCH), amd64)
1.251 - _compiler_bin :=$(_vs2008)/VC/Bin/$(ARCH)
1.252 - _redist_sdk :=$(MSSDK61)/VC/redist
1.253 - endif
1.254 - else
1.255 - ifneq ($(_ms_sdk),)
1.256 + ifndef SHORTCOMPILERBIN
1.257 + xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/"
1.258 + MSSDK61 :=$(call FullPath,$(xMSSDK61))
1.259 + xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/"
1.260 + _vs2008 :=$(call FullPath,$(xVS2008))
1.261 + ifneq ($(_vs2008),)
1.262 ifeq ($(ARCH), ia64)
1.263 - _compiler_bin :=$(_ms_sdk)/Bin/Win64
1.264 + SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/x86_ia64
1.265 endif
1.266 ifeq ($(ARCH), amd64)
1.267 - _compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH)
1.268 - _redist_sdk :=$(_ms_sdk)/redist/win64/AMD64
1.269 + SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/$(ARCH)
1.270 + endif
1.271 + else
1.272 + ifneq ($(SHORTPSDK),)
1.273 + ifeq ($(ARCH), ia64)
1.274 + SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64
1.275 + endif
1.276 + ifeq ($(ARCH), amd64)
1.277 + SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64/x86/$(ARCH)
1.278 + endif
1.279 endif
1.280 endif
1.281 + export SHORTCOMPILERBIN
1.282 endif
1.283 endif
1.284
1.285 # Location on system where jdk installs might be
1.286 -ifneq ($(_program_files),)
1.287 - USRJDKINSTANCES_PATH =$(_program_files)/Java
1.288 +ifneq ($(SHORTPROGRAMFILES),)
1.289 + USRJDKINSTANCES_PATH =$(SHORTPROGRAMFILES)/Java
1.290 else
1.291 USRJDKINSTANCES_PATH =$(_system_drive)/
1.292 endif
1.293
1.294 # SLASH_JAVA: location of all network accessable files
1.295 -ifdef ALT_SLASH_JAVA
1.296 - xALT_SLASH_JAVA :="$(subst \,/,$(ALT_SLASH_JAVA))"
1.297 - SLASH_JAVA :=$(call FullPath,$(xALT_SLASH_JAVA))
1.298 -else
1.299 - ifdef ALT_JDK_JAVA_DRIVE
1.300 - SLASH_JAVA =$(JDK_JAVA_DRIVE)
1.301 +ifndef SLASH_JAVA
1.302 + ifdef ALT_SLASH_JAVA
1.303 + xALT_SLASH_JAVA :="$(subst \,/,$(ALT_SLASH_JAVA))"
1.304 + SLASH_JAVA :=$(call FullPath,$(xALT_SLASH_JAVA))
1.305 else
1.306 - SLASH_JAVA =J:
1.307 + ifdef ALT_JDK_JAVA_DRIVE
1.308 + SLASH_JAVA =$(JDK_JAVA_DRIVE)
1.309 + else
1.310 + SLASH_JAVA =J:
1.311 + endif
1.312 endif
1.313 + SLASH_JAVA:=$(call AltCheckSpaces,SLASH_JAVA)
1.314 + SLASH_JAVA:=$(call AltCheckValue,SLASH_JAVA)
1.315 + export SLASH_JAVA
1.316 endif
1.317 -SLASH_JAVA:=$(call AltCheckSpaces,SLASH_JAVA)
1.318 -SLASH_JAVA:=$(call AltCheckValue,SLASH_JAVA)
1.319
1.320 # JDK_DEVTOOLS_DIR: common path for all the java devtools
1.321 -ifdef ALT_JDK_DEVTOOLS_DIR
1.322 - xALT_JDK_DEVTOOLS_DIR :="$(subst \,/,$(ALT_JDK_DEVTOOLS_DIR))"
1.323 - JDK_DEVTOOLS_DIR :=$(call FullPath,$(xALT_JDK_DEVTOOLS_DIR))
1.324 -else
1.325 - JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
1.326 +ifndef JDK_DEVTOOLS_DIR
1.327 + ifdef ALT_JDK_DEVTOOLS_DIR
1.328 + xALT_JDK_DEVTOOLS_DIR :="$(subst \,/,$(ALT_JDK_DEVTOOLS_DIR))"
1.329 + JDK_DEVTOOLS_DIR :=$(call FullPath,$(xALT_JDK_DEVTOOLS_DIR))
1.330 + else
1.331 + JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
1.332 + endif
1.333 + JDK_DEVTOOLS_DIR:=$(call AltCheckSpaces,JDK_DEVTOOLS_DIR)
1.334 + JDK_DEVTOOLS_DIR:=$(call AltCheckValue,JDK_DEVTOOLS_DIR)
1.335 + export JDK_DEVTOOLS_DIR
1.336 endif
1.337 -JDK_DEVTOOLS_DIR:=$(call AltCheckSpaces,JDK_DEVTOOLS_DIR)
1.338 -JDK_DEVTOOLS_DIR:=$(call AltCheckValue,JDK_DEVTOOLS_DIR)
1.339
1.340 # COMPILER_PATH: path to where the compiler and tools are installed.
1.341 # NOTE: Must end with / so that it could be empty, allowing PATH usage.
1.342 -ifdef ALT_COMPILER_PATH
1.343 - xALT_COMPILER_PATH :="$(subst \,/,$(ALT_COMPILER_PATH))"
1.344 - fxALT_COMPILER_PATH :=$(call FullPath,$(xALT_COMPILER_PATH))
1.345 - COMPILER_PATH :=$(call PrefixPath,$(fxALT_COMPILER_PATH))
1.346 -else
1.347 - COMPILER_PATH :=$(call PrefixPath,$(_compiler_bin))
1.348 +ifndef COMPILER_PATH
1.349 + ifdef ALT_COMPILER_PATH
1.350 + xALT_COMPILER_PATH :="$(subst \,/,$(ALT_COMPILER_PATH))"
1.351 + fxALT_COMPILER_PATH :=$(call FullPath,$(xALT_COMPILER_PATH))
1.352 + COMPILER_PATH :=$(call PrefixPath,$(fxALT_COMPILER_PATH))
1.353 + else
1.354 + COMPILER_PATH :=$(call PrefixPath,$(SHORTCOMPILERBIN))
1.355 + endif
1.356 + COMPILER_PATH :=$(call AltCheckSpaces,COMPILER_PATH)
1.357 + export COMPILER_PATH
1.358 endif
1.359 -COMPILER_PATH :=$(call AltCheckSpaces,COMPILER_PATH)
1.360
1.361 # MSDEVTOOLS_PATH: path to where the additional MS Compiler tools are.
1.362 # NOTE: Must end with / so that it could be empty, allowing PATH usage.
1.363 -ifdef ALT_MSDEVTOOLS_PATH
1.364 - xALT_MSDEVTOOLS_PATH :="$(subst \,/,$(ALT_MSDEVTOOLS_PATH))"
1.365 - fxALT_MSDEVTOOLS_PATH :=$(call FullPath,$(xALT_MSDEVTOOLS_PATH))
1.366 - MSDEVTOOLS_PATH :=$(call PrefixPath,$(fxALT_MSDEVTOOLS_PATH))
1.367 -else
1.368 - ifeq ($(ARCH_DATA_MODEL), 64)
1.369 - ifdef MSTOOLS
1.370 - xMSTOOLS :="$(subst \,/,$(MSTOOLS))"
1.371 - _ms_tools :=$(call FullPath,$(xMSTOOLS))
1.372 - else
1.373 - ifdef Mstools
1.374 - xMSTOOLS :="$(subst \,/,$(Mstools))"
1.375 +ifndef MSDEVTOOLS_PATH
1.376 + ifdef ALT_MSDEVTOOLS_PATH
1.377 + xALT_MSDEVTOOLS_PATH :="$(subst \,/,$(ALT_MSDEVTOOLS_PATH))"
1.378 + fxALT_MSDEVTOOLS_PATH :=$(call FullPath,$(xALT_MSDEVTOOLS_PATH))
1.379 + MSDEVTOOLS_PATH :=$(call PrefixPath,$(fxALT_MSDEVTOOLS_PATH))
1.380 + else
1.381 + ifeq ($(ARCH_DATA_MODEL), 64)
1.382 + ifdef MSTOOLS
1.383 + xMSTOOLS :="$(subst \,/,$(MSTOOLS))"
1.384 _ms_tools :=$(call FullPath,$(xMSTOOLS))
1.385 else
1.386 - _ms_tools :=
1.387 + ifdef Mstools
1.388 + xMSTOOLS :="$(subst \,/,$(Mstools))"
1.389 + _ms_tools :=$(call FullPath,$(xMSTOOLS))
1.390 + else
1.391 + _ms_tools :=
1.392 + endif
1.393 endif
1.394 + ifneq ($(_ms_tools),)
1.395 + _ms_tools_bin :=$(_ms_tools)/Bin
1.396 + else
1.397 + # Assumes compiler bin is .../Bin/win64/x86/AMD64, rc.exe is 3 levels up
1.398 + _ms_tools_bin :=$(SHORTCOMPILERBIN)/../../..
1.399 + endif
1.400 + else
1.401 + _ms_tools_bin :=$(SHORTCOMPILERBIN)
1.402 endif
1.403 - ifneq ($(_ms_tools),)
1.404 - _ms_tools_bin :=$(_ms_tools)/Bin
1.405 - else
1.406 - # Assumes compiler bin is .../Bin/win64/x86/AMD64, rc.exe is 3 levels up
1.407 - _ms_tools_bin :=$(_compiler_bin)/../../..
1.408 - endif
1.409 - else
1.410 - _ms_tools_bin :=$(_compiler_bin)
1.411 + MSDEVTOOLS_PATH :=$(call PrefixPath,$(_ms_tools_bin))
1.412 endif
1.413 - MSDEVTOOLS_PATH :=$(call PrefixPath,$(_ms_tools_bin))
1.414 + MSDEVTOOLS_PATH:=$(call AltCheckSpaces,MSDEVTOOLS_PATH)
1.415 + export MSDEVTOOLS_PATH
1.416 endif
1.417 -MSDEVTOOLS_PATH:=$(call AltCheckSpaces,MSDEVTOOLS_PATH)
1.418
1.419 # DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
1.420 # NOTE: Must end with / so that it could be empty, allowing PATH usage.
1.421 -ifdef ALT_DEVTOOLS_PATH
1.422 - xALT_DEVTOOLS_PATH :="$(subst \,/,$(ALT_DEVTOOLS_PATH))"
1.423 - fxALT_DEVTOOLS_PATH :=$(call FullPath,$(xALT_DEVTOOLS_PATH))
1.424 - DEVTOOLS_PATH :=$(call PrefixPath,$(fxALT_DEVTOOLS_PATH))
1.425 -else
1.426 - ifdef USING_CYGWIN
1.427 - DEVTOOLS_PATH :=$(UNIXCOMMAND_PATH)
1.428 +ifndef DEVTOOLS_PATH
1.429 + ifdef ALT_DEVTOOLS_PATH
1.430 + xALT_DEVTOOLS_PATH :="$(subst \,/,$(ALT_DEVTOOLS_PATH))"
1.431 + fxALT_DEVTOOLS_PATH :=$(call FullPath,$(xALT_DEVTOOLS_PATH))
1.432 + DEVTOOLS_PATH :=$(call PrefixPath,$(fxALT_DEVTOOLS_PATH))
1.433 else
1.434 - xDEVTOOLS_PATH :="$(_system_drive)/utils"
1.435 - fxDEVTOOLS_PATH :=$(call FullPath,$(xDEVTOOLS_PATH))
1.436 - DEVTOOLS_PATH :=$(call PrefixPath,$(fxDEVTOOLS_PATH))
1.437 + ifdef USING_CYGWIN
1.438 + DEVTOOLS_PATH :=$(UNIXCOMMAND_PATH)
1.439 + else
1.440 + xDEVTOOLS_PATH :="$(_system_drive)/utils"
1.441 + fxDEVTOOLS_PATH :=$(call FullPath,$(xDEVTOOLS_PATH))
1.442 + DEVTOOLS_PATH :=$(call PrefixPath,$(fxDEVTOOLS_PATH))
1.443 + endif
1.444 endif
1.445 + DEVTOOLS_PATH:=$(call AltCheckSpaces,DEVTOOLS_PATH)
1.446 + export DEVTOOLS_PATH
1.447 endif
1.448 -DEVTOOLS_PATH:=$(call AltCheckSpaces,DEVTOOLS_PATH)
1.449
1.450 # _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
1.451 # _BOOTDIR2: Second choice
1.452 @@ -410,20 +415,26 @@
1.453
1.454 # BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for
1.455 # multiple platforms, e.g. windows-i586, solaris-sparc, linux-586, etc.
1.456 -ifdef ALT_BUILD_JDK_IMPORT_PATH
1.457 - BUILD_JDK_IMPORT_PATH :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
1.458 -else
1.459 - BUILD_JDK_IMPORT_PATH = $(PROMOTED_BUILD_BINARIES)
1.460 +ifndef BUILD_JDK_IMPORT_PATH
1.461 + ifdef ALT_BUILD_JDK_IMPORT_PATH
1.462 + BUILD_JDK_IMPORT_PATH :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
1.463 + else
1.464 + BUILD_JDK_IMPORT_PATH = $(PROMOTED_BUILD_BINARIES)
1.465 + endif
1.466 + BUILD_JDK_IMPORT_PATH:=$(call AltCheckSpaces,BUILD_JDK_IMPORT_PATH)
1.467 + BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
1.468 + export BUILD_JDK_IMPORT_PATH
1.469 endif
1.470 -BUILD_JDK_IMPORT_PATH:=$(call AltCheckSpaces,BUILD_JDK_IMPORT_PATH)
1.471 -BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
1.472
1.473 # JDK_IMPORT_PATH: location of previously built JDK (this version) to import
1.474 -ifdef ALT_JDK_IMPORT_PATH
1.475 - JDK_IMPORT_PATH :=$(call FullPath,$(ALT_JDK_IMPORT_PATH))
1.476 -else
1.477 - JDK_IMPORT_PATH = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
1.478 +ifndef JDK_IMPORT_PATH
1.479 + ifdef ALT_JDK_IMPORT_PATH
1.480 + JDK_IMPORT_PATH :=$(call FullPath,$(ALT_JDK_IMPORT_PATH))
1.481 + else
1.482 + JDK_IMPORT_PATH = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
1.483 + endif
1.484 + JDK_IMPORT_PATH:=$(call AltCheckSpaces,JDK_IMPORT_PATH)
1.485 + JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
1.486 + export JDK_IMPORT_PATH
1.487 endif
1.488 -JDK_IMPORT_PATH:=$(call AltCheckSpaces,JDK_IMPORT_PATH)
1.489 -JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
1.490
