From 72af701b224f27f2305ec9174934019676584e5a Mon Sep 17 00:00:00 2001
From: Sven Gestegard Robertz <sven.robertz@cs.lth.se>
Date: Fri, 7 Feb 2014 12:49:48 +0100
Subject: [PATCH] generate three jar files for java lib; labcomm.jar with both
 versions, and separate jars for only 2013 and 2006

---
 examples/simple/compile.sh | 2 +-
 lib/java/Makefile          | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/examples/simple/compile.sh b/examples/simple/compile.sh
index 50538af..7e5de1c 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 7eefab1..d986b2e 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 
 
-- 
GitLab