Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/makefiles/Jprt.gmk	Wed Sep 25 12:21:35 2013 -0700
     1.2 +++ b/common/makefiles/Jprt.gmk	Fri Sep 27 16:27:34 2013 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10 @@ -200,13 +200,8 @@
    1.11  	$(RM) $@
    1.12  	$(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@
    1.13  
    1.14 -ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
    1.15 -  SRC_JDK_IMAGE_DIR := $(JDK_OVERLAY_IMAGE_DIR)
    1.16 -  SRC_JRE_IMAGE_DIR := $(JRE_OVERLAY_IMAGE_DIR)
    1.17 -else
    1.18 -  SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
    1.19 -  SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR)
    1.20 -endif
    1.21 +SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
    1.22 +SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR)
    1.23  SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR)
    1.24  SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR)
    1.25  
    1.26 @@ -215,10 +210,10 @@
    1.27  bundles-only: start-make
    1.28  	@$(call TargetEnter)
    1.29  	$(MKDIR) -p $(BUILD_OUTPUT)/bundles
    1.30 -	$(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
    1.31 -	$(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip .
    1.32 +	$(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
    1.33 +	$(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip .
    1.34  	if [ -d  $(BUILD_OUTPUT)/install/bundles ] ; then \
    1.35 -           $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
    1.36 +           $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
    1.37          fi
    1.38  	@$(call TargetExit)
    1.39  

     2.1 --- a/common/makefiles/Main.gmk	Wed Sep 25 12:21:35 2013 -0700
     2.2 +++ b/common/makefiles/Main.gmk	Fri Sep 27 16:27:34 2013 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  #
     2.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     2.6 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
     2.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8  #
     2.9  # This code is free software; you can redistribute it and/or modify it
    2.10 @@ -68,10 +68,6 @@
    2.11  all: images docs
    2.12  	@$(call CheckIfMakeAtEnd)
    2.13  
    2.14 -ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
    2.15 -  all: overlay-images
    2.16 -endif
    2.17 -
    2.18  # Setup a rule for SPEC file that fails if executed. This check makes sure the configuration
    2.19  # is up to date after changes to configure
    2.20  $(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*)