Mercurial > hg > release > icedtea7-forest-2.0 > jdk
changeset 3579:4241588a12c3
7008047: remove sanity check of msival tool from JDK tree
Reviewed-by: billyh
| author | ohair |
|---|---|
| date | Thu, 13 Jan 2011 13:49:18 -0800 |
| parents | 523386cfb731 |
| children | 81e66ce6f501 |
| files | make/common/shared/Defs-windows.gmk make/common/shared/Sanity-Settings.gmk make/common/shared/Sanity.gmk |
| diffstat | 3 files changed, 0 insertions(+), 67 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/shared/Defs-windows.gmk Mon Jan 10 22:26:47 2011 -0800 +++ b/make/common/shared/Defs-windows.gmk Thu Jan 13 13:49:18 2011 -0800 @@ -641,15 +641,6 @@ endif INSTALL_MSSDK:=$(call AltCheckSpaces,INSTALL_MSSDK) -# INSTALL_MSIVAL2: Installation of MsiVal2 for this platform (for install) -ifdef ALT_INSTALL_MSIVAL2 - xALT_INSTALL_MSIVAL2 :="$(subst \,/,$(ALT_INSTALL_MSIVAL2))" - INSTALL_MSIVAL2 :=$(call FullPath,$(xALT_INSTALL_MSIVAL2)) -else - INSTALL_MSIVAL2 :=$(_program_files32)/MsiVal2 -endif -INSTALL_MSIVAL2:=$(call AltCheckSpaces,INSTALL_MSIVAL2) - # WSCRIPT: path to wscript.exe (used in creating install bundles) ifdef ALT_WSCRIPT xALT_WSCRIPT :="$(subst \,/,$(ALT_WSCRIPT))" @@ -685,43 +676,6 @@ endif CABARC:=$(call AltCheckSpaces,CABARC) -# MSIVAL2: path to msival2.exe (used in validating install msi files) -ifdef ALT_MSIVAL2 - xALT_MSIVAL2 :="$(subst \,/,$(ALT_MSIVAL2))" - MSIVAL2 =$(xALT_MSIVAL2) -else - _MSIVAL2_1 :=$(INSTALL_MSIVAL2)/msival2.exe - _MSIVAL2_2 :=$(DEVTOOLS_PATH)msival2.exe - MSIVAL2 :=$(call FileExists,$(_MSIVAL2_1),$(_MSIVAL2_2)) -endif -MSIVAL2:=$(call AltCheckSpaces,MSIVAL2) -# suppress msival2 checks, as it hangs jprt builds -ifdef SKIP_MSIVAL2 - MSIVAL2 := $(ECHO) -endif - -# LOGOCUB: path to cub file for (used in validating install msi files) -ifdef ALT_LOGOCUB - xALT_LOGOCUB :="$(subst \,/,$(ALT_LOGOCUB))" - LOGOCUB =$(xALT_LOGOCUB) -else - _LOGOCUB1 :=$(INSTALL_MSIVAL2)/logo.cub - _LOGOCUB2 :=$(DEVTOOLS_PATH)logo.cub - LOGOCUB :=$(call FileExists,$(_LOGOCUB1),$(_LOGOCUB2)) -endif -LOGOCUB:=$(call AltCheckSpaces,LOGOCUB) - -# MSITRAN: path to msitran.exe (used in creating install bundles and sponsors) -ifdef ALT_MSITRAN - xALT_MSITRAN :="$(subst \,/,$(ALT_MSITRAN))" - MSITRAN =$(xALT_MSITRAN) -else - _MSITRAN1 :=$(INSTALL_MSSDK)/Bin/msitran.exe - _MSITRAN2 :=$(DEVTOOLS_PATH)msitran.exe - MSITRAN :=$(call FileExists,$(_MSITRAN1),$(_MSITRAN2)) -endif -MSITRAN:=$(call AltCheckSpaces,MSITRAN) - # MSICERT: path to msicert.exe (used in creating install bundles) ifdef ALT_MSICERT xALT_MSICERT :="$(subst \,/,$(ALT_MSICERT))"
--- a/make/common/shared/Sanity-Settings.gmk Mon Jan 10 22:26:47 2011 -0800 +++ b/make/common/shared/Sanity-Settings.gmk Thu Jan 13 13:49:18 2011 -0800 @@ -236,8 +236,6 @@ ALL_SETTINGS+=$(call addAltSetting,INSTALL_MSSDK) ALL_SETTINGS+=$(call addAltSetting,WSCRIPT) ALL_SETTINGS+=$(call addAltSetting,MSICERT) - ALL_SETTINGS+=$(call addAltSetting,MSITRAN) - ALL_SETTINGS+=$(call addAltSetting,MSIVAL2) endif endif ALL_SETTINGS+=$(call addAltSetting,CACERTS_FILE)
--- a/make/common/shared/Sanity.gmk Mon Jan 10 22:26:47 2011 -0800 +++ b/make/common/shared/Sanity.gmk Thu Jan 13 13:49:18 2011 -0800 @@ -1476,25 +1476,6 @@ endif ###################################################### -# Check for existence of INSTALL_MSIVAL2 on windows -###################################################### -sane-install-msival2_path: -ifeq ($(PLATFORM), windows) - @if [ -z "$(INSTALL_MSIVAL2)" ]; then \ - $(ECHO) "WARNING: Your INSTALL_MSIVAL2 setting is empty.\n" \ - " It is recommended to set ALT_INSTALL_MSIVAL2.\n" \ - "" >> $(WARNING_FILE) ; \ - fi - @if [ ! -r "$(INSTALL_MSIVAL2)" ]; then \ - $(ECHO) "ERROR: You do not have a valid INSTALL_MSIVAL2 setting. \n" \ - " Please check your access to \n" \ - " $(INSTALL_MSIVAL2) \n" \ - " and/or check your value of ALT_INSTALL_MSIVAL2. \n" \ - "" >> $(ERROR_FILE) ; \ - fi -endif - -###################################################### # Check the GNU C++ compiler for OJI plugin ###################################################### sane-gcc-compiler: