Bumped version from 2013 to 20141009

.gitignore

@@ -6,9 +6,9 @@ lib/c/liblabcomm.so.1
 lib/c/liblabcomm2006.so.1
 lib/c/liblabcomm2006.so
 lib/c/liblabcomm2006.a
-lib/c/liblabcomm2013.so.1
-lib/c/liblabcomm2013.so
-lib/c/liblabcomm2013.a
+lib/c/liblabcomm20141009.so.1
+lib/c/liblabcomm20141009.so
+lib/c/liblabcomm20141009.a
 lib/c/test/test_labcomm
 lib/c/test/test_labcomm_basic_type_encoding
 lib/c/test/test_labcomm_copy

examples/simple/Makefile

@@ -10,3 +10,4 @@ distclean:
 	rm -f example_encoder06
 	rm -f example_decoder
 	rm -f example_decoder06
+	rm -f encoded_data

examples/simple/compile.sh

@@ -7,15 +7,15 @@
 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/labcomm2013.jar:. gen/*.java Encoder.java Decoder.java
+javac -cp ../../lib/java/labcomm20141009.jar:. gen/*.java Encoder.java Decoder.java
 
 gcc -Wall -Werror -Wno-unused-function \
     -I. -I../../lib/c -L../../lib/c \
     -o example_encoder example_encoder.c gen/simple.c \
-    -llabcomm2013 -Tlabcomm.linkscript
+    -llabcomm20141009 -Tlabcomm.linkscript
 gcc -Wall -Werror -I . -I ../../lib/c -L../../lib/c \
     -o example_decoder example_decoder.c gen/simple.c \
-    -llabcomm2013 -Tlabcomm.linkscript
+    -llabcomm20141009 -Tlabcomm.linkscript
 
 # For version 2006
 

examples/simple/example_encoder.py

@@ -5,7 +5,7 @@ import sys
 import simple
 
 if __name__ == '__main__':
-    version = sys.argv[2] if len(sys.argv) == 3 else "LabComm2013"
+    version = sys.argv[2] if len(sys.argv) == 3 else "LabComm20141009"
     encoder = labcomm.Encoder(labcomm.StreamWriter(open(sys.argv[1], 'w')), version)
     encoder.add_decl(simple.theTwoInts.signature)
     encoder.add_decl(simple.IntString.signature)

examples/simple/run.sh

@@ -5,17 +5,17 @@ echo "***   Running example for version 2013   ***"
 echo "********************************************"
 echo
 
-java -cp .:../../lib/java/labcomm2013.jar:gen Encoder encoded_data
+java -cp .:../../lib/java/labcomm20141009.jar:gen Encoder encoded_data
 ./example_decoder encoded_data
 
 PYTHONPATH=../../lib/python:gen ./example_encoder.py encoded_data
-java -cp .:../../lib/java/labcomm2013.jar:gen Decoder encoded_data
+java -cp .:../../lib/java/labcomm20141009.jar:gen Decoder encoded_data
 
 ./example_encoder encoded_data
-java -cp .:../../lib/java/labcomm2013.jar:gen Decoder encoded_data
+java -cp .:../../lib/java/labcomm20141009.jar:gen Decoder encoded_data
 
 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 LabComm20141009
 
 echo
 echo "*******************************************************"

examples/user_types/Makefile

@@ -4,3 +4,4 @@ clean:
 
 distclean:
 	rm -rf gen
+	rm -f encoded_data

examples/user_types/compile.sh

@@ -7,16 +7,16 @@
 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/labcomm2013.jar:. gen/*.java Encoder.java Decoder.java
+javac -cp ../../lib/java/labcomm20141009.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 \
     -o example_encoder example_encoder.c gen/test.c \
-    -llabcomm2013 
+    -llabcomm20141009 
 
 gcc -Wall -Werror -I . -I ../../lib/c -L../../lib/c \
     -o example_decoder example_decoder.c gen/test.c \
-    -llabcomm2013 
+    -llabcomm20141009 
     #-Tlabcomm.linkscript
 

examples/user_types/example_encoder.py

@@ -5,7 +5,7 @@ import sys
 import test
 
 if __name__ == '__main__':
-    version = sys.argv[2] if len(sys.argv) == 3 else "LabComm2013"
+    version = sys.argv[2] if len(sys.argv) == 3 else "LabComm20141009"
     encoder = labcomm.Encoder(labcomm.StreamWriter(open(sys.argv[1], 'w')), version)
     encoder.add_decl(test.twoLines.signature)
     l1 = test.line()

examples/user_types/run.sh

@@ -5,34 +5,34 @@ echo "***   Running example for version 2013   ***"
 echo "********************************************"
 echo
 
-java -cp .:../../lib/java/labcomm2013.jar:gen Encoder encoded_data
+java -cp .:../../lib/java/labcomm20141009.jar:gen Encoder encoded_data
 
 echo "running Java  decoder:"
-java -cp .:../../lib/java/labcomm2013.jar:gen Decoder encoded_data
+java -cp .:../../lib/java/labcomm20141009.jar:gen Decoder encoded_data
 
 echo "running C decoder:"
 ./example_decoder encoded_data
 
 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 LabComm20141009
 
 echo "running C encoder:"
 ./example_encoder encoded_data
 
 echo "running Java  decoder:"
-java -cp .:../../lib/java/labcomm2013.jar:gen Decoder encoded_data
+java -cp .:../../lib/java/labcomm20141009.jar:gen Decoder encoded_data
 
 echo "running C decoder:"
 ./example_decoder encoded_data
 
 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 LabComm20141009
 
 echo "running python encoder:"
 PYTHONPATH=../../lib/python:gen ./example_encoder.py encoded_data2
 
 echo "running Java  decoder:"
-java -cp .:../../lib/java/labcomm2013.jar:gen Decoder encoded_data2
+java -cp .:../../lib/java/labcomm20141009.jar:gen Decoder encoded_data2
 
 echo "running C decoder:"
 ./example_decoder encoded_data2

examples/wiki_example/example_decoder.py

@@ -4,7 +4,7 @@ import labcomm
 import sys
 
 if __name__ == "__main__":
-    version = sys.argv[2] if len(sys.argv) == 3 else "LabComm2013"
+    version = sys.argv[2] if len(sys.argv) == 3 else "LabComm20141009"
     d = labcomm.Decoder(labcomm.StreamReader(open(sys.argv[1])), version)
 
     while True:

lib/Makefile

@@ -10,8 +10,10 @@ clean:
 	cd c ; make clean
 	cd csharp ; make clean
 	cd java ; make clean
+	$(MAKE) -C python clean
 
 distclean:
 	cd c ; make distclean
 	cd csharp ; make clean
 	cd java ; make clean
+	$(MAKE) -C python clean

lib/RAPID/README

@@ -34,7 +34,7 @@ or
 	$ VAR Encoder e;
 	$ Init_Encoder e, st;
 This will read/write the version of LabComm to ensure compatibility, current
-version is "LabComm2013".
+version is "LabComm20141009".
 
 # Initiate the labcomm samples:
 LabComm trusts the application to manage each sample. It requests the samples,

lib/c/Makefile

 ## Macros
 UNAME_S=$(shell uname -s)
-ALL_DEPS=liblabcomm.a liblabcomm.so.1 liblabcomm2006.a liblabcomm2006.so.1  liblabcomm2013.a liblabcomm2013.so.1
+ALL_DEPS=liblabcomm.a liblabcomm.so.1 liblabcomm2006.a liblabcomm2006.so.1  liblabcomm20141009.a liblabcomm20141009.so.1
 
 ifeq ($(UNAME_S),Linux)
   CFLAGS=-std=c99 -g -Wall -Werror -O3  -I. -Itest -I2006
@@ -95,10 +95,10 @@ liblabcomm.a: $(OBJS) $(OBJS2006)
 liblabcomm.so.1: $(OBJS:%.o=%.pic.o) $(OBJS2006:%.o=%.pic.o)
 	$(call MAKESHARED,$@,$@,$^)
 
-liblabcomm2013.a: $(OBJS)
+liblabcomm20141009.a: $(OBJS)
 	ar -r $@ $^
 
-liblabcomm2013.so.1: $(OBJS:%.o=%.pic.o)
+liblabcomm20141009.so.1: $(OBJS:%.o=%.pic.o)
 	$(call MAKESHARED,$@,$@,$^)
 
 liblabcomm2006.a: $(OBJS2006)
@@ -178,8 +178,8 @@ distclean: clean
 	$(RM) liblabcomm.a
 	$(RM) liblabcomm2006.so.1
 	$(RM) liblabcomm2006.a
-	$(RM) liblabcomm2013.so.1
-	$(RM) liblabcomm2013.a
+	$(RM) liblabcomm20141009.so.1
+	$(RM) liblabcomm20141009.a
 
 # Extra dependencies
 $(TEST_DIR)/test_labcomm_basic_type_encoding.o: labcomm_private.h

lib/c/labcomm.c

@@ -37,7 +37,7 @@
 #include "labcomm_ioctl.h"
 #include "labcomm_dynamic_buffer_writer.h"
 
-#define LABCOMM_VERSION "LabComm2013"
+#define LABCOMM_VERSION "LabComm20141009"
 
 /* Unwrapping reader/writer functions */
 #define UNWRAP_ac(rw, ac, ...) ac

lib/c/labcomm_decoder.c

@@ -18,7 +18,7 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#define LABCOMM_VERSION "LabComm2013"
+#define LABCOMM_VERSION "LabComm20141009"
 
 #include <errno.h>
 #include "labcomm.h"
@@ -166,7 +166,7 @@ out:
   return result;
 }
 
-static int decode_typedef_or_sample(struct labcomm_decoder *d, int kind)
+static int decode_sample(struct labcomm_decoder *d, int kind)
 {
   int result;
 
@@ -310,8 +310,8 @@ int labcomm_decoder_decode_one(struct labcomm_decoder *d)
     result = d->reader->error;
     goto out;
   }
-  if (remote_index == LABCOMM_TYPEDEF || remote_index == LABCOMM_SAMPLE) {
-    result = decode_typedef_or_sample(d, remote_index); 
+  if (remote_index == LABCOMM_SAMPLE) {
+    result = decode_sample(d, remote_index); 
   } else {
     int *local_index;
     struct call_handler_context wrap = {

lib/c/labcomm_encoder.c

@@ -18,7 +18,7 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#define LABCOMM_VERSION "LabComm2013"
+#define LABCOMM_VERSION "LabComm20141009"
 
 #include <errno.h>
 #include "labcomm.h"

lib/csharp/se/lth/control/labcomm/LabComm.cs

@@ -2,7 +2,7 @@ namespace se.lth.control.labcomm {
 
   public class LabComm {
 
-   public const string VERSION = "LabComm2013";
+   public const string VERSION = "LabComm20141009";
 
    /*
      * Predeclared aggregate type indices

lib/csharp/se/lth/control/labcomm/LabCommDecoderChannel.cs

@@ -25,7 +25,6 @@ namespace se.lth.control.labcomm {
       while (!done) {
 	int tag = decodePacked32();
 	switch (tag) {
-	case LabComm.TYPEDEF:
         case LabComm.SAMPLE: {
           int index = decodePacked32();
           String name = decodeString();

lib/java/Makefile

@@ -13,13 +13,13 @@ MODULES=LabCommDispatcher \
 	LabCommReader \
 	WriterWrapper
 
-all: labcomm.jar labcomm2013.jar labcomm2006.jar
+all: labcomm.jar labcomm20141009.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
+labcomm20141009.jar: gen/JAVAC
 	echo $@
 	cd gen ; jar cf ../$@ se/lth/control/labcomm/*.class
 
@@ -38,5 +38,5 @@ gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) $(MODULES:%=se/lth/control
 .PHONY: clean
 
 clean:
-	rm -rf labcomm.jar labcomm2006.jar labcomm2013.jar gen 
+	rm -rf labcomm.jar labcomm2006.jar labcomm20141009.jar gen 
 

lib/java/se/lth/control/labcomm/LabComm.java

@@ -2,7 +2,7 @@ package se.lth.control.labcomm;
 
 public class LabComm {
 
-  public static final String VERSION = "LabComm2013";
+  public static final String VERSION = "LabComm20141009";
 
   /*
    * Predeclared aggregate type indices