diff --git a/examples/simple/compile.sh b/examples/simple/compile.sh index 50538af7800a79754f32d0a7baf16b11393b9801..7e5de1c6285601b3ad2f3c61452a30cbea08b90e 100644 --- a/examples/simple/compile.sh +++ b/examples/simple/compile.sh @@ -1,7 +1,7 @@ (cd ../..; make all) mkdir -p gen -java -jar ../../compiler/labComm.jar --java=gen --c=gen/simple.c --h=gen/simple.h --python=gen/simple.py simple.lc +java -jar ../../compiler/labComm.jar --ver=2013 --java=gen --c=gen/simple.c --h=gen/simple.h --python=gen/simple.py simple.lc javac -cp ../../lib/java:. gen/*.java Encoder.java Decoder.java diff --git a/lib/java/Makefile b/lib/java/Makefile index 7eefab1bde7a842c29fecb5d4ffb2b765b8f05c9..d986b2eba3d80732d0c98da8eb08d4819bafd7b9 100644 --- a/lib/java/Makefile +++ b/lib/java/Makefile @@ -13,9 +13,13 @@ MODULES=LabCommDispatcher \ LabCommReader \ WriterWrapper -all: labcomm.jar labcomm2006.jar +all: labcomm.jar labcomm2013.jar labcomm2006.jar labcomm.jar: gen/JAVAC + echo $@ + cd gen ; jar cf ../$@ se/lth/control/labcomm/*.class se/lth/control/labcomm2006/*.class + +labcomm2013.jar: gen/JAVAC echo $@ cd gen ; jar cf ../$@ se/lth/control/labcomm/*.class @@ -34,5 +38,5 @@ gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) $(MODULES:%=se/lth/control .PHONY: clean clean: - rm -rf labcomm.jar gen labcomm2006.jar + rm -rf labcomm.jar labcomm2006.jar labcomm2013.jar gen