Mergejdk7-b65

3 files changed, 66 insertions, 17 deletions

diff --git a/.hgtags b/.hgtags
index fab0cb0..6b4351e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -38,3 +38,4 @@ ffd09e767dfa6d21466183a400f72cf62d53297f jdk7-b57
 472c21584cfd7e9c0229ad6a100366a5c03d2976 jdk7-b61
 c7ed15ab92ce36a09d264a5e34025884b2d7607f jdk7-b62
 57f7e028c7ad1806500ae89eb3f4cd9a51b10e18 jdk7-b63
+269c1ec4435dfb7b452ae6e3bdde005d55c5c830 jdk7-b64
diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk
index fc18e7f..c35907c 100644
--- a/make/Defs-internal.gmk
+++ b/make/Defs-internal.gmk
@@ -153,6 +153,20 @@ ifdef OPENJDK
   endif
   SKIP_OPENJDK_BUILD = true
 else
+  
+  # Various non-OPENJDK reasons to NOT build the deploy repository
+  ifeq ($(ARCH), ia64)
+    BUILD_DEPLOY=false
+  endif
+  ifeq ($(ARCH), sparcv9)
+    BUILD_DEPLOY=false
+  endif
+  ifeq ($(ARCH), amd64)
+    ifeq ($(PLATFORM), solaris)
+      BUILD_DEPLOY=false
+    endif
+  endif
+
   ifndef SKIP_OPENJDK_BUILD
     #SKIP_OPENJDK_BUILD = false
     # Until 6675289 is resolved, or this feature is removed.
diff --git a/make/deploy-rules.gmk b/make/deploy-rules.gmk
index fd07867..2884601 100644
--- a/make/deploy-rules.gmk
+++ b/make/deploy-rules.gmk
@@ -27,11 +27,7 @@
 # DEPLOY TARGETS
 ################################################################
 
-ifeq ($(ARCH_DATA_MODEL), 32)
 deploy:  deploy-build
-else
-deploy:
-endif
 
 DEPLOY = deploy
 
@@ -45,7 +41,51 @@ else
   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 +120,21 @@ ifdef PKEY
 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