jdk8-mips64-public: changeset 94:c50469cf63cd

6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
6845973: Update JDK7 with deployment changes in 6u13, 6u14
4802695: Support 64-bit Java Plug-in and Java webstart on Windows/Linux on AMD64
6825019: DownloadManager should not be loaded and referenced for full JRE
6738770: REGRESSION:JSException throws when use LiveConnect javascript facility
6772884: plugin2 : java.lang.OutOfMemoryError or crash
6707535: Crossing domain hole affecting multiple sites/domains using plug-in
6728071: Non-verification of Update files may allow unintended updates
6704154: Code loaded from local filesystem should not get access to localhost
6727081: Web Start security restrictions bypass using special extension jnlp
6727079: Java Web Start Socket() restriction bypass
6727071: Cache location/user name information disclosure in SingleInstanceImpl.
6716217: AppletClassLoader adds permissions based on codebase regardless of CS
6694892: Java Webstart inclusion via system properties override [CVE-2008-2086]
6704074: localhost socket access due to cache location exposed
6703909: Java webstart arbitrary file creation using nativelib
6665315: browser crashes when deployment.properties has more slashes ( / )
6660121: Encoding values in JNLP files can cause buffer overflow
6606110: URLConnection.setProxiedHost for resources that are loaded via proxy
6581221: SSV(VISTA): Redirection FAILS to work if user does a downgrade install
6609756: Buffer Overflow in Java ActiveX component
6608712: Bypassing the same origin policy in Java with crafted names
6534630: "gnumake clobber" doesn't
6849953: JDK7 - replacement of bufferoverflowU.lib on amd64 breaks build
6849029: Need some JDK7 merge clean-up after comments on the webrev
6847582: Build problem on JDK7 with isSecureProperty in merge
6827935: JDK 7 deployment merging - problem in Compiler-msvm.gmk
6823215: latest merge fixes from 6u12 -> JDK7
6816153: further mergers for JDK7 deployment integration
6807074: Fix Java Kernel and JQS in initial JDK7 builds
Summary: Initial changeset for implementing 6uX Deployment Features into JDK7
Reviewed-by: dgu, billyh

     1.1 --- a/make/deploy-rules.gmk	Thu May 14 10:57:55 2009 -0700
     1.2 +++ b/make/deploy-rules.gmk	Thu Jun 11 15:15:49 2009 -0400
     1.3 @@ -27,13 +27,26 @@
     1.4  # DEPLOY TARGETS
     1.5  ################################################################
     1.6  
     1.7 -ifeq ($(ARCH_DATA_MODEL), 32)
     1.8  deploy:  deploy-build
     1.9 -else
    1.10 -deploy:
    1.11 +
    1.12 +DEPLOY = deploy
    1.13 +
    1.14 +BUILD_DEPLOY=true
    1.15 +
    1.16 +ifeq ($(ARCH), ia64) 
    1.17 +  BUILD_DEPLOY=false
    1.18  endif
    1.19  
    1.20 -DEPLOY = deploy
    1.21 +ifeq ($(ARCH), sparcv9)
    1.22 +  BUILD_DEPLOY=false;
    1.23 +endif
    1.24 +
    1.25 +ifeq ($(ARCH), amd64)
    1.26 +  ifeq ($(PLATFORM), solaris)
    1.27 +    BUILD_DEPLOY=false
    1.28 +  endif
    1.29 +endif
    1.30 +
    1.31  
    1.32  # put the generated bundles in their own place in OUTPUTDIR
    1.33  DEPLOY_OUTPUTDIR = $(ABS_OUTPUTDIR)
    1.34 @@ -45,7 +58,51 @@
    1.35    IMAGES_TARGET = images
    1.36  endif
    1.37  
    1.38 -DEPLOY_BUILD_TARGETS = sanity javaws-all plugin-all
    1.39 +DEPLOY_BUILD_TARGETS = sanity javaws-all plugin-all 
    1.40 +# Only build 7-Zip LZMA file compression if it is available
    1.41 +# Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available
    1.42 +ifeq ($(ARCH_DATA_MODEL), 32)
    1.43 +  ifeq ($(PLATFORM), windows)
    1.44 +    ifneq ($(KERNEL), off)
    1.45 +      EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \
    1.46 +        $(ECHO) true ; \
    1.47 +      else \
    1.48 +  $(ECHO) false ; \
    1.49 +      fi )
    1.50 +  ifeq ($(EC_TMP), true)
    1.51 +        DEPLOY_BUILD_TARGETS += extra-comp-all
    1.52 +      endif
    1.53 +    endif
    1.54 +  endif
    1.55 +endif
    1.56 +
    1.57 +ifneq ($(JQS), off)
    1.58 +  ifeq ($(ARCH_DATA_MODEL), 32)
    1.59 +    ifeq ($(PLATFORM), windows)
    1.60 +      DEPLOY_BUILD_TARGETS += jqs-all
    1.61 +    endif
    1.62 +  endif
    1.63 +endif
    1.64 +  
    1.65 +ifneq ($(KERNEL), off)
    1.66 +  ifeq ($(ARCH_DATA_MODEL), 32)
    1.67 +    ifeq ($(PLATFORM), windows)
    1.68 +      # Only set up to use UPX compression if it is available
    1.69 +      UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
    1.70 +        $(ECHO) true ; \
    1.71 +      else \
    1.72 +        $(ECHO) false ; \
    1.73 +      fi )
    1.74 +      ifeq ($(UP_TMP), true)
    1.75 +        DEPLOY_BUILD_TARGETS += cmd-comp-all
    1.76 +      endif
    1.77 +      DEPLOY_BUILD_TARGETS += kernel-all
    1.78 +    endif
    1.79 +  endif
    1.80 +endif
    1.81 +
    1.82 +
    1.83 +
    1.84  ifndef DEV_ONLY
    1.85    DEPLOY_BUILD_TARGETS += images
    1.86  else
    1.87 @@ -80,27 +137,21 @@
    1.88  endif
    1.89  
    1.90  deploy-build:
    1.91 -ifeq ($(ARCH_DATA_MODEL), 32)
    1.92 -  ifeq ($(BUILD_DEPLOY), true)
    1.93 +ifeq ($(BUILD_DEPLOY), true)
    1.94  	($(CD) $(DEPLOY_TOPDIR)/make && \
    1.95 -	  $(MAKE) $(DEPLOY_BUILD_TARGETS) $(DEPLOY_BUILD_ARGUMENTS))
    1.96 -  endif
    1.97 +	$(MAKE) $(DEPLOY_BUILD_TARGETS) $(DEPLOY_BUILD_ARGUMENTS))
    1.98  endif
    1.99  
   1.100  deploy-clobber::
   1.101 -ifeq ($(ARCH_DATA_MODEL), 32)
   1.102 -  ifeq ($(BUILD_DEPLOY), true)
   1.103 +ifeq ($(BUILD_DEPLOY), true)
   1.104  	($(CD) $(DEPLOY_TOPDIR)/make && \
   1.105 -	  $(MAKE) clobber $(DEPLOY_BUILD_ARGUMENTS))
   1.106 -  endif 
   1.107 +	$(MAKE) clobber $(DEPLOY_BUILD_ARGUMENTS))
   1.108  endif 
   1.109  
   1.110  deploy-sanity::
   1.111 -ifeq ($(ARCH_DATA_MODEL), 32)
   1.112 -  ifeq ($(BUILD_DEPLOY), true)
   1.113 +ifeq ($(BUILD_DEPLOY), true)
   1.114  	($(CD) $(DEPLOY_TOPDIR)/make && \
   1.115 -	  $(MAKE) sanity $(DEPLOY_BUILD_ARGUMENTS))
   1.116 -  endif
   1.117 +	$(MAKE) sanity $(DEPLOY_BUILD_ARGUMENTS))
   1.118  endif
   1.119  
   1.120  .PHONY: deploy deploy-build deploy-clobber deploy-sanity

Mercurial > jdk8-mips64-public / changeset

changeset

6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7