diff --git a/Makefile b/Makefile index c8e7e153..d6689a48 100644 --- a/Makefile +++ b/Makefile @@ -1,41 +1,41 @@ all: echo "Please specify a system: windows wine linux osx" - gradle build + ./gradlew build windows: mingw32-make -C .\src\main\c windowsLocal - gradle build + ./gradlew.bat build wine: make -C src/main/c windows - gradle build + ./gradlew build linux: - sudo apt-get install liblockdev1-dev + sudo apt-get install liblockfile-dev make -C src/main/c linux - gradle build + ./gradlew build linux32: - sudo apt-get install liblockdev1-dev + sudo apt-get install liblockfile-dev libc6-dev-i386 make -C src/main/c linux32 - gradle build + ./gradlew build linux64: - sudo apt-get install liblockdev1-dev + sudo apt-get install liblockfile-dev make -C src/main/c linux64 - gradle build + ./gradlew build freebsd: gmake -C src/main/c freebsd - gradle build + ./gradlew build freebsd32: gmake -C src/main/c freebsd32 - gradle build + ./gradlew build freebsd64: gmake -C src/main/c freebsd64 - gradle build + ./gradlew build arm: - sudo apt-get install g++-arm-linux-gnueabihf g++-arm-linux-gnueabi g++-aarch64-linux-gnu liblockdev1-dev + sudo apt-get install g++-arm-linux-gnueabihf g++-arm-linux-gnueabi g++-aarch64-linux-gnu liblockfile-dev make -C src/main/c arm - gradle build + ./gradlew build ppc: make -C src/main/c ppc - gradle build + ./gradlew build osx: make -C src/main/c osx - gradle build + ./gradlew build diff --git a/src/main/c/Makefile b/src/main/c/Makefile index 77c0bf58..797cd131 100644 --- a/src/main/c/Makefile +++ b/src/main/c/Makefile @@ -4,6 +4,8 @@ # See https://stackoverflow.com/questions/5378518/ for installation help. OSXSDKPREFIX = /Developer/SDKs/MacOSX10.5.sdk +JDKLOCATION=$(HOME)/bin/java8 + OSXJAVAINCLUDE1 = -I/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers OSXJAVAINCLUDE2 = -I$(OSXSDKPREFIX)/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers OSXJAVAINCLUDE4 = -I$(OSXSDKPREFIX)/usr/include @@ -17,21 +19,21 @@ LINKOSX=cc $(OSXARCH) -dynamiclib -framework JavaVM -framework IOKit -framework LINOBJ=build/fixup.o build/fuserImp.o build/SerialImp.o -LININCLUDE=-I/usr/lib/jvm/java-8-openjdk-amd64/include/ -I/usr/lib/jvm/java-8-openjdk-amd64/include/linux/ -I/usr/lib/jvm/java-7-openjdk-amd64/include/ -I/usr/lib/jvm/java-7-openjdk-i386/include/ -I"./include" -I"./include/target" -I/usr/lib/jvm/java-6-openjdk-amd64/include/ -I/usr/lib/jvm/java-6-openjdk-armhf/include/ -I/usr/lib/jvm/java-6-openjdk-arm/include/ -I/usr/lib/jvm/java-6-openjdk-i386/include/ -I/etc/alternatives/java_sdk/include -I/etc/alternatives/java_sdk/include/linux -I/usr/lib/jvm/default-java/include -I/usr/lib/jvm/default-java/include/linux +LININCLUDE= -I"./include" -I"./include/target" -I$(JDKLOCATION)/include -I$(JDKLOCATION)/include/linux -CCLIN32=gcc $(LININCLUDE) -DLIBLOCKDEV -O3 -Wall -c -fmessage-length=0 -fPIC -m32 -MMD +CCLIN32=gcc $(LININCLUDE) -O3 -Wall -c -fmessage-length=0 -fPIC -m32 -MMD LINKLIN32=g++ -m32 -shared -Lcross-compile-libs/x86_32 -CCLIN64=gcc $(LININCLUDE) -DLIBLOCKDEV -O3 -Wall -c -fmessage-length=0 -fPIC -m64 -MMD +CCLIN64=gcc $(LININCLUDE) -O3 -Wall -c -fmessage-length=0 -fPIC -m64 -MMD LINKLIN64=g++ -m64 -shared -CCLINARM32=arm-linux-gnueabi-gcc $(LININCLUDE) -DLIBLOCKDEV -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP +CCLINARM32=arm-linux-gnueabi-gcc $(LININCLUDE) -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP LINKLINARM32=arm-linux-gnueabi-g++ -shared -fPIC -nostdlib -Lcross-compile-libs/ARM_32 -CCLINARM32_HF=arm-linux-gnueabihf-gcc $(LININCLUDE) -DLIBLOCKDEV -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP +CCLINARM32_HF=arm-linux-gnueabihf-gcc $(LININCLUDE) -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP LINKLINARM32_HF=arm-linux-gnueabihf-g++ -shared -fPIC -nostdlib -Lcross-compile-libs/ARM_32 -CCLINARM64=aarch64-linux-gnu-gcc $(LININCLUDE) -DLIBLOCKDEV -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP +CCLINARM64=aarch64-linux-gnu-gcc $(LININCLUDE) -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MP LINKLINARM64=aarch64-linux-gnu-g++ -shared -fPIC -nostdlib -Lcross-compile-libs/ARM_64 CCLINANDROID=/home/opt/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/arm-linux-androideabi/bin/gcc $(LININCLUDE) -O3 -Wall -c -fmessage-length=0 -fPIC -MMD -MMD -MP @@ -122,7 +124,7 @@ windowsLocal: windows:dirs - export WINEPREFIX=/home/hephaestus/.wine/ + export WINEPREFIX=$(HOME)/.wine/ $(CCWIN32) src/windows/init.c -o build/init.o $(CCWIN32) src/windows/termios.c -o build/termios.o $(CCWIN32) src/fixup.c -o build/fixup.o @@ -142,18 +144,18 @@ windows:dirs linux:linux32 linux64 arm ppc echo all Linux ok! linux32:dirs - $(CCLIN32) src/fixup.c -o build/fixup.o - $(CCLIN32) src/fuserImp.c -o build/fuserImp.o - $(CCLIN32) src/SerialImp.c -o build/SerialImp.o + $(CCLIN32) -m32 src/fixup.c -o build/fixup.o + $(CCLIN32) -m32 src/fuserImp.c -o build/fuserImp.o + $(CCLIN32) -m32 src/SerialImp.c -o build/SerialImp.o #rm "resources/native/linux/x86_32/libNRJavaSerial.so" - $(LINKLIN32) -o"resources/native/linux/x86_32/libNRJavaSerial.so" $(LINOBJ) -llockdev + $(LINKLIN32) -o"resources/native/linux/x86_32/libNRJavaSerial.so" $(LINOBJ) rm build/* linux64:dirs $(CCLIN64) src/fixup.c -o build/fixup.o $(CCLIN64) src/fuserImp.c -o build/fuserImp.o $(CCLIN64) src/SerialImp.c -o build/SerialImp.o #rm "resources/native/linux/x86_64/libNRJavaSerial.so" - $(LINKLIN64) -o"resources/native/linux/x86_64/libNRJavaSerial.so" $(LINOBJ) -llockdev + $(LINKLIN64) -o"resources/native/linux/x86_64/libNRJavaSerial.so" $(LINOBJ) rm build/* freebsd:freebsd32 freebsd64 echo all FreeBSD ok! @@ -188,56 +190,56 @@ arm64v8:dirs $(CCLINARM64) -march=armv8-a src/fixup.c -o build/fixup.o $(CCLINARM64) -march=armv8-a src/fuserImp.c -o build/fuserImp.o $(CCLINARM64) -march=armv8-a src/SerialImp.c -o build/SerialImp.o - $(LINKLINARM64) -march=armv8-a -o"resources/native/linux/ARM_64/libNRJavaSerialv8.so" $(LINOBJ) -llockdev + $(LINKLINARM64) -march=armv8-a -o"resources/native/linux/ARM_64/libNRJavaSerialv8.so" $(LINOBJ) rm build/* arm32v8:dirs $(CCLINARM32) -march=armv8-a src/fixup.c -o build/fixup.o $(CCLINARM32) -march=armv8-a src/fuserImp.c -o build/fuserImp.o $(CCLINARM32) -march=armv8-a src/SerialImp.c -o build/SerialImp.o - $(LINKLINARM32) -march=armv8-a -o"resources/native/linux/ARM_32/libNRJavaSerialv8.so" $(LINOBJ) -llockdev + $(LINKLINARM32) -march=armv8-a -o"resources/native/linux/ARM_32/libNRJavaSerialv8.so" $(LINOBJ) rm build/* arm32v8HF:dirs $(CCLINARM32_HF) -march=armv8-a src/fixup.c -o build/fixup.o $(CCLINARM32_HF) -march=armv8-a src/fuserImp.c -o build/fuserImp.o $(CCLINARM32_HF) -march=armv8-a src/SerialImp.c -o build/SerialImp.o - $(LINKLINARM32_HF) -march=armv8-a -o"resources/native/linux/ARM_32/libNRJavaSerialv8_HF.so" $(LINOBJ) -llockdev + $(LINKLINARM32_HF) -march=armv8-a -o"resources/native/linux/ARM_32/libNRJavaSerialv8_HF.so" $(LINOBJ) rm build/* arm32v7:dirs $(CCLINARM32) -march=armv7-a src/fixup.c -o build/fixup.o $(CCLINARM32) -march=armv7-a src/fuserImp.c -o build/fuserImp.o $(CCLINARM32) -march=armv7-a src/SerialImp.c -o build/SerialImp.o - $(LINKLINARM32) -march=armv7-a -o"resources/native/linux/ARM_32/libNRJavaSerialv7.so" $(LINOBJ) -llockdev + $(LINKLINARM32) -march=armv7-a -o"resources/native/linux/ARM_32/libNRJavaSerialv7.so" $(LINOBJ) rm build/* arm32v7HF:dirs $(CCLINARM32_HF) -march=armv7-a src/fixup.c -o build/fixup.o $(CCLINARM32_HF) -march=armv7-a src/fuserImp.c -o build/fuserImp.o $(CCLINARM32_HF) -march=armv7-a src/SerialImp.c -o build/SerialImp.o - $(LINKLINARM32_HF) -march=armv7-a -o"resources/native/linux/ARM_32/libNRJavaSerialv7_HF.so" $(LINOBJ) -llockdev + $(LINKLINARM32_HF) -march=armv7-a -o"resources/native/linux/ARM_32/libNRJavaSerialv7_HF.so" $(LINOBJ) rm build/* arm32v6:dirs $(CCLINARM32) -march=armv6 src/fixup.c -o build/fixup.o $(CCLINARM32) -march=armv6 src/fuserImp.c -o build/fuserImp.o $(CCLINARM32) -march=armv6 src/SerialImp.c -o build/SerialImp.o - $(LINKLINARM32) -march=armv6 -o"resources/native/linux/ARM_32/libNRJavaSerialv6.so" $(LINOBJ) -llockdev + $(LINKLINARM32) -march=armv6 -o"resources/native/linux/ARM_32/libNRJavaSerialv6.so" $(LINOBJ) rm build/* arm32v6HF:dirs $(CCLINARM32_HF) -march=armv6 -mfpu=vfp -marm src/fixup.c -o build/fixup.o $(CCLINARM32_HF) -march=armv6 -mfpu=vfp -marm src/fuserImp.c -o build/fuserImp.o $(CCLINARM32_HF) -march=armv6 -mfpu=vfp -marm src/SerialImp.c -o build/SerialImp.o - $(LINKLINARM32_HF) -march=armv6 -mfpu=vfp -marm -o"resources/native/linux/ARM_32/libNRJavaSerialv6_HF.so" $(LINOBJ) -llockdev + $(LINKLINARM32_HF) -march=armv6 -mfpu=vfp -marm -o"resources/native/linux/ARM_32/libNRJavaSerialv6_HF.so" $(LINOBJ) rm build/* arm32v5:dirs $(CCLINARM32) -march=armv5t src/fixup.c -o build/fixup.o $(CCLINARM32) -march=armv5t src/fuserImp.c -o build/fuserImp.o $(CCLINARM32) -march=armv5t src/SerialImp.c -o build/SerialImp.o - $(LINKLINARM32) -march=armv5t -o"resources/native/linux/ARM_32/libNRJavaSerialv5.so" $(LINOBJ) -llockdev + $(LINKLINARM32) -march=armv5t -o"resources/native/linux/ARM_32/libNRJavaSerialv5.so" $(LINOBJ) rm build/* ppc:dirs diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv5.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv5.so index 2c5b3d5d..b0950f02 100755 Binary files a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv5.so and b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv5.so differ diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv6.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv6.so index dec308c3..01783eef 100755 Binary files a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv6.so and b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv6.so differ diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv6_HF.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv6_HF.so index 6820734c..5faaeb5f 100755 Binary files a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv6_HF.so and b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv6_HF.so differ diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv7.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv7.so index 1646222a..f20330c4 100755 Binary files a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv7.so and b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv7.so differ diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv7_HF.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv7_HF.so index bdaeba50..a0992824 100755 Binary files a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv7_HF.so and b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv7_HF.so differ diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv8.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv8.so index f2fd5540..7ba89216 100755 Binary files a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv8.so and b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv8.so differ diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv8_HF.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv8_HF.so index 0ee32570..e492db23 100755 Binary files a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv8_HF.so and b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv8_HF.so differ diff --git a/src/main/c/resources/native/linux/ARM_64/libNRJavaSerialv8.so b/src/main/c/resources/native/linux/ARM_64/libNRJavaSerialv8.so index 5da6a6ed..342a21cf 100755 Binary files a/src/main/c/resources/native/linux/ARM_64/libNRJavaSerialv8.so and b/src/main/c/resources/native/linux/ARM_64/libNRJavaSerialv8.so differ diff --git a/src/main/c/resources/native/linux/x86_64/libNRJavaSerial.so b/src/main/c/resources/native/linux/x86_64/libNRJavaSerial.so index e481b3f2..76409173 100755 Binary files a/src/main/c/resources/native/linux/x86_64/libNRJavaSerial.so and b/src/main/c/resources/native/linux/x86_64/libNRJavaSerial.so differ diff --git a/src/main/resources/com/neuronrobotics/nrjavaserial/build.properties b/src/main/resources/com/neuronrobotics/nrjavaserial/build.properties index 11c98adf..463a5438 100644 --- a/src/main/resources/com/neuronrobotics/nrjavaserial/build.properties +++ b/src/main/resources/com/neuronrobotics/nrjavaserial/build.properties @@ -1,3 +1,3 @@ app.name = nrjavaserial -app.version = 3.15.0 +app.version = 3.16.0 app.javac.version = 1.6