From 5f305a4738b60b9a87f4012fcaa6e5e59a775b68 Mon Sep 17 00:00:00 2001 From: Nico Date: Wed, 20 Jan 2016 19:00:02 +0100 Subject: [PATCH 1/5] Fix git submodule Also related to #1 Then you can use to sync the submodule again: ``` git submodule sync git submodule init git submodule update ``` --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index ce2aeb4..29ebbb6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "libserialport"] path = libserialport - url = git@github.com:facchinm/libserialport.git + url = https://github.com/facchinm/libserialport.git From e999f014143fac629afefeb7e7d4e903c5005769 Mon Sep 17 00:00:00 2001 From: Nico Date: Wed, 20 Jan 2016 20:27:14 +0100 Subject: [PATCH 2/5] Better build script Added -x bash option added autoconf removed && --- compile_linux.sh | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/compile_linux.sh b/compile_linux.sh index 03c3184..ffdd908 100755 --- a/compile_linux.sh +++ b/compile_linux.sh @@ -1,6 +1,23 @@ -mkdir -p distrib/linux64 && cd libserialport && ./configure && make clean && make && cd .. && gcc main.c libserialport/linux_termios.c libserialport/linux.c libserialport/serialport.c -Ilibserialport/ -o listSerialC && cp listSerialC distrib/linux64/listSerialC +#!/bin/bash -x + +mkdir -p distrib/linux64 +cd libserialport +autoconf +./configure +make clean +make +cd .. +gcc main.c libserialport/linux_termios.c libserialport/linux.c libserialport/serialport.c -Ilibserialport/ -o listSerialC +cp listSerialC distrib/linux64/listSerialC gcc jnilib.c libserialport/linux_termios.c libserialport/linux.c libserialport/serialport.c -Ilibserialport/ -I/opt/jvm/jdk1.8.0/include/ -I/opt/jvm/jdk1.8.0/include/linux/ -shared -fPIC -o liblistSerialsj.so && cp liblistSerialsj.so distrib/linux64/ -mkdir -p distrib/linux32 && cd libserialport && CFLAGS=-m32 ./configure && make clean && make && cd .. && gcc -m32 main.c libserialport/linux_termios.c libserialport/linux.c libserialport/serialport.c -Ilibserialport/ -o listSerialC && cp listSerialC distrib/linux32/listSerialC +mkdir -p distrib/linux32 +cd libserialport +CFLAGS=-m32 ./configure +make clean +make +cd .. +gcc -m32 main.c libserialport/linux_termios.c libserialport/linux.c libserialport/serialport.c -Ilibserialport/ -o listSerialC +cp listSerialC distrib/linux32/listSerialC gcc -m32 jnilib.c libserialport/linux_termios.c libserialport/linux.c libserialport/serialport.c -Ilibserialport/ -I/opt/jvm/jdk1.8.0/include/ -I/opt/jvm/jdk1.8.0/include/linux/ -shared -fPIC -o liblistSerialsj.so && cp liblistSerialsj.so distrib/linux32 From 51df3ab83db148e8b09fa85967e666b2badba9e3 Mon Sep 17 00:00:00 2001 From: NicoHood Date: Wed, 20 Jan 2016 20:31:20 +0100 Subject: [PATCH 3/5] Fixed autogen --- compile_linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compile_linux.sh b/compile_linux.sh index ffdd908..8036f91 100755 --- a/compile_linux.sh +++ b/compile_linux.sh @@ -2,7 +2,7 @@ mkdir -p distrib/linux64 cd libserialport -autoconf +./autogen.sh ./configure make clean make From 5e453fa5f83454b30789324c57c599b654de2603 Mon Sep 17 00:00:00 2001 From: NicoHood Date: Wed, 20 Jan 2016 20:47:04 +0100 Subject: [PATCH 4/5] Build script fixes --- compile_linux.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/compile_linux.sh b/compile_linux.sh index 8036f91..de126ed 100755 --- a/compile_linux.sh +++ b/compile_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash -x +#!/bin/bash -xe mkdir -p distrib/linux64 cd libserialport @@ -9,7 +9,8 @@ make cd .. gcc main.c libserialport/linux_termios.c libserialport/linux.c libserialport/serialport.c -Ilibserialport/ -o listSerialC cp listSerialC distrib/linux64/listSerialC -gcc jnilib.c libserialport/linux_termios.c libserialport/linux.c libserialport/serialport.c -Ilibserialport/ -I/opt/jvm/jdk1.8.0/include/ -I/opt/jvm/jdk1.8.0/include/linux/ -shared -fPIC -o liblistSerialsj.so && cp liblistSerialsj.so distrib/linux64/ +gcc jnilib.c libserialport/linux_termios.c libserialport/linux.c libserialport/serialport.c -Ilibserialport/ -I/usr/lib/jvm/java-1.8.0-openjdk-amd64/include/ -I/usr/lib/jvm/java-1.8.0-openjdk-amd64/include/linux/ -shared -fPIC -o liblistSerialsj.so +cp liblistSerialsj.so distrib/linux64/ mkdir -p distrib/linux32 cd libserialport @@ -17,7 +18,8 @@ CFLAGS=-m32 ./configure make clean make cd .. -gcc -m32 main.c libserialport/linux_termios.c libserialport/linux.c libserialport/serialport.c -Ilibserialport/ -o listSerialC +gcc -m32 main.c libserialport/linux_termios.c libserialport/linux.c libserialport/serialport.c -Ilibserialport/ -o listSerialC cp listSerialC distrib/linux32/listSerialC -gcc -m32 jnilib.c libserialport/linux_termios.c libserialport/linux.c libserialport/serialport.c -Ilibserialport/ -I/opt/jvm/jdk1.8.0/include/ -I/opt/jvm/jdk1.8.0/include/linux/ -shared -fPIC -o liblistSerialsj.so && cp liblistSerialsj.so distrib/linux32 +gcc -m32 jnilib.c libserialport/linux_termios.c libserialport/linux.c libserialport/serialport.c -Ilibserialport/ -I/usr/lib/jvm/java-1.8.0-openjdk-amd64/include/ -I/usr/lib/jvm/java-1.8.0-openjdk-amd64/include/linux/ -shared -fPIC -o liblistSerialsj.so +cp liblistSerialsj.so distrib/linux32 From f146284c5b4eab43a292ed2864d0c97602728e7f Mon Sep 17 00:00:00 2001 From: NicoHood Date: Wed, 20 Jan 2016 20:56:34 +0100 Subject: [PATCH 5/5] Added ARM build --- compile_arm.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100755 compile_arm.sh diff --git a/compile_arm.sh b/compile_arm.sh new file mode 100755 index 0000000..ded88f2 --- /dev/null +++ b/compile_arm.sh @@ -0,0 +1,13 @@ +#!/bin/bash -xe + +mkdir -p distrib/arm +cd libserialport +./autogen.sh +./configure +make clean +make +cd .. +gcc main.c libserialport/linux_termios.c libserialport/linux.c libserialport/serialport.c -Ilibserialport/ -o listSerialC +cp listSerialC distrib/arm/listSerialC +gcc jnilib.c libserialport/linux_termios.c libserialport/linux.c libserialport/serialport.c -Ilibserialport/ -I/usr/lib/jvm/java-1.8.0-openjdk-armhf/include/ -I/usr/lib/jvm/java-1.8.0-openjdk-armhf/include/linux/ -shared -fPIC -o liblistSerialsj.so +cp liblistSerialsj.so distrib/arm/