make/deploy-rules.gmk

*** 1,7 ****
  #
! # Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 40,88 ****
  else
    IMAGES_TARGET = images
  endif
  
  DEPLOY_BUILD_TARGETS = sanity deploy 
- # 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)
-       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
  
  ifneq ($(JQS), off)
    ifeq ($(ARCH_DATA_MODEL), 32)
      ifeq ($(PLATFORM), windows)
        DEPLOY_BUILD_TARGETS += jqs-all
      endif
    endif
  endif
  
- 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
-   endif
- endif
- 
- 
- 
  ifndef DEV_ONLY
    DEPLOY_BUILD_TARGETS += images
  else
    DEPLOY_BUILD_TARGETS += $(IMAGES_TARGET)
  endif
--- 40,58 ----