diff --git a/arch/platform/cooja/Makefile.cooja b/arch/platform/cooja/Makefile.cooja index c79f0396cf..b3c005ceff 100644 --- a/arch/platform/cooja/Makefile.cooja +++ b/arch/platform/cooja/Makefile.cooja @@ -70,25 +70,14 @@ REDEFINE_PRINTF = 1 ### Assuming simulator quickstart if no JNI library name set from Cooja ifndef LIBNAME -QUICKSTART=1 -endif - -### Quickstart simulator -ifdef QUICKSTART +ifneq ($(MAKECMDGOALS),clean) -# Create COOJA JAR rule -$(COOJA_DIR)/dist/cooja.jar: - @echo "Creating COOJA Java archive..." - cd $(COOJA_DIR) && ant jar +CURDIR := $(shell pwd) -# Quickstart rule -ifneq ($(MAKECMDGOALS),clean) .PHONY: $(MAKECMDGOALS) -.PRECIOUS: $(MAKECMDGOALS) -$(MAKECMDGOALS): $(COOJA_DIR)/dist/cooja.jar - $(JAVA) -mx512m -jar $< -quickstart='$(firstword $(MAKECMDGOALS))' -contiki='$(CONTIKI)' +$(MAKECMDGOALS): + $(Q)ant -e -logger org.apache.tools.ant.listener.SimpleBigProjectLogger -f $(COOJA_DIR)/build.xml run_bigmem -Dargs="-quickstart=$(addprefix $(CURDIR)/,$(firstword $(MAKECMDGOALS))) -contiki=$(realpath $(CONTIKI)) -logdir=$(CURDIR)" endif - endif ## QUICKSTART # No stack end symbol available, code does not work on 64-bit architectures.