Rebuild native libraries

java-native-access · May 4, 2024 · 2e94624 · 2e94624
1 parent 1b86791
commit 2e94624
Show file tree

Hide file tree

Showing 37 changed files with 33 additions and 21 deletions.
diff --git a/common.xml b/common.xml
@@ -23,7 +23,7 @@
     <!-- jnidispatch library release version -->
     <property name="jni.major" value="7"/>
     <property name="jni.minor" value="0"/>
-    <property name="jni.revision" value="1"/>
+    <property name="jni.revision" value="2"/>
     <property name="jni.build" value="0"/> <!--${build.number}-->
     <property name="jni.version" value="${jni.major}.${jni.minor}.${jni.revision}"/>
     <property name="jni.md5" value="5fb98531302accd485c534c452dd952a"/>

diff --git a/lib/native/aix-ppc.jar b/lib/native/aix-ppc.jar
diff --git a/lib/native/aix-ppc64.jar b/lib/native/aix-ppc64.jar
diff --git a/lib/native/android-aarch64.jar b/lib/native/android-aarch64.jar
diff --git a/lib/native/android-arm.jar b/lib/native/android-arm.jar
diff --git a/lib/native/android-armv7.jar b/lib/native/android-armv7.jar
diff --git a/lib/native/android-mips.jar b/lib/native/android-mips.jar
diff --git a/lib/native/android-mips64.jar b/lib/native/android-mips64.jar
diff --git a/lib/native/android-x86-64.jar b/lib/native/android-x86-64.jar
diff --git a/lib/native/android-x86.jar b/lib/native/android-x86.jar
diff --git a/lib/native/darwin-aarch64.jar b/lib/native/darwin-aarch64.jar
diff --git a/lib/native/darwin-x86-64.jar b/lib/native/darwin-x86-64.jar
diff --git a/lib/native/dragonflybsd-x86-64.jar b/lib/native/dragonflybsd-x86-64.jar
diff --git a/lib/native/freebsd-aarch64.jar b/lib/native/freebsd-aarch64.jar
diff --git a/lib/native/freebsd-x86-64.jar b/lib/native/freebsd-x86-64.jar
diff --git a/lib/native/freebsd-x86.jar b/lib/native/freebsd-x86.jar
diff --git a/lib/native/linux-aarch64.jar b/lib/native/linux-aarch64.jar
diff --git a/lib/native/linux-arm.jar b/lib/native/linux-arm.jar
diff --git a/lib/native/linux-armel.jar b/lib/native/linux-armel.jar
diff --git a/lib/native/linux-mips64el.jar b/lib/native/linux-mips64el.jar
diff --git a/lib/native/linux-ppc.jar b/lib/native/linux-ppc.jar
diff --git a/lib/native/linux-ppc64le.jar b/lib/native/linux-ppc64le.jar
diff --git a/lib/native/linux-riscv64.jar b/lib/native/linux-riscv64.jar
diff --git a/lib/native/linux-s390x.jar b/lib/native/linux-s390x.jar
diff --git a/lib/native/linux-x86-64.jar b/lib/native/linux-x86-64.jar
diff --git a/lib/native/linux-x86.jar b/lib/native/linux-x86.jar
diff --git a/lib/native/openbsd-x86-64.jar b/lib/native/openbsd-x86-64.jar
diff --git a/lib/native/openbsd-x86.jar b/lib/native/openbsd-x86.jar
diff --git a/lib/native/sunos-sparc.jar b/lib/native/sunos-sparc.jar
diff --git a/lib/native/sunos-sparcv9.jar b/lib/native/sunos-sparcv9.jar
diff --git a/lib/native/sunos-x86-64.jar b/lib/native/sunos-x86-64.jar
diff --git a/lib/native/sunos-x86.jar b/lib/native/sunos-x86.jar
diff --git a/lib/native/win32-aarch64.jar b/lib/native/win32-aarch64.jar
diff --git a/lib/native/win32-x86-64.jar b/lib/native/win32-x86-64.jar
diff --git a/lib/native/win32-x86.jar b/lib/native/win32-x86.jar
diff --git a/www/BuildingNativeLibraries.md b/www/BuildingNativeLibraries.md
@@ -51,26 +51,26 @@ 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 ../
    cd ..
    ```
 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
 ```
diff --git 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
 ```