diff --git a/common.xml b/common.xml index c3114b1a9..cb09efa3b 100644 --- a/common.xml +++ b/common.xml @@ -23,7 +23,7 @@ - + diff --git a/lib/native/aix-ppc.jar b/lib/native/aix-ppc.jar index d320e518a..b276542d2 100644 Binary files a/lib/native/aix-ppc.jar and b/lib/native/aix-ppc.jar differ diff --git a/lib/native/aix-ppc64.jar b/lib/native/aix-ppc64.jar index 4781df520..c8d1cbacf 100644 Binary files a/lib/native/aix-ppc64.jar and b/lib/native/aix-ppc64.jar differ diff --git a/lib/native/android-aarch64.jar b/lib/native/android-aarch64.jar index da17e29a0..c36017dd3 100644 Binary files a/lib/native/android-aarch64.jar and b/lib/native/android-aarch64.jar differ diff --git a/lib/native/android-arm.jar b/lib/native/android-arm.jar index 448af72b1..a0c3aa574 100644 Binary files a/lib/native/android-arm.jar and b/lib/native/android-arm.jar differ diff --git a/lib/native/android-armv7.jar b/lib/native/android-armv7.jar index dec4da4d9..d8980fbdf 100644 Binary files a/lib/native/android-armv7.jar and b/lib/native/android-armv7.jar differ diff --git a/lib/native/android-mips.jar b/lib/native/android-mips.jar index 9b6941124..db792171a 100644 Binary files a/lib/native/android-mips.jar and b/lib/native/android-mips.jar differ diff --git a/lib/native/android-mips64.jar b/lib/native/android-mips64.jar index efc849a70..5fae9b3fb 100644 Binary files a/lib/native/android-mips64.jar and b/lib/native/android-mips64.jar differ diff --git a/lib/native/android-x86-64.jar b/lib/native/android-x86-64.jar index 37c6fba62..0c917467e 100644 Binary files a/lib/native/android-x86-64.jar and b/lib/native/android-x86-64.jar differ diff --git a/lib/native/android-x86.jar b/lib/native/android-x86.jar index 7ca9facae..606ab06b0 100644 Binary files a/lib/native/android-x86.jar and b/lib/native/android-x86.jar differ diff --git a/lib/native/darwin-aarch64.jar b/lib/native/darwin-aarch64.jar index 7f63364b5..6aae8d230 100644 Binary files a/lib/native/darwin-aarch64.jar and b/lib/native/darwin-aarch64.jar differ diff --git a/lib/native/darwin-x86-64.jar b/lib/native/darwin-x86-64.jar index 1d03919c8..46ca9c0a3 100644 Binary files a/lib/native/darwin-x86-64.jar and b/lib/native/darwin-x86-64.jar differ diff --git a/lib/native/dragonflybsd-x86-64.jar b/lib/native/dragonflybsd-x86-64.jar index 96d6726a6..75a6adbc0 100644 Binary files a/lib/native/dragonflybsd-x86-64.jar and b/lib/native/dragonflybsd-x86-64.jar differ diff --git a/lib/native/freebsd-aarch64.jar b/lib/native/freebsd-aarch64.jar index 3509da7ca..d86396814 100644 Binary files a/lib/native/freebsd-aarch64.jar and b/lib/native/freebsd-aarch64.jar differ diff --git a/lib/native/freebsd-x86-64.jar b/lib/native/freebsd-x86-64.jar index 7ef447837..769191b3b 100644 Binary files a/lib/native/freebsd-x86-64.jar and b/lib/native/freebsd-x86-64.jar differ diff --git a/lib/native/freebsd-x86.jar b/lib/native/freebsd-x86.jar index 69025f073..46563688d 100644 Binary files a/lib/native/freebsd-x86.jar and b/lib/native/freebsd-x86.jar differ diff --git a/lib/native/linux-aarch64.jar b/lib/native/linux-aarch64.jar index 195992698..c8ce19c08 100644 Binary files a/lib/native/linux-aarch64.jar and b/lib/native/linux-aarch64.jar differ diff --git a/lib/native/linux-arm.jar b/lib/native/linux-arm.jar index 5d206acf0..216e01524 100644 Binary files a/lib/native/linux-arm.jar and b/lib/native/linux-arm.jar differ diff --git a/lib/native/linux-armel.jar b/lib/native/linux-armel.jar index 7b6355ae1..be8554329 100644 Binary files a/lib/native/linux-armel.jar and b/lib/native/linux-armel.jar differ diff --git a/lib/native/linux-mips64el.jar b/lib/native/linux-mips64el.jar index ae2dc8e0b..d6098a65d 100644 Binary files a/lib/native/linux-mips64el.jar and b/lib/native/linux-mips64el.jar differ diff --git a/lib/native/linux-ppc.jar b/lib/native/linux-ppc.jar index 28633c581..28a8042cd 100644 Binary files a/lib/native/linux-ppc.jar and b/lib/native/linux-ppc.jar differ diff --git a/lib/native/linux-ppc64le.jar b/lib/native/linux-ppc64le.jar index f889c795f..4d6a2d667 100644 Binary files a/lib/native/linux-ppc64le.jar and b/lib/native/linux-ppc64le.jar differ diff --git a/lib/native/linux-riscv64.jar b/lib/native/linux-riscv64.jar index 955af7028..1acdb1994 100644 Binary files a/lib/native/linux-riscv64.jar and b/lib/native/linux-riscv64.jar differ diff --git a/lib/native/linux-s390x.jar b/lib/native/linux-s390x.jar index 43de1fd53..bb049c0af 100644 Binary files a/lib/native/linux-s390x.jar and b/lib/native/linux-s390x.jar differ diff --git a/lib/native/linux-x86-64.jar b/lib/native/linux-x86-64.jar index 429923d66..d659f63ac 100644 Binary files a/lib/native/linux-x86-64.jar and b/lib/native/linux-x86-64.jar differ diff --git a/lib/native/linux-x86.jar b/lib/native/linux-x86.jar index b2186d3fa..e4b7ac14f 100644 Binary files a/lib/native/linux-x86.jar and b/lib/native/linux-x86.jar differ diff --git a/lib/native/openbsd-x86-64.jar b/lib/native/openbsd-x86-64.jar index 511a873fb..67a905ba3 100644 Binary files a/lib/native/openbsd-x86-64.jar and b/lib/native/openbsd-x86-64.jar differ diff --git a/lib/native/openbsd-x86.jar b/lib/native/openbsd-x86.jar index 8ea35ca00..5082e73dd 100644 Binary files a/lib/native/openbsd-x86.jar and b/lib/native/openbsd-x86.jar differ diff --git a/lib/native/sunos-sparc.jar b/lib/native/sunos-sparc.jar index bdada2bbc..0ee42c41e 100644 Binary files a/lib/native/sunos-sparc.jar and b/lib/native/sunos-sparc.jar differ diff --git a/lib/native/sunos-sparcv9.jar b/lib/native/sunos-sparcv9.jar index ab9cebf40..960b7a5e5 100644 Binary files a/lib/native/sunos-sparcv9.jar and b/lib/native/sunos-sparcv9.jar differ diff --git a/lib/native/sunos-x86-64.jar b/lib/native/sunos-x86-64.jar index 0ad34edcb..c320a9f8c 100644 Binary files a/lib/native/sunos-x86-64.jar and b/lib/native/sunos-x86-64.jar differ diff --git a/lib/native/sunos-x86.jar b/lib/native/sunos-x86.jar index 0ff8985f7..40b902412 100644 Binary files a/lib/native/sunos-x86.jar and b/lib/native/sunos-x86.jar differ diff --git a/lib/native/win32-aarch64.jar b/lib/native/win32-aarch64.jar index b52e6f4d7..776476ef4 100644 Binary files a/lib/native/win32-aarch64.jar and b/lib/native/win32-aarch64.jar differ diff --git a/lib/native/win32-x86-64.jar b/lib/native/win32-x86-64.jar index dbbb30d34..f684cc150 100644 Binary files a/lib/native/win32-x86-64.jar and b/lib/native/win32-x86-64.jar differ diff --git a/lib/native/win32-x86.jar b/lib/native/win32-x86.jar index 7259a5ad2..45d727450 100644 Binary files a/lib/native/win32-x86.jar and b/lib/native/win32-x86.jar differ diff --git a/www/BuildingNativeLibraries.md b/www/BuildingNativeLibraries.md index 9d8f8ca9e..98596bef6 100644 --- a/www/BuildingNativeLibraries.md +++ b/www/BuildingNativeLibraries.md @@ -51,7 +51,7 @@ folder. # Reference the 32bit JKD 6 export JAVA_HOME=/usr/java6 # Build - cd build-package-aix-ppc-7.0.1 + cd build-package-aix-ppc-7.0.2 bash build.sh # Copy result cp aix-ppc.jar ../ @@ -59,18 +59,18 @@ folder. ``` 6. Build 64bit: ```bash - # Reference the 64bit JKD 6 + # Reference the 64bit JKD 7 export JAVA_HOME=/usr/java7_64 # Build - cd build-package-aix-ppc64-7.0.1 + cd build-package-aix-ppc64-7.0.2 bash build.sh # Copy result cp aix-ppc64.jar ../ cd .. ``` -7. Cleanup: `rm -r build-package-aix-ppc-7.0.1 build-package-aix-ppc-7.0.1.zip build-package-aix-ppc64-7.0.1 build-package-aix-ppc64-7.0.1.zip` +7. Cleanup: `rm -r build-package-aix-ppc-7.0.2 build-package-aix-ppc-7.0.2.zip build-package-aix-ppc64-7.0.2 build-package-aix-ppc64-7.0.2.zip` 8. Exit build system: `exit` -9. Copy binaries to local system `scp "user@cfarm111.cfarm.net:*.jar lib/native` +9. Copy binaries to local system `scp "user@cfarm111.cfarm.net:*.jar" lib/native` ### Darwin / mac OS @@ -111,7 +111,7 @@ Build on the opencsw buildfarm https://www.opencsw.org/. # Reference the 32bit JKD 7 export JAVA_HOME=/opt/csw/java/jdk1.7.0_80 # Build - cd build-package-sunos-sparc-7.0.1/native/libffi + cd build-package-sunos-sparc-7.0.2/native/libffi bash autogen.sh ./configure cd ../.. @@ -122,10 +122,10 @@ Build on the opencsw buildfarm https://www.opencsw.org/. ``` 7. Build 64bit: ```bash - # Reference the 64bit JKD 7 + # Reference the 64bit JKD 8 export JAVA_HOME=/opt/csw/java/jdk1.8.0_201 # Build - cd build-package-sunos-sparcv9-7.0.1/native/libffi + cd build-package-sunos-sparcv9-7.0.2/native/libffi bash autogen.sh ./configure cd ../.. @@ -150,7 +150,7 @@ Build on the opencsw buildfarm https://www.opencsw.org/. # Reference the 32bit JKD 7 export JAVA_HOME=/opt/csw/java/jdk1.7.0_80 # Build - cd build-package-sunos-x86-7.0.1/native/libffi + cd build-package-sunos-x86-7.0.2/native/libffi bash autogen.sh ./configure cd ../.. @@ -161,10 +161,10 @@ Build on the opencsw buildfarm https://www.opencsw.org/. ``` 11. Build 64bit: ```bash - # Reference the 64bit JKD 7 + # Reference the 64bit JKD 8 export JAVA_HOME=/opt/csw/java/jdk1.8.0_201 # Build - cd build-package-sunos-x86-64-7.0.1/native/libffi + cd build-package-sunos-x86-64-7.0.2/native/libffi bash autogen.sh ./configure cd ../.. @@ -174,7 +174,7 @@ Build on the opencsw buildfarm https://www.opencsw.org/. cd .. ``` 12. Return to login system `logout` -13. Cleanup: `rm -r build-package-sunos-sparc-7.0.1 build-package-sunos-sparc-7.0.1.zip build-package-sunos-sparcv9-7.0.1 build-package-sunos-sparcv9-7.0.1.zip build-package-sunos-x86-64-7.0.1 build-package-sunos-x86-64-7.0.1.zip build-package-sunos-x86-7.0.1 build-package-sunos-x86-7.0.1.zip` +13. Cleanup: `rm -r build-package-sunos-sparc-7.0.2 build-package-sunos-sparc-7.0.2.zip build-package-sunos-sparcv9-7.0.2 build-package-sunos-sparcv9-7.0.2.zip build-package-sunos-x86-64-7.0.2 build-package-sunos-x86-64-7.0.2.zip build-package-sunos-x86-7.0.2 build-package-sunos-x86-7.0.2.zip` 14. Exit build system: `exit` 14. Copy binaries to local system: `scp "user@login.opencsw.org:*.jar" lib/native/` @@ -218,11 +218,21 @@ Binaries are build in VMs for They are build using the build-packages generated as part of the Linux build ``` -scp user@BUILD_HOST:src/jnalib/build/build-package-openbsd-x86-7.0.1.zip . -unzip build-package-openbsd-x86-7.0.1.zip -cd build-package-openbsd-x86-7.0.1 +scp user@BUILD_HOST:src/jnalib/build/build-package-openbsd-x86-7.0.2.zip . +unzip build-package-openbsd-x86-7.0.2.zip +cd build-package-openbsd-x86-7.0.2 +export JAVA_HOME=/usr/local/jdk-1.8.0 +export MAKE=gmake +sh build.sh +scp openbsd-x86.jar user@BUILD_HOST:src/jnalib/lib/native +``` + +``` +scp user@BUILD_HOST:src/jnalib/build/build-package-openbsd-x86-64-7.0.2.zip . +unzip build-package-openbsd-x86-7.0.2.zip +cd build-package-openbsd-x86-7.0.2 export JAVA_HOME=/usr/local/jdk-1.8.0 export MAKE=gmake sh build.sh -scp opensbd-x86.jar user@BUILD_HOST:src/jnalib/lib/native +scp openbsd-x86-64.jar user@BUILD_HOST:src/jnalib/lib/native ``` \ No newline at end of file diff --git a/www/FreeBSD.md b/www/FreeBSD.md index 5b3fc240b..123271728 100644 --- a/www/FreeBSD.md +++ b/www/FreeBSD.md @@ -53,14 +53,14 @@ unzip apache-ant-1.10.14-bin.zip # Transfer JNA source code to build environment rsync -av --exclude=.git USER@BUILD_HOST:src/jnalib/ jnalib/ -chmod +x native/libffi/configure native/libffi/install-sh # Build JNA and run unittests cd jnalib +chmod +x native/libffi/configure native/libffi/install-sh /root/apache-ant-1.10.14/bin/ant # Copy jna native library back to host system - +scp lib/native/freebsd-aarch64.jar USER@BUILD_HOST:src/jnalib/lib/native ``` x86 @@ -107,13 +107,14 @@ unzip apache-ant-1.10.14-bin.zip # Transfer JNA source code to build environment rsync -av --exclude=.git USER@BUILD_HOST:src/jnalib/ jnalib/ -chmod +x jnalib/native/libffi/configure jnalib/native/libffi/install-sh # Build JNA and run unittests cd jnalib +chmod +x native/libffi/configure native/libffi/install-sh /root/apache-ant-1.10.14/bin/ant # Copy jna native library back to host system +scp lib/native/freebsd-x86.jar USER@BUILD_HOST:src/jnalib/lib/native ``` x86-64 @@ -160,11 +161,12 @@ unzip apache-ant-1.10.14-bin.zip # Transfer JNA source code to build environment rsync -av --exclude=.git USER@BUILD_HOST:src/jnalib/ jnalib/ -chmod +x jnalib/native/libffi/configure jnalib/native/libffi/install-sh # Build JNA and run unittests cd jnalib +chmod +x native/libffi/configure native/libffi/install-sh /root/apache-ant-1.10.14/bin/ant # Copy jna native library back to host system +scp lib/native/freebsd-x86-64.jar USER@BUILD_HOST:src/jnalib/lib/native ``` \ No newline at end of file