76 |
76 |
77 HS_INTERNAL_NAME=jvm |
77 HS_INTERNAL_NAME=jvm |
78 |
78 |
79 default:: $(AdditionalTargets) $(JvmtiGeneratedFiles) $(TraceGeneratedFiles) |
79 default:: $(AdditionalTargets) $(JvmtiGeneratedFiles) $(TraceGeneratedFiles) |
80 |
80 |
81 !include $(HOTSPOTWORKSPACE)/make/hotspot_version |
81 !include $(HOTSPOTWORKSPACE)/make/jdk_version |
82 |
82 |
83 !if "$(USER_RELEASE_SUFFIX)" != "" |
83 !if "$(USER_RELEASE_SUFFIX)" != "" |
84 HOTSPOT_BUILD_VERSION = internal-$(USER_RELEASE_SUFFIX) |
84 HOTSPOT_BUILD_VERSION = internal-$(USER_RELEASE_SUFFIX) |
85 !else |
85 !else |
86 HOTSPOT_BUILD_VERSION = internal |
86 HOTSPOT_BUILD_VERSION = internal |
87 !endif |
87 !endif |
88 !if "$(HOTSPOT_RELEASE_VERSION)" != "" |
|
89 HOTSPOT_RELEASE_VERSION="\\\"$(HOTSPOT_RELEASE_VERSION)\\\"" |
|
90 !else |
|
91 HOTSPOT_RELEASE_VERSION="\\\"$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER)-$(HOTSPOT_BUILD_VERSION)\\\"" |
|
92 !endif |
|
93 !if "$(JRE_RELEASE_VERSION)" != "" |
88 !if "$(JRE_RELEASE_VERSION)" != "" |
94 JRE_RELEASE_VERSION="\\\"$(JRE_RELEASE_VERSION)\\\"" |
89 JRE_RELEASE_VERSION="\\\"$(JRE_RELEASE_VERSION)\\\"" |
95 !else |
90 !else |
96 JRE_RELEASE_VERSION="\\\"$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER)\\\"" |
91 JRE_RELEASE_VERSION="\\\"$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER)\\\"" |
97 !endif |
92 !endif |
98 |
93 !if "$(HOTSPOT_RELEASE_VERSION)" != "" |
|
94 HOTSPOT_RELEASE_VERSION="\\\"$(HOTSPOT_RELEASE_VERSION)\\\"" |
|
95 !else |
|
96 HOTSPOT_RELEASE_VERSION="\\\"$(JRE_RELEASE_VERSION)\\\"" |
|
97 !endif |
99 # Define HOTSPOT_VM_DISTRO if HOTSPOT_VM_DISTRO is set, |
98 # Define HOTSPOT_VM_DISTRO if HOTSPOT_VM_DISTRO is set, |
100 # and if it is not see if we have the src/closed directory |
99 # and if it is not see if we have the src/closed directory |
101 !if "$(HOTSPOT_VM_DISTRO)" != "" |
100 !if "$(HOTSPOT_VM_DISTRO)" != "" |
102 HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) |
101 HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) |
103 !else |
102 !else |