Commit 2ba19677 authored by Sven Gestegård Robertz's avatar Sven Gestegård Robertz
Browse files

Fixed examples/simple classpaths to use labcomm jars instead of creating class...

Fixed examples/simple classpaths to use labcomm jars instead of creating class files in the source dirs
parent fcdd09bd
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
mkdir -p gen 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 --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 \ gcc -Wall -Werror -Wno-unused-function \
-I. -I../../lib/c -L../../lib/c \ -I. -I../../lib/c -L../../lib/c \
...@@ -22,7 +22,7 @@ gcc -Wall -Werror -I . -I ../../lib/c -L../../lib/c \ ...@@ -22,7 +22,7 @@ gcc -Wall -Werror -I . -I ../../lib/c -L../../lib/c \
mkdir -p gen06 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 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 \ gcc -Wall -Werror -I. -I../../lib/c/2006 -L../../lib/c \
-o example_encoder06 example_encoder06.c gen06/simple.c \ -o example_encoder06 example_encoder06.c gen06/simple.c \
......
...@@ -5,14 +5,14 @@ echo "*** Running example for version 2013 ***" ...@@ -5,14 +5,14 @@ echo "*** Running example for version 2013 ***"
echo "********************************************" echo "********************************************"
echo echo
java -cp .:../../lib/java:gen Encoder encoded_data java -cp .:../../lib/java/labcomm2013.jar:gen Encoder encoded_data
./example_decoder encoded_data ./example_decoder encoded_data
PYTHONPATH=../../lib/python:gen ./example_encoder.py 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 ./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):" echo "running python decoder (from wiki_example):"
PYTHONPATH=../../lib/python ../wiki_example/example_decoder.py encoded_data LabComm2013 PYTHONPATH=../../lib/python ../wiki_example/example_decoder.py encoded_data LabComm2013
...@@ -23,14 +23,14 @@ echo "*** Running C and Java example for version 2006 ***" ...@@ -23,14 +23,14 @@ echo "*** Running C and Java example for version 2006 ***"
echo "*******************************************************" echo "*******************************************************"
echo echo
java -cp .:../../lib/java:gen06 Encoder06 encoded_data06 java -cp .:../../lib/java/labcomm2006.jar:gen06 Encoder06 encoded_data06
./example_decoder06 encoded_data06 ./example_decoder06 encoded_data06
PYTHONPATH=../../lib/python:gen ./example_encoder.py encoded_data06 LabComm2006 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 ./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):" echo "running python decoder (from wiki_example):"
PYTHONPATH=../../lib/python ../wiki_example/example_decoder.py encoded_data06 LabComm2006 PYTHONPATH=../../lib/python ../wiki_example/example_decoder.py encoded_data06 LabComm2006
...@@ -7,16 +7,15 @@ ...@@ -7,16 +7,15 @@
mkdir -p gen mkdir -p gen
java -jar ../../compiler/labComm.jar --java=gen --c=gen/test.c --h=gen/test.h --python=gen/test.py test.lc 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 \ gcc -Wall -Werror -Wno-unused-function \
-I. -I../../lib/c -L../../lib/c \ -I. -I../../lib/c -L../../lib/c \
-DLABCOMM_COMPAT=\"labcomm_compat_osx.h\" \ -o example_encoder example_encoder.c gen/test.c \
-llabcomm2013 \ -llabcomm2013
-o example_encoder example_encoder.c gen/test.c
gcc -Wall -Werror -I . -I ../../lib/c -L../../lib/c \ 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 \ -o example_decoder example_decoder.c gen/test.c \
-llabcomm2013 -llabcomm2013
#-Tlabcomm.linkscript #-Tlabcomm.linkscript
......
...@@ -5,10 +5,10 @@ echo "*** Running example for version 2013 ***" ...@@ -5,10 +5,10 @@ echo "*** Running example for version 2013 ***"
echo "********************************************" echo "********************************************"
echo echo
java -cp .:../../lib/java:gen Encoder encoded_data java -cp .:../../lib/java/labcomm2013.jar:gen Encoder encoded_data
echo "running Java decoder:" 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:" echo "running C decoder:"
./example_decoder encoded_data ./example_decoder encoded_data
...@@ -20,7 +20,7 @@ echo "running C encoder:" ...@@ -20,7 +20,7 @@ echo "running C encoder:"
./example_encoder encoded_data ./example_encoder encoded_data
echo "running Java decoder:" 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:" echo "running C decoder:"
./example_decoder encoded_data ./example_decoder encoded_data
...@@ -32,7 +32,7 @@ echo "running python encoder:" ...@@ -32,7 +32,7 @@ echo "running python encoder:"
PYTHONPATH=../../lib/python:gen ./example_encoder.py encoded_data2 PYTHONPATH=../../lib/python:gen ./example_encoder.py encoded_data2
echo "running Java decoder:" 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:" echo "running C decoder:"
./example_decoder encoded_data2 ./example_decoder encoded_data2
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment