Sat, 31 Jan 2009 15:26:34 -0800
6791649: add "SKIP_MSIVAL2=true" to the Windows section of make/jprt.config
Reviewed-by: tbell
make/jdk-rules.gmk | file | annotate | diff | comparison | revisions | |
make/jprt.config | file | annotate | diff | comparison | revisions | |
make/jprt.gmk | file | annotate | diff | comparison | revisions |
1.1 --- a/make/jdk-rules.gmk Thu Jan 15 11:46:22 2009 -0800 1.2 +++ b/make/jdk-rules.gmk Sat Jan 31 15:26:34 2009 -0800 1.3 @@ -106,7 +106,7 @@ 1.4 $(MAKE) $(JDK_CLOBBER_TARGETS) $(JDK_BUILD_ARGUMENTS) ; ) 1.5 1.6 jdk-sanity:: 1.7 - @( $(CD) $(JDK_TOPDIR)/make && \ 1.8 + ( $(CD) $(JDK_TOPDIR)/make && \ 1.9 $(MAKE) sanity HOTSPOT_IMPORT_CHECK=false $(JDK_BUILD_ARGUMENTS) ; ) 1.10 1.11 compare-images: compare-image
2.1 --- a/make/jprt.config Thu Jan 15 11:46:22 2009 -0800 2.2 +++ b/make/jprt.config Sat Jan 31 15:26:34 2009 -0800 2.3 @@ -358,6 +358,13 @@ 2.4 ALT_SPONSOR2DIR=C:/sponsor_binaries 2.5 export ALT_SPONSOR2DIR 2.6 2.7 + # JPRT systems can never run msival2.exe, set this to avoid them 2.8 + SKIP_MSIVAL2=true 2.9 + export SKIP_MSIVAL2 2.10 + # Not easy to do 2.11 + SKIP_COMPARE_IMAGES=true 2.12 + export SKIP_COMPARE_IMAGES 2.13 + 2.14 fi 2.15 2.16 # Export PATH setting
3.1 --- a/make/jprt.gmk Thu Jan 15 11:46:22 2009 -0800 3.2 +++ b/make/jprt.gmk Sat Jan 31 15:26:34 2009 -0800 3.3 @@ -36,7 +36,7 @@ 3.4 JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip 3.5 JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-bundle.zip 3.6 3.7 -jprt_build_product: all_product_build 3.8 +jprt_build_product: sanity all_product_build 3.9 ( $(CD) $(OUTPUTDIR)/j2sdk-image && \ 3.10 $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) 3.11 ifdef HAVE_JPRT_SAVE_BUNDLES