1.1 --- a/common/makefiles/Jprt.gmk Fri Jan 04 16:56:37 2013 +0100 1.2 +++ b/common/makefiles/Jprt.gmk Fri Jan 04 17:05:13 2013 +0100 1.3 @@ -42,6 +42,24 @@ 1.4 1.5 BUILD_DIR_ROOT:=$(root_dir)/build 1.6 1.7 +# Appears to be an open build 1.8 +OPEN_BUILD := \ 1.9 +$(shell \ 1.10 + if [ -d $(root_dir)/jdk/src/closed \ 1.11 + -o -d $(root_dir)/jdk/make/closed \ 1.12 + -o -d $(root_dir)/jdk/test/closed \ 1.13 + -o -d $(root_dir)/hotspot/src/closed \ 1.14 + -o -d $(root_dir)/hotspot/make/closed \ 1.15 + -o -d $(root_dir)/hotspot/test/closed ] ; then \ 1.16 + echo "false"; \ 1.17 + else \ 1.18 + echo "true"; \ 1.19 + fi \ 1.20 + ) 1.21 +ifdef OPENJDK 1.22 + OPEN_BUILD=true 1.23 +endif 1.24 + 1.25 ########################################################################### 1.26 # To help in adoption of the new configure&&make build process, a bridge 1.27 # build will use the old settings to run configure and do the build. 1.28 @@ -84,30 +102,31 @@ 1.29 ifdef ALT_FREETYPE_HEADERS_PATH 1.30 @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp 1.31 endif 1.32 -ifdef OPENJDK 1.33 +ifeq ($(OPEN_BUILD),true) 1.34 @$(ECHO) " --enable-openjdk-only " >> $@.tmp 1.35 -endif 1.36 -# Todo: move to closed? 1.37 -ifdef ALT_MOZILLA_HEADERS_PATH 1.38 +else 1.39 + # Todo: move to closed? 1.40 + ifdef ALT_MOZILLA_HEADERS_PATH 1.41 @$(ECHO) " --with-mozilla-headers=$(call UnixPath,$(ALT_MOZILLA_HEADERS_PATH)) " >> $@.tmp 1.42 -endif 1.43 -ifdef ALT_JUNIT_DIR 1.44 + endif 1.45 + ifdef ALT_JUNIT_DIR 1.46 @$(ECHO) " --with-junit-dir=$(call UnixPath,$(ALT_JUNIT_DIR)) " >> $@.tmp 1.47 -endif 1.48 -ifdef ANT_HOME 1.49 + endif 1.50 + ifdef ANT_HOME 1.51 @$(ECHO) " --with-ant-home=$(call UnixPath,$(ANT_HOME)) " >> $@.tmp 1.52 -endif 1.53 -ifdef ALT_JAVAFX_ZIP_DIR 1.54 + endif 1.55 + ifdef ALT_JAVAFX_ZIP_DIR 1.56 @$(ECHO) " --with-javafx-zip-dir=$(call UnixPath,$(ALT_JAVAFX_ZIP_DIR)) " >> $@.tmp 1.57 -endif 1.58 -ifdef ALT_WIXDIR 1.59 + endif 1.60 + ifdef ALT_WIXDIR 1.61 @$(ECHO) " --with-wix=$(call UnixPath,$(ALT_WIXDIR)) " >> $@.tmp 1.62 -endif 1.63 -ifdef ALT_CCSS_SIGNING_DIR 1.64 + endif 1.65 + ifdef ALT_CCSS_SIGNING_DIR 1.66 @$(ECHO) " --with-ccss-signing=$(call UnixPath,$(ALT_CCSS_SIGNING_DIR)) " >> $@.tmp 1.67 -endif 1.68 -ifdef ALT_SLASH_JAVA 1.69 + endif 1.70 + ifdef ALT_SLASH_JAVA 1.71 @$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp 1.72 + endif 1.73 endif 1.74 @if [ -f $@ ] ; then \ 1.75 if ! $(CMP) $@ $@.tmp > /dev/null ; then \