equal
deleted
inserted
replaced
34 # BUILDARCH - build directory |
34 # BUILDARCH - build directory |
35 # LIBARCH - the corresponding directory in JDK/JRE |
35 # LIBARCH - the corresponding directory in JDK/JRE |
36 # GAMMADIR - top of workspace |
36 # GAMMADIR - top of workspace |
37 # OS_FAMILY - operating system |
37 # OS_FAMILY - operating system |
38 # VARIANT - core, compiler1, compiler2, or tiered |
38 # VARIANT - core, compiler1, compiler2, or tiered |
39 # HOTSPOT_RELEASE_VERSION - <major_ver>.<minor_ver>.<micro_ver>[-<identifier>][-<debug_target>][-b<nn>] |
39 # VERSION_STRING - the JDK version string as specified by JEP-223 |
40 # HOTSPOT_BUILD_VERSION - internal, internal-$(USER_RELEASE_SUFFIX) or empty |
40 # HOTSPOT_VERSION_STRING - the same as VERSION_STRING, unless overridden by a standalone build |
41 # JRE_RELEASE_VERSION - <major>.<minor>.<micro> (1.7.0) |
|
42 # |
41 # |
43 # Builds the directory trees with makefiles plus some convenience files in |
42 # Builds the directory trees with makefiles plus some convenience files in |
44 # each directory: |
43 # each directory: |
45 # |
44 # |
46 # Makefile - for "make foo" |
45 # Makefile - for "make foo" |
131 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \ |
130 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \ |
132 SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT) |
131 SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT) |
133 |
132 |
134 # Define variables to be set in flags.make. |
133 # Define variables to be set in flags.make. |
135 # Default values are set in make/defs.make. |
134 # Default values are set in make/defs.make. |
136 ifeq ($(HOTSPOT_BUILD_VERSION),) |
135 |
137 HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION) |
|
138 else |
|
139 HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION) |
|
140 endif |
|
141 # Set BUILD_USER from system-dependent hints: $LOGNAME, $(whoami) |
136 # Set BUILD_USER from system-dependent hints: $LOGNAME, $(whoami) |
142 ifndef HOTSPOT_BUILD_USER |
137 ifndef HOTSPOT_BUILD_USER |
143 HOTSPOT_BUILD_USER := $(shell echo $$LOGNAME) |
138 HOTSPOT_BUILD_USER := $(shell echo $$LOGNAME) |
144 endif |
139 endif |
145 ifndef HOTSPOT_BUILD_USER |
140 ifndef HOTSPOT_BUILD_USER |
160 ifneq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true) |
155 ifneq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true) |
161 OPENJDK=true |
156 OPENJDK=true |
162 endif |
157 endif |
163 endif |
158 endif |
164 |
159 |
165 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) |
160 BUILDTREE_VARS += HOTSPOT_VERSION_STRING=$(HOTSPOT_VERSION_STRING) VERSION_STRING=$(VERSION_STRING) |
166 |
161 |
167 BUILDTREE = \ |
162 BUILDTREE = \ |
168 $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS) |
163 $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS) |
169 |
164 |
170 BUILDTREE_COMMENT = echo "\# Generated by $(BUILDTREE_MAKE)" |
165 BUILDTREE_COMMENT = echo "\# Generated by $(BUILDTREE_MAKE)" |
214 echo "SYSDEFS = \$$(Platform_sysdefs)"; \ |
209 echo "SYSDEFS = \$$(Platform_sysdefs)"; \ |
215 echo "SRCARCH = $(SRCARCH)"; \ |
210 echo "SRCARCH = $(SRCARCH)"; \ |
216 echo "BUILDARCH = $(BUILDARCH)"; \ |
211 echo "BUILDARCH = $(BUILDARCH)"; \ |
217 echo "LIBARCH = $(LIBARCH)"; \ |
212 echo "LIBARCH = $(LIBARCH)"; \ |
218 echo "TARGET = $(TARGET)"; \ |
213 echo "TARGET = $(TARGET)"; \ |
219 echo "HS_BUILD_VER = $(HS_BUILD_VER)"; \ |
214 echo "HOTSPOT_VERSION_STRING = $(HOTSPOT_VERSION_STRING)"; \ |
220 echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \ |
215 echo "VERSION_STRING = $(VERSION_STRING)"; \ |
221 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ |
216 echo "SA_BUILD_VERSION = $(HOTSPOT_VERSION_STRING)"; \ |
222 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ |
217 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ |
223 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ |
218 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ |
224 echo "OPENJDK = $(OPENJDK)"; \ |
219 echo "OPENJDK = $(OPENJDK)"; \ |
225 echo "$(LP64_SETTING/$(DATA_MODE))"; \ |
220 echo "$(LP64_SETTING/$(DATA_MODE))"; \ |
226 echo; \ |
221 echo; \ |