changeset 70:3398ae556a2a

6791649: add "SKIP_MSIVAL2=true" to the Windows section of make/jprt.config Reviewed-by: tbell
author ohair
date Sat, 31 Jan 2009 15:26:34 -0800
parents a395e3aac474
children a4fd1a33eb93
files make/jdk-rules.gmk make/jprt.config make/jprt.gmk
diffstat 3 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/jdk-rules.gmk	Thu Jan 15 11:46:22 2009 -0800
+++ 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	Thu Jan 15 11:46:22 2009 -0800
+++ 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	Thu Jan 15 11:46:22 2009 -0800
+++ 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