make/common/shared/Defs-windows.gmk

Print this page

        

*** 547,557 **** --- 547,560 ---- else _WSCRIPT1 :=$(_system_root)/system32/wscript.exe _WSCRIPT2 :=$(DEVTOOLS_PATH)wscript.exe WSCRIPT :=$(call FileExists,$(_WSCRIPT1),$(_WSCRIPT2)) endif + # If CONFIGURE_BUILD is defined, checks were already done by configure. + ifndef CONFIGURE_BUILD WSCRIPT:=$(call AltCheckSpaces,WSCRIPT) + endif #! CONFIGURE_BUILD # batch mode no modal dialogs on errors, please. WSCRIPT += -B # CSCRIPT: path to cscript.exe (used in creating install bundles) ifdef ALT_CSCRIPT
*** 560,570 **** --- 563,576 ---- else _CSCRIPT1 :=$(_system_root)/system32/cscript.exe _CSCRIPT2 :=$(DEVTOOLS_PATH)cscript.exe CSCRIPT :=$(call FileExists,$(_CSCRIPT1),$(_CSCRIPT2)) endif + # If CONFIGURE_BUILD is defined, checks were already done by configure. + ifndef CONFIGURE_BUILD CSCRIPT:=$(call AltCheckSpaces,CSCRIPT) + endif #! CONFIGURE_BUILD # CABARC: path to cabarc.exe (used in creating install bundles) ifdef ALT_CABARC xALT_CABARC :="$(subst \,/,$(ALT_CABARC))" CABARC =$(xALT_CABARC)
*** 582,592 **** --- 588,601 ---- else _MSICERT1 :=$(INSTALL_MSSDK)/Bin/msicert.exe _MSICERT2 :=$(DEVTOOLS_PATH)msicert.exe MSICERT :=$(call FileExists,$(_MSICERT1),$(_MSICERT2)) endif + # If CONFIGURE_BUILD is defined, checks were already done by configure. + ifndef CONFIGURE_BUILD MSICERT:=$(call AltCheckSpaces,MSICERT) + endif #! CONFIGURE_BUILD # Import JDK images allow for partial builds, components not built are # imported (or copied from) these import areas when needed. # BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for