188 override CFG := urel |
188 override CFG := urel |
189 endif |
189 endif |
190 |
190 |
191 export VARIANT |
191 export VARIANT |
192 |
192 |
193 # Specify RVCT version explicitly by default |
193 ifeq ($(BUILDENV),symbian) |
194 OVERRIDE_RVCT = 1 |
194 # Specify RVCT version explicitly by default |
195 SBSCONFIG = $(PLATFORM)_$(CFG) |
195 OVERRIDE_RVCT = 1 |
196 ifeq ($(OVERRIDE_RVCT),1) |
196 SBSCONFIG = $(PLATFORM)_$(CFG) |
197 ifeq ($(PLATFORM),armv5) |
197 ifeq ($(OVERRIDE_RVCT),1) |
198 ifdef RD_JAVA_S60_RELEASE_10_1_ONWARDS |
198 ifdef RD_JAVA_S60_RELEASE_10_1_ONWARDS |
199 SBSCONFIG = $(PLATFORM)_$(CFG).rvct4_0 |
199 RVCTREL = .rvct4_0 |
200 RVCTBIN = $(RVCT40BIN) |
200 RVCTBIN = $(RVCT40BIN) |
201 else |
201 else |
202 SBSCONFIG = $(PLATFORM)_$(CFG).rvct2_2 |
202 RVCTREL = .rvct2_2 |
203 RVCTBIN = $(RVCT22BIN) |
203 RVCTBIN = $(RVCT22BIN) |
204 endif |
204 endif |
205 export PATH:=$(RVCTBIN);$(subst $(RVCT40BIN),,$(subst $(RVCT22BIN),,$(PATH))) |
205 export PATH:=$(RVCTBIN);$(subst $(RVCT40BIN),,$(subst $(RVCT22BIN),,$(PATH))) |
|
206 ifeq ($(PLATFORM),armv5) |
|
207 SBSCONFIG = $(PLATFORM)_$(CFG)$(RVCTREL) |
|
208 endif |
206 endif |
209 endif |
207 endif |
210 endif |
208 |
211 |
209 ANT_PROJECT_DEFINES = $(foreach d,$(PROJECT_DEFINES),-D$d=1) |
212 ANT_PROJECT_DEFINES = $(foreach d,$(PROJECT_DEFINES),-D$d=1) |
210 |
213 |
257 # Write file on first make evaluation |
260 # Write file on first make evaluation |
258 ifdef FIRSTTIME |
261 ifdef FIRSTTIME |
259 |
262 |
260 # Echo the S60 release before export |
263 # Echo the S60 release before export |
261 ifeq ($(BUILDENV),symbian) |
264 ifeq ($(BUILDENV),symbian) |
262 all init export configure qmake java native releasebuild test: echo_s60_release |
265 all init export prep configure qmake java native releasebuild test: echo_s60_release |
263 echo_s60_release: |
266 echo_s60_release: |
264 @echo Building on top of S60 $(RD_JAVA_S60_RELEASE), PLATFORM=$(PLATFORM) VARIANT=$(VARIANT) |
267 @echo Building on top of S60 $(RD_JAVA_S60_RELEASE), PLATFORM=$(PLATFORM) VARIANT=$(VARIANT) |
265 endif |
268 endif |
266 |
269 |
|
270 endif # FIRSTTIME |
|
271 |
|
272 |
267 include $(JAVA_SRC_ROOT)/build/makefile.javaversion |
273 include $(JAVA_SRC_ROOT)/build/makefile.javaversion |
268 |
274 |
269 COMMA = , |
275 COMMA = , |
270 JAVA_VERSION_ = $(subst .,$(COMMA),$(JAVA_VERSION)) |
276 JAVA_VERSION_ = $(subst .,$(COMMA),$(JAVA_VERSION)) |
271 |
277 |
272 configure: create_inc_dir generateconffiles generatereleasefile |
278 configure: make_configure |
|
279 make_configure: create_inc_dir generateconffiles generatereleasefile |
273 |
280 |
274 create_inc_dir: |
281 create_inc_dir: |
275 $(call MKDIR, $(call PATHFIX,$(GEN_BUILD_FILES_DIR)/inc)) |
282 $(call MKDIR, $(call PATHFIX,$(GEN_BUILD_FILES_DIR)/inc)) |
276 |
283 |
277 generateconffiles: |
284 generateconffiles: |
299 @echo Writing $(RD_JAVA_S60_RELEASE_FILE) ... \ |
306 @echo Writing $(RD_JAVA_S60_RELEASE_FILE) ... \ |
300 $(shell $(call CATCOMMAND,$(JAVA_SRC_ROOT)/build/templates/generated_header_hash.txt) > $(RD_JAVA_S60_RELEASE_FILE)) \ |
307 $(shell $(call CATCOMMAND,$(JAVA_SRC_ROOT)/build/templates/generated_header_hash.txt) > $(RD_JAVA_S60_RELEASE_FILE)) \ |
301 $(shell echo RD_JAVA_S60_RELEASE=$(RD_JAVA_S60_RELEASE)>$(RD_JAVA_S60_RELEASE_FILE)) |
308 $(shell echo RD_JAVA_S60_RELEASE=$(RD_JAVA_S60_RELEASE)>$(RD_JAVA_S60_RELEASE_FILE)) |
302 |
309 |
303 # Clean file on clean_generated |
310 # Clean file on clean_generated |
304 clean_configure: clean_conffiles |
311 clean_configure: make_clean_configure |
305 |
312 make_clean_configure: make_clean_conffiles |
306 clean_conffiles: |
313 make_clean_conffiles: |
307 $(call RMFILES,$(BUILDDEFINEFILE) $(QBUILDDEFINEFILE) $(JAVAVERSIONFILE) \ |
314 $(call RMFILES,$(BUILDDEFINEFILE) $(QBUILDDEFINEFILE) $(JAVAVERSIONFILE) \ |
308 $(PROJECTDEFINEFILE) $(RD_JAVA_S60_RELEASE_FILE)) |
315 $(PROJECTDEFINEFILE) $(RD_JAVA_S60_RELEASE_FILE)) |
309 |
316 |
310 endif # FIRSTTIME |
|
311 |
317 |
312 |
318 |
313 # Symbian ---------------------------------- |
319 # Symbian ---------------------------------- |
314 ifeq ($(BUILDENV),symbian) |
320 ifeq ($(BUILDENV),symbian) |
315 |
321 |