From be4368fc423a20389dc69a3d5e94fd7388cfd9ee Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Wed, 29 May 2019 23:45:17 -0400 Subject: [PATCH] Patch macOS lib to support Apple notarization (#57) - Update libjssc.dylib to be build with SDK 10.9, the minimum required for notarization. - Fix an order of operations issue with the strip command - Bump version to 2.9.1 --- CMakeLists.txt | 9 +++++---- pom.xml | 2 +- src/java/jssc/SerialNativeInterface.java | 2 +- .../natives/osx_64/libjssc.dylib | Bin 19444 -> 18540 bytes 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e7a7c976d..d420f9c228 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,10 +126,6 @@ elseif(FORCE_M64) # Build 64-bit binary on Linux set_target_properties(jssc PROPERTIES COMPILE_FLAGS -m64 LINK_FLAGS -m64) endif() -# Copy native library back to source tree -add_custom_command(TARGET jssc POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/natives/ ${CMAKE_CURRENT_SOURCE_DIR}/src/main/resources-precompiled/natives/ -) # Call strip on non-debug builds if(CMAKE_STRIP AND NOT CMAKE_BUILD_TYPE MATCHES "Deb") @@ -139,6 +135,11 @@ if(CMAKE_STRIP AND NOT CMAKE_BUILD_TYPE MATCHES "Deb") add_custom_command(TARGET jssc POST_BUILD COMMAND "${CMAKE_STRIP}" ${STRIP_ARGS} $) endif() +# Copy native library back to source tree +add_custom_command(TARGET jssc POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/natives/ ${CMAKE_CURRENT_SOURCE_DIR}/src/main/resources-precompiled/natives/ +) + # Handle compiler warnings if(MSVC) #TODO Treat warnings as errors /WX diff --git a/pom.xml b/pom.xml index 13d361f843..e81ed66ce4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.java-native.jssc jssc - 2.9.0 + 2.9.1 1.6 diff --git a/src/java/jssc/SerialNativeInterface.java b/src/java/jssc/SerialNativeInterface.java index 2c8ed8a8b2..53be0a2df8 100644 --- a/src/java/jssc/SerialNativeInterface.java +++ b/src/java/jssc/SerialNativeInterface.java @@ -35,7 +35,7 @@ public class SerialNativeInterface { private static final String libVersion = "2.9"; - private static final String libMinorSuffix = "0"; //since 0.9.0 + private static final String libMinorSuffix = "1"; //since 0.9.0 public static final int OS_LINUX = 0; public static final int OS_WINDOWS = 1; diff --git a/src/main/resources-precompiled/natives/osx_64/libjssc.dylib b/src/main/resources-precompiled/natives/osx_64/libjssc.dylib index 06da97fc5574b0b188d95d095aceb8701e9662be..ec77e8cc22613f07bd0937c1fa1ee5c4927eb5ed 100755 GIT binary patch literal 18540 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 Nal38#isj4L{{aOwUB>_b literal 19444 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