From 614df1958ca812c31f6097489ef348de9f90a5a8 Mon Sep 17 00:00:00 2001
From: Kelly O'Hair <ohair@openjdk.org>
Date: Sat, 31 Jan 2009 15:26:34 -0800
Subject: [PATCH] 6791649: add "SKIP_MSIVAL2=true" to the Windows section of
 make/jprt.config

Reviewed-by: tbell
---
 make/jdk-rules.gmk | 2 +-
 make/jprt.config   | 7 +++++++
 make/jprt.gmk      | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/make/jdk-rules.gmk b/make/jdk-rules.gmk
index 821f5d739c6..d0ca905ff02 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 f3ff50615ef..895d9432e01 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 fcf67f80b36..32803e06256 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