Mercurial > jdk8-mips64-public > corba / file comparison
comparison: make/common/shared/Defs-windows.gmk
make/common/shared/Defs-windows.gmk
- changeset 114
- 1c130e7b7a2e
- parent 98
- a12ea7c7b497
- child 150
- ee2d8f1bef5b
equal
deleted
inserted
replaced
| 111:3f1ef7f899ea | 114:1c130e7b7a2e |
|---|---|
| 111 endif | 111 endif |
| 112 _system_drive:=$(call CheckValue,_system_drive,C:) | 112 _system_drive:=$(call CheckValue,_system_drive,C:) |
| 113 | 113 |
| 114 # UNIXCOMMAND_PATH: path to where the most common Unix commands are. | 114 # UNIXCOMMAND_PATH: path to where the most common Unix commands are. |
| 115 # NOTE: Must end with / so that it could be empty, allowing PATH usage. | 115 # NOTE: Must end with / so that it could be empty, allowing PATH usage. |
| 116 ifdef ALT_UNIXCOMMAND_PATH | 116 ifndef UNIXCOMMAND_PATH |
| 117 xALT_UNIXCOMMAND_PATH :="$(subst \,/,$(ALT_UNIXCOMMAND_PATH))" | 117 ifdef ALT_UNIXCOMMAND_PATH |
| 118 fxALT_UNIXCOMMAND_PATH :=$(call FullPath,$(xALT_UNIXCOMMAND_PATH)) | 118 xALT_UNIXCOMMAND_PATH :="$(subst \,/,$(ALT_UNIXCOMMAND_PATH))" |
| 119 UNIXCOMMAND_PATH :=$(call PrefixPath,$(fxALT_UNIXCOMMAND_PATH)) | 119 fxALT_UNIXCOMMAND_PATH :=$(call FullPath,$(xALT_UNIXCOMMAND_PATH)) |
| 120 else | 120 UNIXCOMMAND_PATH :=$(call PrefixPath,$(fxALT_UNIXCOMMAND_PATH)) |
| 121 ifdef USING_CYGWIN | 121 else |
| 122 UNIXCOMMAND_PATH :=$(call PrefixPath,/usr/bin) | 122 ifdef USING_CYGWIN |
| 123 else | 123 UNIXCOMMAND_PATH :=$(call PrefixPath,/usr/bin) |
| 124 ifdef ROOTDIR | 124 else |
| 125 xROOTDIR :="$(subst \,/,$(ROOTDIR))" | 125 ifdef ROOTDIR |
| 126 _rootdir :=$(call FullPath,$(xROOTDIR)) | 126 xROOTDIR :="$(subst \,/,$(ROOTDIR))" |
| 127 else | 127 _rootdir :=$(call FullPath,$(xROOTDIR)) |
| 128 xROOTDIR :="$(_system_drive)/mksnt" | 128 else |
| 129 _rootdir :=$(call FullPath,$(xROOTDIR)) | 129 xROOTDIR :="$(_system_drive)/mksnt" |
| 130 endif | 130 _rootdir :=$(call FullPath,$(xROOTDIR)) |
| 131 ifneq ($(_rootdir),) | 131 endif |
| 132 UNIXCOMMAND_PATH :=$(call PrefixPath,$(_rootdir)/mksnt) | 132 ifneq ($(_rootdir),) |
| 133 endif | 133 UNIXCOMMAND_PATH :=$(call PrefixPath,$(_rootdir)/mksnt) |
| 134 endif | 134 endif |
| 135 endif | 135 endif |
| 136 UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH) | 136 endif |
| 137 UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH) | |
| 138 export UNIXCOMMAND_PATH | |
| 139 endif | |
| 137 | 140 |
| 138 # Get version of MKS or CYGWIN | 141 # Get version of MKS or CYGWIN |
| 139 ifdef USING_CYGWIN | 142 ifdef USING_CYGWIN |
| 140 _CYGWIN_VER :=$(shell $(UNAME)) | 143 ifndef CYGWIN_VER |
| 141 CYGWIN_VER :=$(call GetVersion,$(_CYGWIN_VER)) | 144 _CYGWIN_VER :=$(shell $(UNAME)) |
| 145 CYGWIN_VER :=$(call GetVersion,$(_CYGWIN_VER)) | |
| 146 export CYGWIN_VER | |
| 147 endif | |
| 142 else # MKS | 148 else # MKS |
| 143 _MKS_VER :=$(shell $(MKSINFO) 2>&1 | $(GREP) Release | $(TAIL) -1 | $(SED) -e 's@.*\(Release.*\)@\1@') | 149 _MKS_VER :=$(shell $(MKSINFO) 2>&1 | $(GREP) Release | $(TAIL) -1 | $(SED) -e 's@.*\(Release.*\)@\1@') |
| 144 MKS_VER :=$(call GetVersion,$(_MKS_VER)) | 150 MKS_VER :=$(call GetVersion,$(_MKS_VER)) |
| 145 # At this point, we can re-define FullPath to use DOSNAME_CMD | 151 # At this point, we can re-define FullPath to use DOSNAME_CMD |
| 146 CHECK_MKS87:=$(call CheckVersions,$(MKS_VER),8.7) | 152 CHECK_MKS87:=$(call CheckVersions,$(MKS_VER),8.7) |
| 166 # We try to get references to what we need via the default component | 172 # We try to get references to what we need via the default component |
| 167 # environment variables, or what was used historically. | 173 # environment variables, or what was used historically. |
| 168 | 174 |
| 169 # Process Windows values into FullPath values, these paths may have \ chars | 175 # Process Windows values into FullPath values, these paths may have \ chars |
| 170 | 176 |
| 171 # System root | |
| 172 ifdef SYSTEMROOT | |
| 173 xSYSTEMROOT :="$(subst \,/,$(SYSTEMROOT))" | |
| 174 _system_root :=$(call FullPath,$(xSYSTEMROOT)) | |
| 175 else | |
| 176 ifdef SystemRoot | |
| 177 xSYSTEMROOT :="$(subst \,/,$(SystemRoot))" | |
| 178 _system_root :=$(call FullPath,$(xSYSTEMROOT)) | |
| 179 else | |
| 180 ifdef WINDIR | |
| 181 xWINDIR :="$(subst \,/,$(WINDIR))" | |
| 182 _system_root :=$(call FullPath,$(xWINDIR)) | |
| 183 else | |
| 184 ifdef windir | |
| 185 xWINDIR :="$(subst \,/,$(windir))" | |
| 186 _system_root :=$(call FullPath,$(xWINDIR)) | |
| 187 endif | |
| 188 endif | |
| 189 endif | |
| 190 endif | |
| 191 _system_root:=$(call CheckValue,_system_root,$(_system_drive)/WINNT) | |
| 192 | |
| 193 # Program Files directory | 177 # Program Files directory |
| 194 ifdef PROGRAMFILES | 178 ifndef SHORTPROGRAMFILES |
| 195 xPROGRAMFILES :="$(subst \,/,$(PROGRAMFILES))" | 179 ifdef PROGRAMFILES |
| 196 else | 180 xPROGRAMFILES :="$(subst \,/,$(PROGRAMFILES))" |
| 181 else | |
| 182 ifeq ($(ARCH_DATA_MODEL), 32) | |
| 183 xPROGRAMFILES :="$(_system_drive)/Program Files" | |
| 184 else | |
| 185 xPROGRAMFILES :="$(_system_drive)/Program Files (x86)" | |
| 186 endif | |
| 187 endif | |
| 197 ifeq ($(ARCH_DATA_MODEL), 32) | 188 ifeq ($(ARCH_DATA_MODEL), 32) |
| 198 xPROGRAMFILES :="$(_system_drive)/Program Files" | 189 SHORTPROGRAMFILES :=$(call FullPath,$(xPROGRAMFILES)) |
| 199 else | 190 else |
| 200 xPROGRAMFILES :="$(_system_drive)/Program Files (x86)" | 191 ifdef PROGRAMW6432 |
| 201 endif | 192 xPROGRAMW6432 :="$(subst \,/,$(PROGRAMW6432))" |
| 202 endif | 193 else |
| 203 ifeq ($(ARCH_DATA_MODEL), 32) | 194 xPROGRAMW6432 :="$(_system_drive)/Program Files" |
| 204 _program_files :=$(call FullPath,$(xPROGRAMFILES)) | 195 endif |
| 205 else | 196 SHORTPROGRAMFILES :=$(call FullPath,$(xPROGRAMW6432)) |
| 206 ifdef PROGRAMW6432 | 197 endif |
| 207 xPROGRAMW6432 :="$(subst \,/,$(PROGRAMW6432))" | 198 ifneq ($(word 1,$(SHORTPROGRAMFILES)),$(SHORTPROGRAMFILES)) |
| 208 else | 199 SHORTPROGRAMFILES := |
| 209 xPROGRAMW6432 :="$(_system_drive)/Program Files" | 200 endif |
| 210 endif | 201 export SHORTPROGRAMFILES |
| 211 _program_files :=$(call FullPath,$(xPROGRAMW6432)) | |
| 212 _program_files32 :=$(call FullPath,$(xPROGRAMFILES)) | |
| 213 ifneq ($(word 1,$(_program_files32)),$(_program_files32)) | |
| 214 _program_files32:= | |
| 215 endif | |
| 216 endif | |
| 217 ifneq ($(word 1,$(_program_files)),$(_program_files)) | |
| 218 _program_files:= | |
| 219 endif | 202 endif |
| 220 | 203 |
| 221 # Compilers, SDK, and Visual Studio (MSDEV) [32bit is different from 64bit] | 204 # Compilers, SDK, and Visual Studio (MSDEV) [32bit is different from 64bit] |
| 222 ifeq ($(ARCH_DATA_MODEL), 32) | 205 ifeq ($(ARCH_DATA_MODEL), 32) |
| 223 # Try looking in MSVCDIR or MSVCDir area first (set by vcvars32.bat) | 206 ifndef SHORTMSVCDIR |
| 224 ifdef MSVCDIR | 207 # Try looking in MSVCDIR or MSVCDir area first (set by vcvars32.bat) |
| 225 xMSVCDIR :="$(subst \,/,$(MSVCDIR))" | 208 ifdef MSVCDIR |
| 226 _msvc_dir :=$(call FullPath,$(xMSVCDIR)) | 209 xMSVCDIR :="$(subst \,/,$(MSVCDIR))" |
| 227 else | 210 SHORTMSVCDIR :=$(call FullPath,$(xMSVCDIR)) |
| 228 ifdef MSVCDir | 211 else |
| 229 xMSVCDIR :="$(subst \,/,$(MSVCDir))" | 212 ifdef MSVCDir |
| 230 _msvc_dir :=$(call FullPath,$(xMSVCDIR)) | 213 xMSVCDIR :="$(subst \,/,$(MSVCDir))" |
| 231 else | 214 SHORTMSVCDIR :=$(call FullPath,$(xMSVCDIR)) |
| 232 ifneq ($(_program_files),) | 215 else |
| 233 xMSVCDIR :="$(_program_files)/Microsoft Visual Studio .NET 2003/Vc7" | 216 ifneq ($(SHORTPROGRAMFILES),) |
| 234 _msvc_dir :=$(call FullPath,$(xMSVCDIR)) | 217 xMSVCDIR :="$(SHORTPROGRAMFILES)/Microsoft Visual Studio .NET 2003/Vc7" |
| 235 endif | 218 SHORTMSVCDIR :=$(call FullPath,$(xMSVCDIR)) |
| 236 endif | 219 endif |
| 237 endif | 220 endif |
| 238 ifneq ($(subst MSDev98,OLDOLDOLD,$(_msvc_dir)),$(_msvc_dir)) | 221 endif |
| 239 _msvc_dir := | 222 ifneq ($(subst MSDev98,OLDOLDOLD,$(SHORTMSVCDIR)),$(SHORTMSVCDIR)) |
| 240 endif | 223 SHORTMSVCDIR := |
| 241 # If we still don't have it, look for VS71COMNTOOLS, setup by installer? | 224 endif |
| 242 ifeq ($(_msvc_dir),) | 225 # If we still don't have it, look for VS71COMNTOOLS, setup by installer? |
| 243 ifdef VS71COMNTOOLS # /Common/Tools directory, use ../../Vc7 | 226 ifeq ($(SHORTMSVCDIR),) |
| 244 xVS71COMNTOOLS :="$(subst \,/,$(VS71COMNTOOLS))" | 227 ifdef VS71COMNTOOLS # /Common/Tools directory, use ../../Vc7 |
| 245 _vs71tools :=$(call FullPath,$(xVS71COMNTOOLS)) | 228 xVS71COMNTOOLS :="$(subst \,/,$(VS71COMNTOOLS))" |
| 246 endif | 229 _vs71tools :=$(call FullPath,$(xVS71COMNTOOLS)) |
| 247 ifneq ($(_vs71tools),) | 230 endif |
| 248 _msvc_dir :=$(_vs71tools)/../../Vc7 | 231 ifneq ($(_vs71tools),) |
| 249 endif | 232 SHORTMSVCDIR :=$(_vs71tools)/../../Vc7 |
| 250 endif | 233 endif |
| 251 ifneq ($(_msvc_dir),) | 234 endif |
| 252 _compiler_bin :=$(_msvc_dir)/Bin | 235 export SHORTMSVCDIR |
| 253 _redist_sdk :=$(_msvc_dir)/../SDK/v1.1/Bin | 236 endif |
| 254 _ms_sdk :=$(_msvc_dir)/PlatformSDK | 237 ifneq ($(SHORTMSVCDIR),) |
| 238 SHORTCOMPILERBIN :=$(SHORTMSVCDIR)/Bin | |
| 239 SHORTPSDK :=$(SHORTMSVCDIR)/PlatformSDK | |
| 240 export SHORTCOMPILERBIN | |
| 241 export SHORTPSDK | |
| 255 endif | 242 endif |
| 256 endif | 243 endif |
| 257 | 244 |
| 258 # The Microsoft Platform SDK installed by itself | 245 # The Microsoft Platform SDK installed by itself |
| 259 ifneq ($(_program_files),) | 246 ifneq ($(SHORTPROGRAMFILES),) |
| 260 xPSDK :="$(_program_files)/Microsoft Platform SDK" | 247 ifndef SHORTPSDK |
| 261 _psdk :=$(call FullPath,$(xPSDK)) | 248 xPSDK :="$(SHORTPROGRAMFILES)/Microsoft Platform SDK" |
| 262 ifeq ($(_psdk),) | 249 SHORTPSDK :=$(call FullPath,$(xPSDK)) |
| 263 xPSDK :="$(_program_files)/Microsoft SDK" | 250 ifeq ($(SHORTPSDK),) |
| 264 _psdk :=$(call FullPath,$(xMSSDK)) | 251 xPSDK :="$(SHORTPROGRAMFILES)/Microsoft SDK" |
| 252 SHORTPSDK :=$(call FullPath,$(xMSSDK)) | |
| 253 endif | |
| 254 export SHORTPSDK | |
| 265 endif | 255 endif |
| 266 endif | 256 endif |
| 267 | 257 |
| 268 # If no SDK found yet, look in other places | 258 # If no SDK found yet, look in other places |
| 269 ifeq ($(_ms_sdk),) | 259 ifndef SHORTPSDK |
| 270 ifdef MSSDK | 260 ifdef MSSDK |
| 271 xMSSDK :="$(subst \,/,$(MSSDK))" | 261 xMSSDK :="$(subst \,/,$(MSSDK))" |
| 272 _ms_sdk :=$(call FullPath,$(xMSSDK)) | 262 SHORTPSDK :=$(call FullPath,$(xMSSDK)) |
| 273 else | 263 else |
| 274 ifdef MSSdk | 264 ifdef MSSdk |
| 275 xMSSDK :="$(subst \,/,$(MSSdk))" | 265 xMSSDK :="$(subst \,/,$(MSSdk))" |
| 276 _ms_sdk :=$(call FullPath,$(xMSSDK)) | 266 SHORTPSDK :=$(call FullPath,$(xMSSDK)) |
| 277 else | 267 endif |
| 278 _ms_sdk :=$(_psdk) | 268 endif |
| 279 endif | 269 export SHORTPSDK |
| 280 endif | |
| 281 endif | 270 endif |
| 282 | 271 |
| 283 # Compilers for 64bit are from SDK | 272 # Compilers for 64bit are from SDK |
| 284 ifeq ($(ARCH_DATA_MODEL), 64) | 273 ifeq ($(ARCH_DATA_MODEL), 64) |
| 285 xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/" | 274 ifndef SHORTCOMPILERBIN |
| 286 MSSDK61 :=$(call FullPath,$(xMSSDK61)) | 275 xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/" |
| 287 xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/" | 276 MSSDK61 :=$(call FullPath,$(xMSSDK61)) |
| 288 _vs2008 :=$(call FullPath,$(xVS2008)) | 277 xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/" |
| 289 ifneq ($(_vs2008),) | 278 _vs2008 :=$(call FullPath,$(xVS2008)) |
| 290 ifeq ($(ARCH), ia64) | 279 ifneq ($(_vs2008),) |
| 291 _compiler_bin :=$(_vs2008)/VC/Bin/x86_ia64 | |
| 292 endif | |
| 293 ifeq ($(ARCH), amd64) | |
| 294 _compiler_bin :=$(_vs2008)/VC/Bin/$(ARCH) | |
| 295 _redist_sdk :=$(MSSDK61)/VC/redist | |
| 296 endif | |
| 297 else | |
| 298 ifneq ($(_ms_sdk),) | |
| 299 ifeq ($(ARCH), ia64) | 280 ifeq ($(ARCH), ia64) |
| 300 _compiler_bin :=$(_ms_sdk)/Bin/Win64 | 281 SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/x86_ia64 |
| 301 endif | 282 endif |
| 302 ifeq ($(ARCH), amd64) | 283 ifeq ($(ARCH), amd64) |
| 303 _compiler_bin :=$(_ms_sdk)/Bin/Win64/x86/$(ARCH) | 284 SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/$(ARCH) |
| 304 _redist_sdk :=$(_ms_sdk)/redist/win64/AMD64 | 285 endif |
| 305 endif | 286 else |
| 306 endif | 287 ifneq ($(SHORTPSDK),) |
| 288 ifeq ($(ARCH), ia64) | |
| 289 SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64 | |
| 290 endif | |
| 291 ifeq ($(ARCH), amd64) | |
| 292 SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64/x86/$(ARCH) | |
| 293 endif | |
| 294 endif | |
| 295 endif | |
| 296 export SHORTCOMPILERBIN | |
| 307 endif | 297 endif |
| 308 endif | 298 endif |
| 309 | 299 |
| 310 # Location on system where jdk installs might be | 300 # Location on system where jdk installs might be |
| 311 ifneq ($(_program_files),) | 301 ifneq ($(SHORTPROGRAMFILES),) |
| 312 USRJDKINSTANCES_PATH =$(_program_files)/Java | 302 USRJDKINSTANCES_PATH =$(SHORTPROGRAMFILES)/Java |
| 313 else | 303 else |
| 314 USRJDKINSTANCES_PATH =$(_system_drive)/ | 304 USRJDKINSTANCES_PATH =$(_system_drive)/ |
| 315 endif | 305 endif |
| 316 | 306 |
| 317 # SLASH_JAVA: location of all network accessable files | 307 # SLASH_JAVA: location of all network accessable files |
| 318 ifdef ALT_SLASH_JAVA | 308 ifndef SLASH_JAVA |
| 319 xALT_SLASH_JAVA :="$(subst \,/,$(ALT_SLASH_JAVA))" | 309 ifdef ALT_SLASH_JAVA |
| 320 SLASH_JAVA :=$(call FullPath,$(xALT_SLASH_JAVA)) | 310 xALT_SLASH_JAVA :="$(subst \,/,$(ALT_SLASH_JAVA))" |
| 321 else | 311 SLASH_JAVA :=$(call FullPath,$(xALT_SLASH_JAVA)) |
| 322 ifdef ALT_JDK_JAVA_DRIVE | 312 else |
| 323 SLASH_JAVA =$(JDK_JAVA_DRIVE) | 313 ifdef ALT_JDK_JAVA_DRIVE |
| 324 else | 314 SLASH_JAVA =$(JDK_JAVA_DRIVE) |
| 325 SLASH_JAVA =J: | 315 else |
| 326 endif | 316 SLASH_JAVA =J: |
| 327 endif | 317 endif |
| 328 SLASH_JAVA:=$(call AltCheckSpaces,SLASH_JAVA) | 318 endif |
| 329 SLASH_JAVA:=$(call AltCheckValue,SLASH_JAVA) | 319 SLASH_JAVA:=$(call AltCheckSpaces,SLASH_JAVA) |
| 320 SLASH_JAVA:=$(call AltCheckValue,SLASH_JAVA) | |
| 321 export SLASH_JAVA | |
| 322 endif | |
| 330 | 323 |
| 331 # JDK_DEVTOOLS_DIR: common path for all the java devtools | 324 # JDK_DEVTOOLS_DIR: common path for all the java devtools |
| 332 ifdef ALT_JDK_DEVTOOLS_DIR | 325 ifndef JDK_DEVTOOLS_DIR |
| 333 xALT_JDK_DEVTOOLS_DIR :="$(subst \,/,$(ALT_JDK_DEVTOOLS_DIR))" | 326 ifdef ALT_JDK_DEVTOOLS_DIR |
| 334 JDK_DEVTOOLS_DIR :=$(call FullPath,$(xALT_JDK_DEVTOOLS_DIR)) | 327 xALT_JDK_DEVTOOLS_DIR :="$(subst \,/,$(ALT_JDK_DEVTOOLS_DIR))" |
| 335 else | 328 JDK_DEVTOOLS_DIR :=$(call FullPath,$(xALT_JDK_DEVTOOLS_DIR)) |
| 336 JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools | 329 else |
| 337 endif | 330 JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools |
| 338 JDK_DEVTOOLS_DIR:=$(call AltCheckSpaces,JDK_DEVTOOLS_DIR) | 331 endif |
| 339 JDK_DEVTOOLS_DIR:=$(call AltCheckValue,JDK_DEVTOOLS_DIR) | 332 JDK_DEVTOOLS_DIR:=$(call AltCheckSpaces,JDK_DEVTOOLS_DIR) |
| 333 JDK_DEVTOOLS_DIR:=$(call AltCheckValue,JDK_DEVTOOLS_DIR) | |
| 334 export JDK_DEVTOOLS_DIR | |
| 335 endif | |
| 340 | 336 |
| 341 # COMPILER_PATH: path to where the compiler and tools are installed. | 337 # COMPILER_PATH: path to where the compiler and tools are installed. |
| 342 # NOTE: Must end with / so that it could be empty, allowing PATH usage. | 338 # NOTE: Must end with / so that it could be empty, allowing PATH usage. |
| 343 ifdef ALT_COMPILER_PATH | 339 ifndef COMPILER_PATH |
| 344 xALT_COMPILER_PATH :="$(subst \,/,$(ALT_COMPILER_PATH))" | 340 ifdef ALT_COMPILER_PATH |
| 345 fxALT_COMPILER_PATH :=$(call FullPath,$(xALT_COMPILER_PATH)) | 341 xALT_COMPILER_PATH :="$(subst \,/,$(ALT_COMPILER_PATH))" |
| 346 COMPILER_PATH :=$(call PrefixPath,$(fxALT_COMPILER_PATH)) | 342 fxALT_COMPILER_PATH :=$(call FullPath,$(xALT_COMPILER_PATH)) |
| 347 else | 343 COMPILER_PATH :=$(call PrefixPath,$(fxALT_COMPILER_PATH)) |
| 348 COMPILER_PATH :=$(call PrefixPath,$(_compiler_bin)) | 344 else |
| 349 endif | 345 COMPILER_PATH :=$(call PrefixPath,$(SHORTCOMPILERBIN)) |
| 350 COMPILER_PATH :=$(call AltCheckSpaces,COMPILER_PATH) | 346 endif |
| 347 COMPILER_PATH :=$(call AltCheckSpaces,COMPILER_PATH) | |
| 348 export COMPILER_PATH | |
| 349 endif | |
| 351 | 350 |
| 352 # MSDEVTOOLS_PATH: path to where the additional MS Compiler tools are. | 351 # MSDEVTOOLS_PATH: path to where the additional MS Compiler tools are. |
| 353 # NOTE: Must end with / so that it could be empty, allowing PATH usage. | 352 # NOTE: Must end with / so that it could be empty, allowing PATH usage. |
| 354 ifdef ALT_MSDEVTOOLS_PATH | 353 ifndef MSDEVTOOLS_PATH |
| 355 xALT_MSDEVTOOLS_PATH :="$(subst \,/,$(ALT_MSDEVTOOLS_PATH))" | 354 ifdef ALT_MSDEVTOOLS_PATH |
| 356 fxALT_MSDEVTOOLS_PATH :=$(call FullPath,$(xALT_MSDEVTOOLS_PATH)) | 355 xALT_MSDEVTOOLS_PATH :="$(subst \,/,$(ALT_MSDEVTOOLS_PATH))" |
| 357 MSDEVTOOLS_PATH :=$(call PrefixPath,$(fxALT_MSDEVTOOLS_PATH)) | 356 fxALT_MSDEVTOOLS_PATH :=$(call FullPath,$(xALT_MSDEVTOOLS_PATH)) |
| 358 else | 357 MSDEVTOOLS_PATH :=$(call PrefixPath,$(fxALT_MSDEVTOOLS_PATH)) |
| 359 ifeq ($(ARCH_DATA_MODEL), 64) | 358 else |
| 360 ifdef MSTOOLS | 359 ifeq ($(ARCH_DATA_MODEL), 64) |
| 361 xMSTOOLS :="$(subst \,/,$(MSTOOLS))" | 360 ifdef MSTOOLS |
| 362 _ms_tools :=$(call FullPath,$(xMSTOOLS)) | 361 xMSTOOLS :="$(subst \,/,$(MSTOOLS))" |
| 363 else | |
| 364 ifdef Mstools | |
| 365 xMSTOOLS :="$(subst \,/,$(Mstools))" | |
| 366 _ms_tools :=$(call FullPath,$(xMSTOOLS)) | 362 _ms_tools :=$(call FullPath,$(xMSTOOLS)) |
| 367 else | 363 else |
| 368 _ms_tools := | 364 ifdef Mstools |
| 369 endif | 365 xMSTOOLS :="$(subst \,/,$(Mstools))" |
| 370 endif | 366 _ms_tools :=$(call FullPath,$(xMSTOOLS)) |
| 371 ifneq ($(_ms_tools),) | 367 else |
| 372 _ms_tools_bin :=$(_ms_tools)/Bin | 368 _ms_tools := |
| 373 else | 369 endif |
| 374 # Assumes compiler bin is .../Bin/win64/x86/AMD64, rc.exe is 3 levels up | 370 endif |
| 375 _ms_tools_bin :=$(_compiler_bin)/../../.. | 371 ifneq ($(_ms_tools),) |
| 376 endif | 372 _ms_tools_bin :=$(_ms_tools)/Bin |
| 377 else | 373 else |
| 378 _ms_tools_bin :=$(_compiler_bin) | 374 # Assumes compiler bin is .../Bin/win64/x86/AMD64, rc.exe is 3 levels up |
| 379 endif | 375 _ms_tools_bin :=$(SHORTCOMPILERBIN)/../../.. |
| 380 MSDEVTOOLS_PATH :=$(call PrefixPath,$(_ms_tools_bin)) | 376 endif |
| 381 endif | 377 else |
| 382 MSDEVTOOLS_PATH:=$(call AltCheckSpaces,MSDEVTOOLS_PATH) | 378 _ms_tools_bin :=$(SHORTCOMPILERBIN) |
| 379 endif | |
| 380 MSDEVTOOLS_PATH :=$(call PrefixPath,$(_ms_tools_bin)) | |
| 381 endif | |
| 382 MSDEVTOOLS_PATH:=$(call AltCheckSpaces,MSDEVTOOLS_PATH) | |
| 383 export MSDEVTOOLS_PATH | |
| 384 endif | |
| 383 | 385 |
| 384 # DEVTOOLS_PATH: for other tools required for building (such as zip, etc.) | 386 # DEVTOOLS_PATH: for other tools required for building (such as zip, etc.) |
| 385 # NOTE: Must end with / so that it could be empty, allowing PATH usage. | 387 # NOTE: Must end with / so that it could be empty, allowing PATH usage. |
| 386 ifdef ALT_DEVTOOLS_PATH | 388 ifndef DEVTOOLS_PATH |
| 387 xALT_DEVTOOLS_PATH :="$(subst \,/,$(ALT_DEVTOOLS_PATH))" | 389 ifdef ALT_DEVTOOLS_PATH |
| 388 fxALT_DEVTOOLS_PATH :=$(call FullPath,$(xALT_DEVTOOLS_PATH)) | 390 xALT_DEVTOOLS_PATH :="$(subst \,/,$(ALT_DEVTOOLS_PATH))" |
| 389 DEVTOOLS_PATH :=$(call PrefixPath,$(fxALT_DEVTOOLS_PATH)) | 391 fxALT_DEVTOOLS_PATH :=$(call FullPath,$(xALT_DEVTOOLS_PATH)) |
| 390 else | 392 DEVTOOLS_PATH :=$(call PrefixPath,$(fxALT_DEVTOOLS_PATH)) |
| 391 ifdef USING_CYGWIN | 393 else |
| 392 DEVTOOLS_PATH :=$(UNIXCOMMAND_PATH) | 394 ifdef USING_CYGWIN |
| 393 else | 395 DEVTOOLS_PATH :=$(UNIXCOMMAND_PATH) |
| 394 xDEVTOOLS_PATH :="$(_system_drive)/utils" | 396 else |
| 395 fxDEVTOOLS_PATH :=$(call FullPath,$(xDEVTOOLS_PATH)) | 397 xDEVTOOLS_PATH :="$(_system_drive)/utils" |
| 396 DEVTOOLS_PATH :=$(call PrefixPath,$(fxDEVTOOLS_PATH)) | 398 fxDEVTOOLS_PATH :=$(call FullPath,$(xDEVTOOLS_PATH)) |
| 397 endif | 399 DEVTOOLS_PATH :=$(call PrefixPath,$(fxDEVTOOLS_PATH)) |
| 398 endif | 400 endif |
| 399 DEVTOOLS_PATH:=$(call AltCheckSpaces,DEVTOOLS_PATH) | 401 endif |
| 402 DEVTOOLS_PATH:=$(call AltCheckSpaces,DEVTOOLS_PATH) | |
| 403 export DEVTOOLS_PATH | |
| 404 endif | |
| 400 | 405 |
| 401 # _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK. | 406 # _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK. |
| 402 # _BOOTDIR2: Second choice | 407 # _BOOTDIR2: Second choice |
| 403 ifndef ALT_BOOTDIR | 408 ifndef ALT_BOOTDIR |
| 404 _BOOTDIR1 =$(_system_drive)/jdk$(PREVIOUS_JDK_VERSION) | 409 _BOOTDIR1 =$(_system_drive)/jdk$(PREVIOUS_JDK_VERSION) |
| 408 # Import JDK images allow for partial builds, components not built are | 413 # Import JDK images allow for partial builds, components not built are |
| 409 # imported (or copied from) these import areas when needed. | 414 # imported (or copied from) these import areas when needed. |
| 410 | 415 |
| 411 # BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for | 416 # BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for |
| 412 # multiple platforms, e.g. windows-i586, solaris-sparc, linux-586, etc. | 417 # multiple platforms, e.g. windows-i586, solaris-sparc, linux-586, etc. |
| 413 ifdef ALT_BUILD_JDK_IMPORT_PATH | 418 ifndef BUILD_JDK_IMPORT_PATH |
| 414 BUILD_JDK_IMPORT_PATH :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH)) | 419 ifdef ALT_BUILD_JDK_IMPORT_PATH |
| 415 else | 420 BUILD_JDK_IMPORT_PATH :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH)) |
| 416 BUILD_JDK_IMPORT_PATH = $(PROMOTED_BUILD_BINARIES) | 421 else |
| 417 endif | 422 BUILD_JDK_IMPORT_PATH = $(PROMOTED_BUILD_BINARIES) |
| 418 BUILD_JDK_IMPORT_PATH:=$(call AltCheckSpaces,BUILD_JDK_IMPORT_PATH) | 423 endif |
| 419 BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH) | 424 BUILD_JDK_IMPORT_PATH:=$(call AltCheckSpaces,BUILD_JDK_IMPORT_PATH) |
| 425 BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH) | |
| 426 export BUILD_JDK_IMPORT_PATH | |
| 427 endif | |
| 420 | 428 |
| 421 # JDK_IMPORT_PATH: location of previously built JDK (this version) to import | 429 # JDK_IMPORT_PATH: location of previously built JDK (this version) to import |
| 422 ifdef ALT_JDK_IMPORT_PATH | 430 ifndef JDK_IMPORT_PATH |
| 423 JDK_IMPORT_PATH :=$(call FullPath,$(ALT_JDK_IMPORT_PATH)) | 431 ifdef ALT_JDK_IMPORT_PATH |
| 424 else | 432 JDK_IMPORT_PATH :=$(call FullPath,$(ALT_JDK_IMPORT_PATH)) |
| 425 JDK_IMPORT_PATH = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT) | 433 else |
| 426 endif | 434 JDK_IMPORT_PATH = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT) |
| 427 JDK_IMPORT_PATH:=$(call AltCheckSpaces,JDK_IMPORT_PATH) | 435 endif |
| 428 JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH) | 436 JDK_IMPORT_PATH:=$(call AltCheckSpaces,JDK_IMPORT_PATH) |
| 429 | 437 JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH) |
| 438 export JDK_IMPORT_PATH | |
| 439 endif | |
| 440 |
