提交 da8ebb83 编写于 作者: K ksrini

6614210: JPRT Windows 32bit msival2 build failure when building 'install' workspace

Summary: suppresses wscript's modal dialog on error and no msi validation for jprt.
Reviewed-by: ohair, jmelvin
上级 7a372271
...@@ -539,6 +539,8 @@ else ...@@ -539,6 +539,8 @@ else
WSCRIPT :=$(call FileExists,$(_WSCRIPT1),$(_WSCRIPT2)) WSCRIPT :=$(call FileExists,$(_WSCRIPT1),$(_WSCRIPT2))
endif endif
WSCRIPT:=$(call AltCheckSpaces,WSCRIPT) WSCRIPT:=$(call AltCheckSpaces,WSCRIPT)
# batch mode no modal dialogs on errors, please.
WSCRIPT += -B
# CSCRIPT: path to cscript.exe (used in creating install bundles) # CSCRIPT: path to cscript.exe (used in creating install bundles)
ifdef ALT_CSCRIPT ifdef ALT_CSCRIPT
...@@ -561,6 +563,10 @@ else ...@@ -561,6 +563,10 @@ else
MSIVAL2 :=$(call FileExists,$(_MSIVAL2_1),$(_MSIVAL2_2)) MSIVAL2 :=$(call FileExists,$(_MSIVAL2_1),$(_MSIVAL2_2))
endif endif
MSIVAL2:=$(call AltCheckSpaces,MSIVAL2) MSIVAL2:=$(call AltCheckSpaces,MSIVAL2)
# suppress msival2 checks, as it hangs jprt builds
ifdef SKIP_MSIVAL2
MSIVAL2 := $(ECHO)
endif
# LOGOCUB: path to cub file for (used in validating install msi files) # LOGOCUB: path to cub file for (used in validating install msi files)
ifdef ALT_LOGOCUB ifdef ALT_LOGOCUB
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册