diff options
| author | tbell <none@none> | 2008-08-25 23:33:24 -0700 |
|---|---|---|
| committer | tbell <none@none> | 2008-08-25 23:33:24 -0700 |
| commit | 98b534f62ee12e5fdd6866009560cc1c207d8578 (patch) | |
| tree | 8f2af5de0325fc251003fbae524be4d9d7d5a273 | |
| parent | 572a1fc902e74a00950a687de61b05021a6f2ab9 (diff) | |
| parent | eb73b0e8ace4ebf248f3243cdb41ab1f3d528cbf (diff) | |
Merge
| -rw-r--r-- | make/common/shared/Defs-windows.gmk | 6 | ||||
| -rw-r--r-- | make/jprt.properties | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/make/common/shared/Defs-windows.gmk b/make/common/shared/Defs-windows.gmk index 250604136..d0be243d8 100644 --- a/make/common/shared/Defs-windows.gmk +++ b/make/common/shared/Defs-windows.gmk @@ -539,6 +539,8 @@ else 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 @@ else 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 diff --git a/make/jprt.properties b/make/jprt.properties index 06abef8c8..e6666cb1d 100644 --- a/make/jprt.properties +++ b/make/jprt.properties @@ -55,6 +55,5 @@ jprt.solaris_x64.build.platform.match32=solaris_i586_5.10 jprt.test.targets=*-*-*-jvm98 # Directories needed to build -jprt.bundle.src.dirs=make src jprt.bundle.exclude.src.dirs=build |