equal
deleted
inserted
replaced
537 _WSCRIPT1 :=$(_system_root)/system32/wscript.exe |
537 _WSCRIPT1 :=$(_system_root)/system32/wscript.exe |
538 _WSCRIPT2 :=$(DEVTOOLS_PATH)wscript.exe |
538 _WSCRIPT2 :=$(DEVTOOLS_PATH)wscript.exe |
539 WSCRIPT :=$(call FileExists,$(_WSCRIPT1),$(_WSCRIPT2)) |
539 WSCRIPT :=$(call FileExists,$(_WSCRIPT1),$(_WSCRIPT2)) |
540 endif |
540 endif |
541 WSCRIPT:=$(call AltCheckSpaces,WSCRIPT) |
541 WSCRIPT:=$(call AltCheckSpaces,WSCRIPT) |
|
542 # batch mode no modal dialogs on errors, please. |
|
543 WSCRIPT += -B |
542 |
544 |
543 # CSCRIPT: path to cscript.exe (used in creating install bundles) |
545 # CSCRIPT: path to cscript.exe (used in creating install bundles) |
544 ifdef ALT_CSCRIPT |
546 ifdef ALT_CSCRIPT |
545 xALT_CSCRIPT :="$(subst \,/,$(ALT_CSCRIPT))" |
547 xALT_CSCRIPT :="$(subst \,/,$(ALT_CSCRIPT))" |
546 CSCRIPT =$(xALT_CSCRIPT) |
548 CSCRIPT =$(xALT_CSCRIPT) |
559 _MSIVAL2_1 :=$(INSTALL_MSIVAL2)/msival2.exe |
561 _MSIVAL2_1 :=$(INSTALL_MSIVAL2)/msival2.exe |
560 _MSIVAL2_2 :=$(DEVTOOLS_PATH)msival2.exe |
562 _MSIVAL2_2 :=$(DEVTOOLS_PATH)msival2.exe |
561 MSIVAL2 :=$(call FileExists,$(_MSIVAL2_1),$(_MSIVAL2_2)) |
563 MSIVAL2 :=$(call FileExists,$(_MSIVAL2_1),$(_MSIVAL2_2)) |
562 endif |
564 endif |
563 MSIVAL2:=$(call AltCheckSpaces,MSIVAL2) |
565 MSIVAL2:=$(call AltCheckSpaces,MSIVAL2) |
|
566 # suppress msival2 checks, as it hangs jprt builds |
|
567 ifdef SKIP_MSIVAL2 |
|
568 MSIVAL2 := $(ECHO) |
|
569 endif |
564 |
570 |
565 # LOGOCUB: path to cub file for (used in validating install msi files) |
571 # LOGOCUB: path to cub file for (used in validating install msi files) |
566 ifdef ALT_LOGOCUB |
572 ifdef ALT_LOGOCUB |
567 xALT_LOGOCUB :="$(subst \,/,$(ALT_LOGOCUB))" |
573 xALT_LOGOCUB :="$(subst \,/,$(ALT_LOGOCUB))" |
568 LOGOCUB =$(xALT_LOGOCUB) |
574 LOGOCUB =$(xALT_LOGOCUB) |