Mercurial > hg > openjdk > lambda
changeset 672:2f8fd30f02e6
Merge
author | dholmes |
---|---|
date | Tue, 22 Jan 2013 19:30:52 -0500 |
parents | 7ed0c9db6943 (current diff) edad83acbd46 (diff) |
children | bebeaa04ab8e |
files | common/autoconf/generated-configure.sh |
diffstat | 2 files changed, 19 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Mon Jan 21 01:50:40 2013 -0500 +++ b/common/autoconf/generated-configure.sh Tue Jan 22 19:30:52 2013 -0500 @@ -3731,7 +3731,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1358742326 +DATE_WHEN_GENERATED=1358901036 ############################################################################### #
--- a/common/makefiles/Jprt.gmk Mon Jan 21 01:50:40 2013 -0500 +++ b/common/makefiles/Jprt.gmk Tue Jan 22 19:30:52 2013 -0500 @@ -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 \