Skip to content

Commit be4368f

Browse files
authored
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
1 parent cb6d351 commit be4368f

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

CMakeLists.txt

+5-4
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,6 @@ elseif(FORCE_M64)
126126
# Build 64-bit binary on Linux
127127
set_target_properties(jssc PROPERTIES COMPILE_FLAGS -m64 LINK_FLAGS -m64)
128128
endif()
129-
# Copy native library back to source tree
130-
add_custom_command(TARGET jssc POST_BUILD
131-
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/natives/ ${CMAKE_CURRENT_SOURCE_DIR}/src/main/resources-precompiled/natives/
132-
)
133129

134130
# Call strip on non-debug builds
135131
if(CMAKE_STRIP AND NOT CMAKE_BUILD_TYPE MATCHES "Deb")
@@ -139,6 +135,11 @@ if(CMAKE_STRIP AND NOT CMAKE_BUILD_TYPE MATCHES "Deb")
139135
add_custom_command(TARGET jssc POST_BUILD COMMAND "${CMAKE_STRIP}" ${STRIP_ARGS} $<TARGET_FILE:jssc>)
140136
endif()
141137

138+
# Copy native library back to source tree
139+
add_custom_command(TARGET jssc POST_BUILD
140+
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/natives/ ${CMAKE_CURRENT_SOURCE_DIR}/src/main/resources-precompiled/natives/
141+
)
142+
142143
# Handle compiler warnings
143144
if(MSVC)
144145
#TODO Treat warnings as errors /WX

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.github.java-native.jssc</groupId>
88
<artifactId>jssc</artifactId>
9-
<version>2.9.0</version>
9+
<version>2.9.1</version>
1010

1111
<properties>
1212
<java.version>1.6</java.version>

src/java/jssc/SerialNativeInterface.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
public class SerialNativeInterface {
3636

3737
private static final String libVersion = "2.9";
38-
private static final String libMinorSuffix = "0"; //since 0.9.0
38+
private static final String libMinorSuffix = "1"; //since 0.9.0
3939

4040
public static final int OS_LINUX = 0;
4141
public static final int OS_WINDOWS = 1;
Binary file not shown.

0 commit comments

Comments
 (0)