99 ifeq ($(SHARK_BUILD), true)
100 JVM_VARIANTS:=zeroshark
101 JVM_VARIANT_ZEROSHARK:=true
102 else
103 JVM_VARIANTS:=zero
104 JVM_VARIANT_ZERO:=true
105 endif
106 else
107 # A default is needed
108 ifeq ($(BUILD_CLIENT_ONLY), true)
109 JVM_VARIANTS:=client
110 JVM_VARIANT_CLIENT:=true
111 endif
112 # Further defaults are platform and arch specific
113 endif
114 endif
115
116 # hotspot version definitions
117 include $(GAMMADIR)/make/hotspot_version
118
119 # Java versions needed
120 ifeq ($(PREVIOUS_JDK_VERSION),)
121 PREVIOUS_JDK_VERSION=$(JDK_PREVIOUS_VERSION)
122 endif
123 ifeq ($(JDK_MAJOR_VERSION),)
124 JDK_MAJOR_VERSION=$(JDK_MAJOR_VER)
125 endif
126 ifeq ($(JDK_MINOR_VERSION),)
127 JDK_MINOR_VERSION=$(JDK_MINOR_VER)
128 endif
129 ifeq ($(JDK_MICRO_VERSION),)
130 JDK_MICRO_VERSION=$(JDK_MICRO_VER)
131 endif
132 ifeq ($(JDK_MKTG_VERSION),)
133 JDK_MKTG_VERSION=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
134 endif
135 ifeq ($(JDK_VERSION),)
136 JDK_VERSION=$(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
137 endif
138 ifeq ($(FULL_VERSION),)
|
99 ifeq ($(SHARK_BUILD), true)
100 JVM_VARIANTS:=zeroshark
101 JVM_VARIANT_ZEROSHARK:=true
102 else
103 JVM_VARIANTS:=zero
104 JVM_VARIANT_ZERO:=true
105 endif
106 else
107 # A default is needed
108 ifeq ($(BUILD_CLIENT_ONLY), true)
109 JVM_VARIANTS:=client
110 JVM_VARIANT_CLIENT:=true
111 endif
112 # Further defaults are platform and arch specific
113 endif
114 endif
115
116 # hotspot version definitions
117 include $(GAMMADIR)/make/hotspot_version
118
119 # When config parameter --with-update-version is defined,
120 # Hotspot minor version should be set to that
121 ifneq ($(JDK_UPDATE_VERSION),)
122 HS_MINOR_VER=$(JDK_UPDATE_VERSION)
123 endif
124
125 # When config parameter --with-build-number is defined,
126 # Hotspot build number should be set to that
127 ifneq ($(JDK_BUILD_NUMBER),)
128 HS_BUILD_NUMBER=$(subst b,,$(JDK_BUILD_NUMBER))
129 endif
130
131 # Java versions needed
132 ifeq ($(PREVIOUS_JDK_VERSION),)
133 PREVIOUS_JDK_VERSION=$(JDK_PREVIOUS_VERSION)
134 endif
135 ifeq ($(JDK_MAJOR_VERSION),)
136 JDK_MAJOR_VERSION=$(JDK_MAJOR_VER)
137 endif
138 ifeq ($(JDK_MINOR_VERSION),)
139 JDK_MINOR_VERSION=$(JDK_MINOR_VER)
140 endif
141 ifeq ($(JDK_MICRO_VERSION),)
142 JDK_MICRO_VERSION=$(JDK_MICRO_VER)
143 endif
144 ifeq ($(JDK_MKTG_VERSION),)
145 JDK_MKTG_VERSION=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
146 endif
147 ifeq ($(JDK_VERSION),)
148 JDK_VERSION=$(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
149 endif
150 ifeq ($(FULL_VERSION),)
|