common/makefiles/Jprt.gmk

changeset 588
edad83acbd46
parent 587
5a5e97f9ac0a
child 589
c3bf62746a80
equal deleted inserted replaced
587:5a5e97f9ac0a 588:edad83acbd46
41 $(shell (cd "$1" && $(PWD))) 41 $(shell (cd "$1" && $(PWD)))
42 endef 42 endef
43 43
44 BUILD_DIR_ROOT:=$(root_dir)/build 44 BUILD_DIR_ROOT:=$(root_dir)/build
45 45
46 # Appears to be an open build
47 OPEN_BUILD := \
48 $(shell \
49 if [ -d $(root_dir)/jdk/src/closed \
50 -o -d $(root_dir)/jdk/make/closed \
51 -o -d $(root_dir)/jdk/test/closed \
52 -o -d $(root_dir)/hotspot/src/closed \
53 -o -d $(root_dir)/hotspot/make/closed \
54 -o -d $(root_dir)/hotspot/test/closed ] ; then \
55 echo "false"; \
56 else \
57 echo "true"; \
58 fi \
59 )
60 ifdef OPENJDK 46 ifdef OPENJDK
61 OPEN_BUILD=true 47 OPEN_BUILD=true
62 endif 48 else
49 OPEN_BUILD := $(if $(or $(wildcard $(root_dir)/jdk/src/closed), \
50 $(wildcard $(root_dir)/jdk/make/closed), \
51 $(wildcard $(root_dir)/jdk/test/closed), \
52 $(wildcard $(root_dir)/hotspot/src/closed), \
53 $(wildcard $(root_dir)/hotspot/make/closed), \
54 $(wildcard $(root_dir)/hotspot/test/closed)), \
55 false,true)
56 endif
57
58 HOTSPOT_AVAILABLE := $(if $(wildcard $(root_dir)/hotspot),true,false)
63 59
64 ########################################################################### 60 ###########################################################################
65 # To help in adoption of the new configure&&make build process, a bridge 61 # To help in adoption of the new configure&&make build process, a bridge
66 # build will use the old settings to run configure and do the build. 62 # build will use the old settings to run configure and do the build.
67 63
100 ifdef ALT_CUPS_HEADERS_PATH 96 ifdef ALT_CUPS_HEADERS_PATH
101 @$(ECHO) " --with-cups-include=$(call UnixPath,$(ALT_CUPS_HEADERS_PATH)) " >> $@.tmp 97 @$(ECHO) " --with-cups-include=$(call UnixPath,$(ALT_CUPS_HEADERS_PATH)) " >> $@.tmp
102 endif 98 endif
103 ifdef ALT_FREETYPE_HEADERS_PATH 99 ifdef ALT_FREETYPE_HEADERS_PATH
104 @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp 100 @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
101 endif
102 ifeq ($(HOTSPOT_AVAILABLE),false)
103 ifdef ALT_JDK_IMPORT_PATH
104 @$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp
105 endif
105 endif 106 endif
106 ifeq ($(OPEN_BUILD),true) 107 ifeq ($(OPEN_BUILD),true)
107 @$(ECHO) " --enable-openjdk-only " >> $@.tmp 108 @$(ECHO) " --enable-openjdk-only " >> $@.tmp
108 else 109 else
109 # Todo: move to closed? 110 # Todo: move to closed?

mercurial