92 MAKE_ARGS += Platform_arch=x86
93 MAKE_ARGS += Platform_arch_model=x86_64
94 endif
95
96 # NB later OS versions than 2003 may report "Intel64"
97 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) Intel64),)
98 ARCH_DATA_MODEL=64
99 PLATFORM=windows-amd64
100 VM_PLATFORM=windows_amd64
101 HS_ARCH=x86
102 MAKE_ARGS += LP64=1
103 MAKE_ARGS += ARCH=x86
104 MAKE_ARGS += BUILDARCH=amd64
105 MAKE_ARGS += Platform_arch=x86
106 MAKE_ARGS += Platform_arch_model=x86_64
107 endif
108 endif
109
110 JDK_INCLUDE_SUBDIR=win32
111
112 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined
113 # and added to MAKE_ARGS list in $(GAMMADIR)/make/defs.make.
114
115 # next parameters are defined in $(GAMMADIR)/make/defs.make.
116 MAKE_ARGS += JDK_MKTG_VERSION=$(JDK_MKTG_VERSION)
117 MAKE_ARGS += JDK_MAJOR_VER=$(JDK_MAJOR_VERSION)
118 MAKE_ARGS += JDK_MINOR_VER=$(JDK_MINOR_VERSION)
119 MAKE_ARGS += JDK_MICRO_VER=$(JDK_MICRO_VERSION)
120
121 ifdef COOKED_JDK_UPDATE_VERSION
122 MAKE_ARGS += JDK_UPDATE_VER=$(COOKED_JDK_UPDATE_VERSION)
123 endif
124
125 # COOKED_BUILD_NUMBER should only be set if we have a numeric
126 # build number. It must not be zero padded.
127 ifdef COOKED_BUILD_NUMBER
128 MAKE_ARGS += JDK_BUILD_NUMBER=$(COOKED_BUILD_NUMBER)
129 endif
130
131 NMAKE= MAKEFLAGS= MFLAGS= nmake /NOLOGO
158 # Disable building SA on windows until we are sure
159 # we want to release it. If we build it here,
160 # the SDK makefiles will copy it over and put it into
161 # the created image.
162 BUILD_WIN_SA = 1
163 ifneq ($(ALT_BUILD_WIN_SA),)
164 BUILD_WIN_SA = $(ALT_BUILD_WIN_SA)
165 endif
166
167 ifeq ($(BUILD_WIN_SA), 1)
168 ifeq ($(ARCH),ia64)
169 BUILD_WIN_SA = 0
170 endif
171 endif
172
173 EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server
174 EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client
175 EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
176
177 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
178 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.dll
179 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb
180 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map
181 EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib
182 ifeq ($(ARCH_DATA_MODEL), 32)
183 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
184 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.dll
185 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb
186 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map
187 # kernel vm
188 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt
189 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.dll
190 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb
191 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map
192 endif
193
194 ifeq ($(BUILD_WIN_SA), 1)
195 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.dll
196 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb
197 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map
198 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
199 # Must pass this down to nmake.
200 MAKE_ARGS += BUILD_WIN_SA=1
201 endif
|
92 MAKE_ARGS += Platform_arch=x86
93 MAKE_ARGS += Platform_arch_model=x86_64
94 endif
95
96 # NB later OS versions than 2003 may report "Intel64"
97 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) Intel64),)
98 ARCH_DATA_MODEL=64
99 PLATFORM=windows-amd64
100 VM_PLATFORM=windows_amd64
101 HS_ARCH=x86
102 MAKE_ARGS += LP64=1
103 MAKE_ARGS += ARCH=x86
104 MAKE_ARGS += BUILDARCH=amd64
105 MAKE_ARGS += Platform_arch=x86
106 MAKE_ARGS += Platform_arch_model=x86_64
107 endif
108 endif
109
110 JDK_INCLUDE_SUBDIR=win32
111
112 # Library suffix
113 LIBRARY_SUFFIX=dll
114
115 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined
116 # and added to MAKE_ARGS list in $(GAMMADIR)/make/defs.make.
117
118 # next parameters are defined in $(GAMMADIR)/make/defs.make.
119 MAKE_ARGS += JDK_MKTG_VERSION=$(JDK_MKTG_VERSION)
120 MAKE_ARGS += JDK_MAJOR_VER=$(JDK_MAJOR_VERSION)
121 MAKE_ARGS += JDK_MINOR_VER=$(JDK_MINOR_VERSION)
122 MAKE_ARGS += JDK_MICRO_VER=$(JDK_MICRO_VERSION)
123
124 ifdef COOKED_JDK_UPDATE_VERSION
125 MAKE_ARGS += JDK_UPDATE_VER=$(COOKED_JDK_UPDATE_VERSION)
126 endif
127
128 # COOKED_BUILD_NUMBER should only be set if we have a numeric
129 # build number. It must not be zero padded.
130 ifdef COOKED_BUILD_NUMBER
131 MAKE_ARGS += JDK_BUILD_NUMBER=$(COOKED_BUILD_NUMBER)
132 endif
133
134 NMAKE= MAKEFLAGS= MFLAGS= nmake /NOLOGO
161 # Disable building SA on windows until we are sure
162 # we want to release it. If we build it here,
163 # the SDK makefiles will copy it over and put it into
164 # the created image.
165 BUILD_WIN_SA = 1
166 ifneq ($(ALT_BUILD_WIN_SA),)
167 BUILD_WIN_SA = $(ALT_BUILD_WIN_SA)
168 endif
169
170 ifeq ($(BUILD_WIN_SA), 1)
171 ifeq ($(ARCH),ia64)
172 BUILD_WIN_SA = 0
173 endif
174 endif
175
176 EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server
177 EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client
178 EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
179
180 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
181 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX)
182 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb
183 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map
184 EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib
185 ifeq ($(ARCH_DATA_MODEL), 32)
186 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
187 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.$(LIBRARY_SUFFIX)
188 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb
189 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map
190 # kernel vm
191 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt
192 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.$(LIBRARY_SUFFIX)
193 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb
194 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map
195 endif
196
197 ifeq ($(BUILD_WIN_SA), 1)
198 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.$(LIBRARY_SUFFIX)
199 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb
200 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map
201 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
202 # Must pass this down to nmake.
203 MAKE_ARGS += BUILD_WIN_SA=1
204 endif
|