Merge branch 'master' into tcpudp

Author: dbwiddis

CHANGES.md

@@ -7,6 +7,9 @@ Next Release (5.7.0)
 
 Features
 --------
+* [#1238](https://github.com/java-native-access/jna/pull/1238): Add macOS `aarch64` architecture to universal `darwin` target. Cherry pick [libffi/libffi#577](https://github.com/libffi/libffi/pull/577). - [@fkistner](https://github.com/fkistner), [@Vzor-](https://github.com/Vzor-), [@tresf](https://github.com/tresf).
+* [#1264](https://github.com/java-native-access/jna/pull/1264): Update libffi to v3.3; Add Windows `aarch64` target. - [@tresf](https://github.com/tresf).
+* [#1293](https://github.com/java-native-access/jna/issues/1293): Bind part of Windows Application Recovery and Restart API: `RegisterApplicationRestart`, `UnregisterApplicationRestart` and `GetApplicationRestartSettings` in `c.s.j.p.w.Kernel32` - [@matthiasblaesing](https://github.com/matthiasblaesing).
 * [#1217](https://github.com/java-native-access/jna/pull/1217): Add mappings for AIX `Perfstat` library to `c.s.j.p.unix.aix` - [@dbwiddis](https://github.com/dbwiddis).
 * [#1231](https://github.com/java-native-access/jna/pull/1231): The test suite can now be executed on Windows using either ANSI or UNICODE win32 API by passing `-Dw32.ascii=true/false` to ant. Previously, UNICODE was always used. - [@T-Svensson](https://github.com/T-Svensson/)
 * [#1237](https://github.com/java-native-access/jna/pull/1237): *Experimental:* Add artifacts that make jna and jna-platform named modules (provide `module-info.class`). The new artifacts are named `jna-jpms.jar` and `jna-platform-jpms.jar` - [@matthiasblaesing](https://github.com/matthiasblaesing).
@@ -29,6 +32,10 @@ Bug Fixes
 * [#1278](https://github.com/java-native-access/jna/pull/1278): Improve compatibility of `c.s.j.p.WindowUtils#getProcessFilePath` and fix unittests for windows 32bit intel  - [@matthiasblaesing](https://github.com/matthiasblaesing).
 * [#1284](https://github.com/java-native-access/jna/pull/1284): Fix illegal access exceptions, when retrieving options for private library interfaces with an instance field - [@fkistner](https://github.com/fkistner).
 
+Breaking Changes
+----------------
+* Prebuild native library for darwin x86 (32bit java on mac OS) was removed
+
 Release 5.6.0
 =============
 

appveyor.yml

@@ -1,20 +1,72 @@
 version: 1.0.{build}
-image: Visual Studio 2015
+
+# speed up cloning
+shallow_clone: true
+clone_depth: 10
+
+environment:
+  matrix:
+    - TARGET_ARCH: x86_64
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      CYGWIN_PACKAGES: git,make,automake,libtool,mingw64-x86_64-gcc-g++,mingw64-x86_64-gcc-core
+      CHOCO_PACKAGES: ant cygwin
+      CYGWIN_SETUP: cygwinsetup.exe # from choco
+      JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+
+    - TARGET_ARCH: x86
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      CYGWIN_PACKAGES: git,make,automake,libtool,mingw64-i686-gcc-g++,mingw64-i686-gcc-core
+      CHOCO_PACKAGES: ant cygwin
+      CYGWIN_SETUP: cygwinsetup.exe # from choco
+      JAVA_HOME: C:\Program Files (x86)\Java\jdk1.8.0 # 32-bit
+
+    - TARGET_ARCH: aarch64
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 # provides cygwin, mingw
+      CYGWIN_PACKAGES: make,automake,libtool
+      CHOCO_PACKAGES: ant
+      CYGWIN_SETUP: setup-x86_64.exe # from appveyor
+      JAVA_HOME: C:\Program Files\Java\jdk1.8.0
 
 install:
-- cmd: set PATH=%PATH%;c:\cygwin64;c:\cygwin64\bin
-- cmd: choco install -y -f -i ant
-- cmd: choco install -y -f -i cygwin
-- cmd: C:\cygwin64\cygwinsetup.exe --root C:\cygwin64 --local-package-dir C:\cygwin64\packages --quiet-mode --no-desktop --no-startmenu --packages git,make,automake,automake1.15,libtool,mingw64-x86_64-gcc-g++,mingw64-x86_64-gcc-core,gcc-g++
-- cmd: set JAVA_HOME=C:\Program Files\Java\jdk1.8.0
-- cmd: set PATH=%JAVA_HOME%\bin;%PATH%
-- cmd: set PATH=c:\cygwin64;c:\cygwin64\bin;%PATH%
-- cmd: '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64'
+    # Must prepend cygwin PATH to avoid "cygheap base mismatch" from Git\usr\bin\sed
+  - cmd: set PATH=C:\cygwin64;C:\cygwin64\bin;%JAVA_HOME%\bin;%PATH%;
+  - cmd: choco install -y -f -i %CHOCO_PACKAGES%
+  - cmd: '%CYGWIN_SETUP% --root C:\cygwin64 --local-package-dir C:\cygwin64\packages --quiet-mode --no-desktop --no-startmenu --packages %CYGWIN_PACKAGES%'
 
-build_script:
-- cmd: ant dist
+# Setup msvc environment
+for:
+  - # VS 2015: x64
+    matrix:
+      only:
+        - TARGET_ARCH: x86_64
+    before_build:
+        - cmd: '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64'
+    before_test:
+        - cmd: net start spooler
+    test_script:
+        - cmd: ant test
+        - cmd: ant test-platform
+
+  - # VS 2015: x86
+    matrix:
+      only:
+        - TARGET_ARCH: x86
+    before_build:
+        - cmd: '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86'
+    before_test:
+        - cmd: net start spooler
+    test_script:
+        - cmd: ant test
+        - cmd: ant test-platform
 
-test_script:
-- cmd: net start spooler
-- cmd: ant test
-- cmd: ant test-platform
+  - # VS 2019: aarch64
+    matrix:
+      only:
+        - TARGET_ARCH: aarch64
+    before_build:
+        - cmd: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64_arm64'
+    test_script:
+        - cmd: echo Skipping tests
+
+build_script:
+  - cmd: ant -Dos.prefix=win32-%TARGET_ARCH% dist