diff -r 7cee158cb8cd -r 26b2b12093af build/Makefile.comp --- a/build/Makefile.comp Wed Sep 15 12:05:25 2010 +0300 +++ b/build/Makefile.comp Wed Oct 13 14:23:59 2010 +0300 @@ -151,11 +151,11 @@ echo #include "exports.inf" >> bld.inf endif -# Quick java releasables target -RELEASABLE_PATH = $(EPOCROOT)epoc32/release/$(PLATFORM)/$(CFG)/z/resource/java/jvm/lib/jrt javareleasables: ifneq ($(ANT_FILE),) - echo $(RELEASABLE_PATH)/$(BASENAME).odc + $(ANT) -q -Dtarget.platform=$(PLATFORM) -Dtarget.cfg=$(VARIANT) $(ANT_PROJECT_DEFINES) releasables > $(DEVNULL) + $(call CATCOMMAND,java_releasables_$(PLATFORM)_$(VARIANT).tmp) + $(call RMFILE,java_releasables_$(PLATFORM)_$(VARIANT).tmp) endif # Remove all generated build files @@ -185,11 +185,11 @@ build_native: $(PHASEINFO) - $(SBS) -c $(PLATFORM)_$(CFG) + $(SBS) -c $(PLATFORM)_$(CFG) BUILD -fastbuild: java +fastbuild: export java $(PHASEINFO) - $(SBS) -c $(PLATFORM)_$(CFG) + $(SBS) -c $(PLATFORM)_$(CFG) TARGET build_clean_native: $(PHASEINFO)