From dbcb1907ec8d2632f52eb5578078b92be0655504 Mon Sep 17 00:00:00 2001
From: Sven Gestegard Robertz <sven.robertz@cs.lth.se>
Date: Sat, 25 Oct 2014 13:11:19 +0200
Subject: [PATCH] re-renamed compiler jar.

---
 Makefile                      | 2 +-
 compiler/build.xml            | 2 +-
 examples/duck_typing/Makefile | 2 +-
 examples/jgrafchart/Makefile  | 3 +--
 examples/tcp/Makefile         | 2 +-
 examples/twoway/Makefile      | 2 +-
 lib/c/Makefile                | 2 +-
 test/Makefile                 | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index c56c9bc..f39ec57 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 SUBDIRS=compiler lib test examples
-export LABCOMM_JAR=$(shell pwd)/compiler/labComm.jar
+export LABCOMM_JAR=$(shell pwd)/compiler/labcomm_compiler.jar
 export LABCOMM=java -jar $(LABCOMM_JAR) 
 
 all: $(SUBDIRS:%=make-%)
diff --git a/compiler/build.xml b/compiler/build.xml
index dd0e269..402790c 100644
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@ -90,7 +90,7 @@ classpath="tools/jastadd2.jar"/>
 
 
 <target name="jar" depends="build">
-  <jar destfile="labComm.jar">
+  <jar destfile="labcomm_compiler.jar">
     <fileset dir="." includes="LabComm*.class"/>
     <fileset dir="." includes="AST/*.class"/>
     <zipfileset src="tools/beaver-rt.jar" includes="beaver/*.class"/>
diff --git a/examples/duck_typing/Makefile b/examples/duck_typing/Makefile
index cd5ec76..2587040 100644
--- a/examples/duck_typing/Makefile
+++ b/examples/duck_typing/Makefile
@@ -1,4 +1,4 @@
-LABCOMM_JAR=../../compiler/labComm.jar
+LABCOMM_JAR=../../compiler/labcomm_compiler.jar
 LABCOMM=java -jar $(LABCOMM_JAR) 
 
 all: gen/animal.py
diff --git a/examples/jgrafchart/Makefile b/examples/jgrafchart/Makefile
index fc468e9..2fbc37a 100644
--- a/examples/jgrafchart/Makefile
+++ b/examples/jgrafchart/Makefile
@@ -1,9 +1,8 @@
 LCDIR=../..
-LCC=java -jar ${LCDIR}/compiler/labComm.jar
+LCC=java -jar ${LCDIR}/compiler/labcomm_compiler.jar
 CLASSPATH=.:${LCDIR}/lib/java/labcomm.jar
 JAVA_PKG=labcommTCPtest
 SAMPLENAME=foo
-LCC=java -jar ${LCDIR}/compiler/labComm.jar
 LCLIBDIR=${LCDIR}/lib/c
 
 LCFILE=jg
diff --git a/examples/tcp/Makefile b/examples/tcp/Makefile
index a96c0e1..18fedc5 100644
--- a/examples/tcp/Makefile
+++ b/examples/tcp/Makefile
@@ -1,5 +1,5 @@
 LCDIR=../..
-LCCJAR=${LCDIR}/compiler/labComm.jar  # the LabComm compiler
+LCCJAR=${LCDIR}/compiler/labcomm_compiler.jar  # the LabComm compiler
 LCLJAR=${LCDIR}/lib/java/labcomm.jar  # the LabComm library
 JAVA_PKG=labcommTCPtest
 
diff --git a/examples/twoway/Makefile b/examples/twoway/Makefile
index 868966d..6c34928 100644
--- a/examples/twoway/Makefile
+++ b/examples/twoway/Makefile
@@ -1,5 +1,5 @@
 TARGETS=client server
-LABCOMM_JAR=../../compiler/labComm.jar
+LABCOMM_JAR=../../compiler/labcomm_compiler.jar
 LABCOMM=java -jar $(LABCOMM_JAR) 
 
 CFLAGS=-O3 -g -Wall -Werror -I../../lib/c -I. -Wno-unused-function
diff --git a/lib/c/Makefile b/lib/c/Makefile
index ca68add..e1ba1d7 100644
--- a/lib/c/Makefile
+++ b/lib/c/Makefile
@@ -30,7 +30,7 @@ OBJS=labcomm_memory.o \
      labcomm_pthread_scheduler.o 
 
 #FIXME: labcomm_mem_reader.o labcomm_mem_writer.o
-LABCOMM_JAR=../../compiler/labComm.jar
+LABCOMM_JAR=../../compiler/labcomm_compiler.jar
 LABCOMM=java -jar $(LABCOMM_JAR) 
 
 TESTS=test_labcomm_basic_type_encoding test_labcomm_generated_encoding \
diff --git a/test/Makefile b/test/Makefile
index 0fe91b4..075d91f 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 TESTS=basic simple nested
-LABCOMM_JAR=../compiler/labComm.jar
+LABCOMM_JAR=../compiler/labcomm_compiler.jar
 LABCOMM=java -jar $(LABCOMM_JAR)
 
 CFLAGS=-O3 -g -Wall -Werror -Wno-unused-function
-- 
GitLab