6791649: add "SKIP_MSIVAL2=true" to the Windows section of make/jprt.config
Reviewed-by: tbell
--- a/make/jdk-rules.gmk Wed Jul 05 16:45:38 2017 +0200
+++ b/make/jdk-rules.gmk Sat Jan 31 15:26:34 2009 -0800
@@ -106,7 +106,7 @@
$(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
--- a/make/jprt.config Wed Jul 05 16:45:38 2017 +0200
+++ b/make/jprt.config Sat Jan 31 15:26:34 2009 -0800
@@ -358,6 +358,13 @@
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
--- a/make/jprt.gmk Wed Jul 05 16:45:38 2017 +0200
+++ b/make/jprt.gmk Sat Jan 31 15:26:34 2009 -0800
@@ -36,7 +36,7 @@
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