Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6614210: JPRT Windows 32bit msival2 build failure when building 'install' workspace
authorksrini
Tue, 19 Aug 2008 07:50:03 -0700
changeset 1025 a9ba5ea0f1f7
parent 1024 2253d6d6cf2c
child 1026 8810ae8edcd1
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
jdk/make/common/shared/Defs-windows.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/make/common/shared/Defs-windows.gmk	Thu Aug 14 20:59:51 2008 -0700
+++ b/jdk/make/common/shared/Defs-windows.gmk	Tue Aug 19 07:50:03 2008 -0700
@@ -539,6 +539,8 @@
   WSCRIPT  :=$(call FileExists,$(_WSCRIPT1),$(_WSCRIPT2))
 endif
 WSCRIPT:=$(call AltCheckSpaces,WSCRIPT)
+# batch mode no modal dialogs on errors, please.
+WSCRIPT += -B
 
 # CSCRIPT: path to cscript.exe (used in creating install bundles)
 ifdef ALT_CSCRIPT
@@ -561,6 +563,10 @@
   MSIVAL2    :=$(call FileExists,$(_MSIVAL2_1),$(_MSIVAL2_2))
 endif
 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)
 ifdef ALT_LOGOCUB
jdk-sandbox