archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 19:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6791649: add "SKIP_MSIVAL2=true" to the Windows section of make/jprt.config

Browse source 
Reviewed-by: tbell
This commit is contained in:
Kelly O'Hair 2009-01-31 15:26:34 -08:00
parent 60a3f5bc64
commit 614df1958c
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/jdk-rules.gmk
View file

@ -106,7 +106,7 @@ jdk-clobber::
$(MAKE) $(JDK_CLOBBER_TARGETS) $(JDK_BUILD_ARGUMENTS) ; ) $(MAKE) $(JDK_CLOBBER_TARGETS) $(JDK_BUILD_ARGUMENTS) ; )
jdk-sanity:: jdk-sanity::
@( $(CD) $(JDK_TOPDIR)/make && \ ( $(CD) $(JDK_TOPDIR)/make && \
$(MAKE) sanity HOTSPOT_IMPORT_CHECK=false $(JDK_BUILD_ARGUMENTS) ; ) $(MAKE) sanity HOTSPOT_IMPORT_CHECK=false $(JDK_BUILD_ARGUMENTS) ; )
compare-images: compare-image compare-images: compare-image

7
make/jprt.config
View file

@ -358,6 +358,13 @@ else
ALT_SPONSOR2DIR=C:/sponsor_binaries ALT_SPONSOR2DIR=C:/sponsor_binaries
export ALT_SPONSOR2DIR 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 fi
# Export PATH setting # Export PATH setting

2
make/jprt.gmk
View file

@ -36,7 +36,7 @@ DEFAULT_BUILD_FLAVOR=product
JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip
JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-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 && \ ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
ifdef HAVE_JPRT_SAVE_BUNDLES ifdef HAVE_JPRT_SAVE_BUNDLES