Skip to content

Commit

Permalink
Merge pull request contiki-ng#1935 from pjonsson/cooja-update-quickrule
Browse files Browse the repository at this point in the history
cooja: switch quickstart rule to use ant
  • Loading branch information
nvt authored Jun 10, 2022
2 parents 0d83527 + 4c25ec3 commit 0328842
Showing 1 changed file with 4 additions and 15 deletions.
19 changes: 4 additions & 15 deletions arch/platform/cooja/Makefile.cooja
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 0328842

Please sign in to comment.