From 2ba19677cbb028f35bf1dcbc8d6ad03720e6cc80 Mon Sep 17 00:00:00 2001
From: Sven Gestegard Robertz <sven.robertz@cs.lth.se>
Date: Tue, 7 Oct 2014 10:41:40 +0200
Subject: [PATCH] Fixed examples/simple classpaths to use labcomm jars instead
of creating class files in the source dirs
---
examples/simple/compile.sh | 4 ++--
examples/simple/run.sh | 12 ++++++------
examples/user_types/compile.sh | 9 ++++-----
examples/user_types/run.sh | 8 ++++----
4 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/examples/simple/compile.sh b/examples/simple/compile.sh
index a33018d..a5566fc 100644
--- a/examples/simple/compile.sh
+++ b/examples/simple/compile.sh
@@ -7,7 +7,7 @@
mkdir -p gen
java -jar ../../compiler/labComm.jar --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
+javac -cp ../../lib/java/labcomm2013.jar:. gen/*.java Encoder.java Decoder.java
gcc -Wall -Werror -Wno-unused-function \
-I. -I../../lib/c -L../../lib/c \
@@ -22,7 +22,7 @@ gcc -Wall -Werror -I . -I ../../lib/c -L../../lib/c \
mkdir -p gen06
java -jar ../../compiler/labComm.jar --ver=2006 --java=gen06 --c=gen06/simple.c --h=gen06/simple.h --python=gen06/simple.py simple.lc
-javac -cp ../../lib/java:. gen06/*.java Encoder06.java Decoder06.java
+javac -cp ../../lib/java/labcomm2006.jar:. gen06/*.java Encoder06.java Decoder06.java
gcc -Wall -Werror -I. -I../../lib/c/2006 -L../../lib/c \
-o example_encoder06 example_encoder06.c gen06/simple.c \
diff --git a/examples/simple/run.sh b/examples/simple/run.sh
index 074b05c..192225d 100644
--- a/examples/simple/run.sh
+++ b/examples/simple/run.sh
@@ -5,14 +5,14 @@ echo "*** Running example for version 2013 ***"
echo "********************************************"
echo
-java -cp .:../../lib/java:gen Encoder encoded_data
+java -cp .:../../lib/java/labcomm2013.jar:gen Encoder encoded_data
./example_decoder encoded_data
PYTHONPATH=../../lib/python:gen ./example_encoder.py encoded_data
-java -cp .:../../lib/java:gen Decoder encoded_data
+java -cp .:../../lib/java/labcomm2013.jar:gen Decoder encoded_data
./example_encoder encoded_data
-java -cp .:../../lib/java:gen Decoder encoded_data
+java -cp .:../../lib/java/labcomm2013.jar:gen Decoder encoded_data
echo "running python decoder (from wiki_example):"
PYTHONPATH=../../lib/python ../wiki_example/example_decoder.py encoded_data LabComm2013
@@ -23,14 +23,14 @@ echo "*** Running C and Java example for version 2006 ***"
echo "*******************************************************"
echo
-java -cp .:../../lib/java:gen06 Encoder06 encoded_data06
+java -cp .:../../lib/java/labcomm2006.jar:gen06 Encoder06 encoded_data06
./example_decoder06 encoded_data06
PYTHONPATH=../../lib/python:gen ./example_encoder.py encoded_data06 LabComm2006
-java -cp .:../../lib/java:gen06 Decoder06 encoded_data06
+java -cp .:../../lib/java/labcomm2006.jar:gen06 Decoder06 encoded_data06
./example_encoder06 encoded_data06
-java -cp .:../../lib/java:gen06 Decoder06 encoded_data06
+java -cp .:../../lib/java/labcomm2006.jar:gen06 Decoder06 encoded_data06
echo "running python decoder (from wiki_example):"
PYTHONPATH=../../lib/python ../wiki_example/example_decoder.py encoded_data06 LabComm2006
diff --git a/examples/user_types/compile.sh b/examples/user_types/compile.sh
index 37df26f..e1029d8 100644
--- a/examples/user_types/compile.sh
+++ b/examples/user_types/compile.sh
@@ -7,16 +7,15 @@
mkdir -p gen
java -jar ../../compiler/labComm.jar --java=gen --c=gen/test.c --h=gen/test.h --python=gen/test.py test.lc
-javac -cp ../../lib/java:. gen/*.java Encoder.java Decoder.java
+javac -cp ../../lib/java/labcomm2013.jar:. gen/*.java Encoder.java Decoder.java
+# for macOS, add -DLABCOMM_COMPAT=\"labcomm_compat_osx.h\" \
gcc -Wall -Werror -Wno-unused-function \
-I. -I../../lib/c -L../../lib/c \
- -DLABCOMM_COMPAT=\"labcomm_compat_osx.h\" \
- -llabcomm2013 \
- -o example_encoder example_encoder.c gen/test.c
+ -o example_encoder example_encoder.c gen/test.c \
+ -llabcomm2013
gcc -Wall -Werror -I . -I ../../lib/c -L../../lib/c \
- -DLABCOMM_COMPAT=\"labcomm_compat_osx.h\" \
-o example_decoder example_decoder.c gen/test.c \
-llabcomm2013
#-Tlabcomm.linkscript
diff --git a/examples/user_types/run.sh b/examples/user_types/run.sh
index 09bdcd7..2bdc6ee 100644
--- a/examples/user_types/run.sh
+++ b/examples/user_types/run.sh
@@ -5,10 +5,10 @@ echo "*** Running example for version 2013 ***"
echo "********************************************"
echo
-java -cp .:../../lib/java:gen Encoder encoded_data
+java -cp .:../../lib/java/labcomm2013.jar:gen Encoder encoded_data
echo "running Java decoder:"
-java -cp .:../../lib/java:gen Decoder encoded_data
+java -cp .:../../lib/java/labcomm2013.jar:gen Decoder encoded_data
echo "running C decoder:"
./example_decoder encoded_data
@@ -20,7 +20,7 @@ echo "running C encoder:"
./example_encoder encoded_data
echo "running Java decoder:"
-java -cp .:../../lib/java:gen Decoder encoded_data
+java -cp .:../../lib/java/labcomm2013.jar:gen Decoder encoded_data
echo "running C decoder:"
./example_decoder encoded_data
@@ -32,7 +32,7 @@ echo "running python encoder:"
PYTHONPATH=../../lib/python:gen ./example_encoder.py encoded_data2
echo "running Java decoder:"
-java -cp .:../../lib/java:gen Decoder encoded_data2
+java -cp .:../../lib/java/labcomm2013.jar:gen Decoder encoded_data2
echo "running C decoder:"
./example_decoder encoded_data2
--
GitLab