changeset 499:9f53e194687c

Merge
author tbell
date Mon, 25 Aug 2008 23:33:24 -0700
parents 1b114828900b 434055a0716e
children c5f211538cad
files
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/shared/Defs-windows.gmk	Tue Aug 19 16:05:26 2008 -0700
+++ b/make/common/shared/Defs-windows.gmk	Mon Aug 25 23:33:24 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
--- a/make/jprt.properties	Tue Aug 19 16:05:26 2008 -0700
+++ b/make/jprt.properties	Mon Aug 25 23:33:24 2008 -0700
@@ -55,6 +55,5 @@
 jprt.test.targets=*-*-*-jvm98
 
 # Directories needed to build
-jprt.bundle.src.dirs=make src
 jprt.bundle.exclude.src.dirs=build