diff options
| author | ohair <none@none> | 2009-01-31 15:26:34 -0800 |
|---|---|---|
| committer | ohair <none@none> | 2009-01-31 15:26:34 -0800 |
| commit | a6c327834ffc0ef17bd7e70bd43fc1c543a2d749 (patch) | |
| tree | d8d00992372f0843737d62f32067990de9924867 | |
| parent | 8a598cc2b44cfb30aee06d5eb23b2e5d54a4d27c (diff) | |
6791649: add "SKIP_MSIVAL2=true" to the Windows section of make/jprt.config
Reviewed-by: tbell
| -rw-r--r-- | make/jdk-rules.gmk | 2 | ||||
| -rw-r--r-- | make/jprt.config | 7 | ||||
| -rw-r--r-- | make/jprt.gmk | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/make/jdk-rules.gmk b/make/jdk-rules.gmk index 821f5d7..d0ca905 100644 --- a/make/jdk-rules.gmk +++ b/make/jdk-rules.gmk @@ -106,7 +106,7 @@ jdk-clobber:: $(MAKE) $(JDK_CLOBBER_TARGETS) $(JDK_BUILD_ARGUMENTS) ; ) jdk-sanity:: - @( $(CD) $(JDK_TOPDIR)/make && \ + ( $(CD) $(JDK_TOPDIR)/make && \ $(MAKE) sanity HOTSPOT_IMPORT_CHECK=false $(JDK_BUILD_ARGUMENTS) ; ) compare-images: compare-image diff --git a/make/jprt.config b/make/jprt.config index f3ff506..895d943 100644 --- a/make/jprt.config +++ b/make/jprt.config @@ -358,6 +358,13 @@ else ALT_SPONSOR2DIR=C:/sponsor_binaries export ALT_SPONSOR2DIR + # JPRT systems can never run msival2.exe, set this to avoid them + SKIP_MSIVAL2=true + export SKIP_MSIVAL2 + # Not easy to do + SKIP_COMPARE_IMAGES=true + export SKIP_COMPARE_IMAGES + fi # Export PATH setting diff --git a/make/jprt.gmk b/make/jprt.gmk index fcf67f8..32803e0 100644 --- a/make/jprt.gmk +++ b/make/jprt.gmk @@ -36,7 +36,7 @@ DEFAULT_BUILD_FLAVOR=product JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-bundle.zip -jprt_build_product: all_product_build +jprt_build_product: sanity all_product_build ( $(CD) $(OUTPUTDIR)/j2sdk-image && \ $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) ifdef HAVE_JPRT_SAVE_BUNDLES |