Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/.hgtags	Wed Jul 08 10:34:21 2009 -0700
     1.2 +++ b/.hgtags	Tue Jul 14 14:12:17 2009 -0700
     1.3 @@ -38,3 +38,4 @@
     1.4  472c21584cfd7e9c0229ad6a100366a5c03d2976 jdk7-b61
     1.5  c7ed15ab92ce36a09d264a5e34025884b2d7607f jdk7-b62
     1.6  57f7e028c7ad1806500ae89eb3f4cd9a51b10e18 jdk7-b63
     1.7 +269c1ec4435dfb7b452ae6e3bdde005d55c5c830 jdk7-b64

     2.1 --- a/make/Defs-internal.gmk	Wed Jul 08 10:34:21 2009 -0700
     2.2 +++ b/make/Defs-internal.gmk	Tue Jul 14 14:12:17 2009 -0700
     2.3 @@ -153,6 +153,20 @@
     2.4    endif
     2.5    SKIP_OPENJDK_BUILD = true
     2.6  else
     2.7 +  
     2.8 +  # Various non-OPENJDK reasons to NOT build the deploy repository
     2.9 +  ifeq ($(ARCH), ia64)
    2.10 +    BUILD_DEPLOY=false
    2.11 +  endif
    2.12 +  ifeq ($(ARCH), sparcv9)
    2.13 +    BUILD_DEPLOY=false
    2.14 +  endif
    2.15 +  ifeq ($(ARCH), amd64)
    2.16 +    ifeq ($(PLATFORM), solaris)
    2.17 +      BUILD_DEPLOY=false
    2.18 +    endif
    2.19 +  endif
    2.20 +
    2.21    ifndef SKIP_OPENJDK_BUILD
    2.22      #SKIP_OPENJDK_BUILD = false
    2.23      # Until 6675289 is resolved, or this feature is removed.

     3.1 --- a/make/deploy-rules.gmk	Wed Jul 08 10:34:21 2009 -0700
     3.2 +++ b/make/deploy-rules.gmk	Tue Jul 14 14:12:17 2009 -0700
     3.3 @@ -27,11 +27,7 @@
     3.4  # DEPLOY TARGETS
     3.5  ################################################################
     3.6  
     3.7 -ifeq ($(ARCH_DATA_MODEL), 32)
     3.8  deploy:  deploy-build
     3.9 -else
    3.10 -deploy:
    3.11 -endif
    3.12  
    3.13  DEPLOY = deploy
    3.14  
    3.15 @@ -45,7 +41,51 @@
    3.16    IMAGES_TARGET = images
    3.17  endif
    3.18  
    3.19 -DEPLOY_BUILD_TARGETS = sanity javaws-all plugin-all
    3.20 +DEPLOY_BUILD_TARGETS = sanity javaws-all plugin-all 
    3.21 +# Only build 7-Zip LZMA file compression if it is available
    3.22 +# Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available
    3.23 +ifeq ($(ARCH_DATA_MODEL), 32)
    3.24 +  ifeq ($(PLATFORM), windows)
    3.25 +    ifneq ($(KERNEL), off)
    3.26 +      EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \
    3.27 +        $(ECHO) true ; \
    3.28 +      else \
    3.29 +  $(ECHO) false ; \
    3.30 +      fi )
    3.31 +  ifeq ($(EC_TMP), true)
    3.32 +        DEPLOY_BUILD_TARGETS += extra-comp-all
    3.33 +      endif
    3.34 +    endif
    3.35 +  endif
    3.36 +endif
    3.37 +
    3.38 +ifneq ($(JQS), off)
    3.39 +  ifeq ($(ARCH_DATA_MODEL), 32)
    3.40 +    ifeq ($(PLATFORM), windows)
    3.41 +      DEPLOY_BUILD_TARGETS += jqs-all
    3.42 +    endif
    3.43 +  endif
    3.44 +endif
    3.45 +  
    3.46 +ifneq ($(KERNEL), off)
    3.47 +  ifeq ($(ARCH_DATA_MODEL), 32)
    3.48 +    ifeq ($(PLATFORM), windows)
    3.49 +      # Only set up to use UPX compression if it is available
    3.50 +      UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
    3.51 +        $(ECHO) true ; \
    3.52 +      else \
    3.53 +        $(ECHO) false ; \
    3.54 +      fi )
    3.55 +      ifeq ($(UP_TMP), true)
    3.56 +        DEPLOY_BUILD_TARGETS += cmd-comp-all
    3.57 +      endif
    3.58 +      DEPLOY_BUILD_TARGETS += kernel-all
    3.59 +    endif
    3.60 +  endif
    3.61 +endif
    3.62 +
    3.63 +
    3.64 +
    3.65  ifndef DEV_ONLY
    3.66    DEPLOY_BUILD_TARGETS += images
    3.67  else
    3.68 @@ -80,27 +120,21 @@
    3.69  endif
    3.70  
    3.71  deploy-build:
    3.72 -ifeq ($(ARCH_DATA_MODEL), 32)
    3.73 -  ifeq ($(BUILD_DEPLOY), true)
    3.74 +ifeq ($(BUILD_DEPLOY), true)
    3.75  	($(CD) $(DEPLOY_TOPDIR)/make && \
    3.76 -	  $(MAKE) $(DEPLOY_BUILD_TARGETS) $(DEPLOY_BUILD_ARGUMENTS))
    3.77 -  endif
    3.78 +	$(MAKE) $(DEPLOY_BUILD_TARGETS) $(DEPLOY_BUILD_ARGUMENTS))
    3.79  endif
    3.80  
    3.81  deploy-clobber::
    3.82 -ifeq ($(ARCH_DATA_MODEL), 32)
    3.83 -  ifeq ($(BUILD_DEPLOY), true)
    3.84 +ifeq ($(BUILD_DEPLOY), true)
    3.85  	($(CD) $(DEPLOY_TOPDIR)/make && \
    3.86 -	  $(MAKE) clobber $(DEPLOY_BUILD_ARGUMENTS))
    3.87 -  endif 
    3.88 +	$(MAKE) clobber $(DEPLOY_BUILD_ARGUMENTS))
    3.89  endif 
    3.90  
    3.91  deploy-sanity::
    3.92 -ifeq ($(ARCH_DATA_MODEL), 32)
    3.93 -  ifeq ($(BUILD_DEPLOY), true)
    3.94 +ifeq ($(BUILD_DEPLOY), true)
    3.95  	($(CD) $(DEPLOY_TOPDIR)/make && \
    3.96 -	  $(MAKE) sanity $(DEPLOY_BUILD_ARGUMENTS))
    3.97 -  endif
    3.98 +	$(MAKE) sanity $(DEPLOY_BUILD_ARGUMENTS))
    3.99  endif
   3.100  
   3.101  .PHONY: deploy deploy-build deploy-clobber deploy-sanity