提交 656aa167 编写于 作者: E erikj

8005597: build-infra: bridgeBuild broken for pure openjdk build

Reviewed-by: tbell
上级 7c6cbbda
...@@ -42,6 +42,24 @@ endef ...@@ -42,6 +42,24 @@ endef
BUILD_DIR_ROOT:=$(root_dir)/build 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
endif
########################################################################### ###########################################################################
# To help in adoption of the new configure&&make build process, a bridge # 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. # build will use the old settings to run configure and do the build.
...@@ -84,30 +102,31 @@ endif ...@@ -84,30 +102,31 @@ endif
ifdef ALT_FREETYPE_HEADERS_PATH ifdef ALT_FREETYPE_HEADERS_PATH
@$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
endif endif
ifdef OPENJDK ifeq ($(OPEN_BUILD),true)
@$(ECHO) " --enable-openjdk-only " >> $@.tmp @$(ECHO) " --enable-openjdk-only " >> $@.tmp
endif else
# Todo: move to closed? # Todo: move to closed?
ifdef ALT_MOZILLA_HEADERS_PATH ifdef ALT_MOZILLA_HEADERS_PATH
@$(ECHO) " --with-mozilla-headers=$(call UnixPath,$(ALT_MOZILLA_HEADERS_PATH)) " >> $@.tmp @$(ECHO) " --with-mozilla-headers=$(call UnixPath,$(ALT_MOZILLA_HEADERS_PATH)) " >> $@.tmp
endif endif
ifdef ALT_JUNIT_DIR ifdef ALT_JUNIT_DIR
@$(ECHO) " --with-junit-dir=$(call UnixPath,$(ALT_JUNIT_DIR)) " >> $@.tmp @$(ECHO) " --with-junit-dir=$(call UnixPath,$(ALT_JUNIT_DIR)) " >> $@.tmp
endif endif
ifdef ANT_HOME ifdef ANT_HOME
@$(ECHO) " --with-ant-home=$(call UnixPath,$(ANT_HOME)) " >> $@.tmp @$(ECHO) " --with-ant-home=$(call UnixPath,$(ANT_HOME)) " >> $@.tmp
endif endif
ifdef ALT_JAVAFX_ZIP_DIR ifdef ALT_JAVAFX_ZIP_DIR
@$(ECHO) " --with-javafx-zip-dir=$(call UnixPath,$(ALT_JAVAFX_ZIP_DIR)) " >> $@.tmp @$(ECHO) " --with-javafx-zip-dir=$(call UnixPath,$(ALT_JAVAFX_ZIP_DIR)) " >> $@.tmp
endif endif
ifdef ALT_WIXDIR ifdef ALT_WIXDIR
@$(ECHO) " --with-wix=$(call UnixPath,$(ALT_WIXDIR)) " >> $@.tmp @$(ECHO) " --with-wix=$(call UnixPath,$(ALT_WIXDIR)) " >> $@.tmp
endif endif
ifdef ALT_CCSS_SIGNING_DIR ifdef ALT_CCSS_SIGNING_DIR
@$(ECHO) " --with-ccss-signing=$(call UnixPath,$(ALT_CCSS_SIGNING_DIR)) " >> $@.tmp @$(ECHO) " --with-ccss-signing=$(call UnixPath,$(ALT_CCSS_SIGNING_DIR)) " >> $@.tmp
endif endif
ifdef ALT_SLASH_JAVA ifdef ALT_SLASH_JAVA
@$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp @$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp
endif
endif endif
@if [ -f $@ ] ; then \ @if [ -f $@ ] ; then \
if ! $(CMP) $@ $@.tmp > /dev/null ; then \ if ! $(CMP) $@ $@.tmp > /dev/null ; then \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册