Mercurial > hg > openjdk > jigsaw
changeset 635:b43aa5bd8ca5 jdk8-b74
Merge
author | katleman |
---|---|
date | Wed, 23 Jan 2013 15:40:21 -0800 |
parents | f9163f9cb1da (current diff) c3bf62746a80 (diff) |
children | cd2fa0d0ed3d 9e5847257731 |
files | |
diffstat | 2 files changed, 51 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Wed Jan 23 08:50:19 2013 -0500 +++ b/common/autoconf/generated-configure.sh Wed Jan 23 15:40:21 2013 -0800 @@ -2927,6 +2927,32 @@ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- + +# +# Copyright (c) 2012, 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 +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + # # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. # @@ -3697,7 +3723,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1358165331 +DATE_WHEN_GENERATED=1358499442 ############################################################################### #
--- a/common/makefiles/Jprt.gmk Wed Jan 23 08:50:19 2013 -0500 +++ b/common/makefiles/Jprt.gmk Wed Jan 23 15:40:21 2013 -0800 @@ -43,24 +43,20 @@ BUILD_DIR_ROOT:=$(root_dir)/build -# Appears to be an open build -OPEN_BUILD := \ -$(shell \ - if [ -d $(root_dir)/jdk/src/closed \ - -o -d $(root_dir)/jdk/make/closed \ - -o -d $(root_dir)/jdk/test/closed \ - -o -d $(root_dir)/hotspot/src/closed \ - -o -d $(root_dir)/hotspot/make/closed \ - -o -d $(root_dir)/hotspot/test/closed ] ; then \ - echo "false"; \ - else \ - echo "true"; \ - fi \ - ) ifdef OPENJDK OPEN_BUILD=true +else + OPEN_BUILD := $(if $(or $(wildcard $(root_dir)/jdk/src/closed), \ + $(wildcard $(root_dir)/jdk/make/closed), \ + $(wildcard $(root_dir)/jdk/test/closed), \ + $(wildcard $(root_dir)/hotspot/src/closed), \ + $(wildcard $(root_dir)/hotspot/make/closed), \ + $(wildcard $(root_dir)/hotspot/test/closed)), \ + false,true) endif +HOTSPOT_AVAILABLE := $(if $(wildcard $(root_dir)/hotspot),true,false) + ########################################################################### # To help in adoption of the new configure&&make build process, a bridge # build will use the old settings to run configure and do the build. @@ -103,6 +99,11 @@ ifdef ALT_FREETYPE_HEADERS_PATH @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp endif +ifeq ($(HOTSPOT_AVAILABLE),false) + ifdef ALT_JDK_IMPORT_PATH + @$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp + endif +endif ifeq ($(OPEN_BUILD),true) @$(ECHO) " --enable-openjdk-only " >> $@.tmp else @@ -128,6 +129,9 @@ ifdef ALT_SLASH_JAVA @$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp endif + ifdef ALT_SPARKLE_FRAMEWORK_DIR + @$(ECHO) " --with-sparkle-framework=$(call UnixPath,$(ALT_SPARKLE_FRAMEWORK_DIR)) " >> $@.tmp + endif endif @if [ -f $@ ] ; then \ if ! $(CMP) $@ $@.tmp > /dev/null ; then \ @@ -146,6 +150,9 @@ ifndef JPRT_ARCHIVE_BUNDLE JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip endif +ifndef JPRT_ARCHIVE_INSTALL_BUNDLE + JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip +endif # These targets execute in a SPEC free context, before calling bridgeBuild # to generate the SPEC. @@ -184,6 +191,9 @@ else $(CD) $(JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip . $(CD) $(JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip . + if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \ + $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \ + fi endif @$(call TargetExit)