changeset 92: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
author herrick
date Thu, 11 Jun 2009 15:15:49 -0400
parents 0d76c4da605f
children c7c4850f1478
files make/deploy-rules.gmk
diffstat 1 files changed, 68 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/make/deploy-rules.gmk	Thu May 14 10:57:55 2009 -0700
+++ b/make/deploy-rules.gmk	Thu Jun 11 15:15:49 2009 -0400
@@ -27,13 +27,26 @@
 # DEPLOY TARGETS
 ################################################################
 
-ifeq ($(ARCH_DATA_MODEL), 32)
 deploy:  deploy-build
-else
-deploy:
+
+DEPLOY = deploy
+
+BUILD_DEPLOY=true
+
+ifeq ($(ARCH), ia64) 
+  BUILD_DEPLOY=false
 endif
 
-DEPLOY = deploy
+ifeq ($(ARCH), sparcv9)
+  BUILD_DEPLOY=false;
+endif
+
+ifeq ($(ARCH), amd64)
+  ifeq ($(PLATFORM), solaris)
+    BUILD_DEPLOY=false
+  endif
+endif
+
 
 # put the generated bundles in their own place in OUTPUTDIR
 DEPLOY_OUTPUTDIR = $(ABS_OUTPUTDIR)
@@ -45,7 +58,51 @@
   IMAGES_TARGET = images
 endif
 
-DEPLOY_BUILD_TARGETS = sanity javaws-all plugin-all
+DEPLOY_BUILD_TARGETS = sanity javaws-all plugin-all 
+# Only build 7-Zip LZMA file compression if it is available
+# Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available
+ifeq ($(ARCH_DATA_MODEL), 32)
+  ifeq ($(PLATFORM), windows)
+    ifneq ($(KERNEL), off)
+      EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \
+        $(ECHO) true ; \
+      else \
+  $(ECHO) false ; \
+      fi )
+  ifeq ($(EC_TMP), true)
+        DEPLOY_BUILD_TARGETS += extra-comp-all
+      endif
+    endif
+  endif
+endif
+
+ifneq ($(JQS), off)
+  ifeq ($(ARCH_DATA_MODEL), 32)
+    ifeq ($(PLATFORM), windows)
+      DEPLOY_BUILD_TARGETS += jqs-all
+    endif
+  endif
+endif
+  
+ifneq ($(KERNEL), off)
+  ifeq ($(ARCH_DATA_MODEL), 32)
+    ifeq ($(PLATFORM), windows)
+      # Only set up to use UPX compression if it is available
+      UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
+        $(ECHO) true ; \
+      else \
+        $(ECHO) false ; \
+      fi )
+      ifeq ($(UP_TMP), true)
+        DEPLOY_BUILD_TARGETS += cmd-comp-all
+      endif
+      DEPLOY_BUILD_TARGETS += kernel-all
+    endif
+  endif
+endif
+
+
+
 ifndef DEV_ONLY
   DEPLOY_BUILD_TARGETS += images
 else
@@ -80,27 +137,21 @@
 endif
 
 deploy-build:
-ifeq ($(ARCH_DATA_MODEL), 32)
-  ifeq ($(BUILD_DEPLOY), true)
+ifeq ($(BUILD_DEPLOY), true)
 	($(CD) $(DEPLOY_TOPDIR)/make && \
-	  $(MAKE) $(DEPLOY_BUILD_TARGETS) $(DEPLOY_BUILD_ARGUMENTS))
-  endif
+	$(MAKE) $(DEPLOY_BUILD_TARGETS) $(DEPLOY_BUILD_ARGUMENTS))
 endif
 
 deploy-clobber::
-ifeq ($(ARCH_DATA_MODEL), 32)
-  ifeq ($(BUILD_DEPLOY), true)
+ifeq ($(BUILD_DEPLOY), true)
 	($(CD) $(DEPLOY_TOPDIR)/make && \
-	  $(MAKE) clobber $(DEPLOY_BUILD_ARGUMENTS))
-  endif 
+	$(MAKE) clobber $(DEPLOY_BUILD_ARGUMENTS))
 endif 
 
 deploy-sanity::
-ifeq ($(ARCH_DATA_MODEL), 32)
-  ifeq ($(BUILD_DEPLOY), true)
+ifeq ($(BUILD_DEPLOY), true)
 	($(CD) $(DEPLOY_TOPDIR)/make && \
-	  $(MAKE) sanity $(DEPLOY_BUILD_ARGUMENTS))
-  endif
+	$(MAKE) sanity $(DEPLOY_BUILD_ARGUMENTS))
 endif
 
 .PHONY: deploy deploy-build deploy-clobber deploy-sanity