Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@ foreach(POM_LINE ${POM_FILE})
break()
endif()
endforeach()
configure_file(src/cpp/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)
configure_file(src/main/cpp/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)

add_library(jssc SHARED src/cpp/${JSSC_PLATFORM}/jssc.cpp)
add_library(jssc SHARED src/main/cpp/${JSSC_PLATFORM}/jssc.cpp)

# Fall-back header for when maven is not available
list(APPEND JSSC_ADDITIONAL_INCLUDES src/cpp/)
list(APPEND JSSC_ADDITIONAL_INCLUDES src/main/cpp/)
target_include_directories(jssc PRIVATE ${JNI_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${JSSC_ADDITIONAL_INCLUDES})

set_target_properties(jssc PROPERTIES PUBLIC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/jssc_SerialNativeInterface.h)
Expand Down
47 changes: 30 additions & 17 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,37 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>io.github.java-native.jssc</groupId>
<groupId>io.github.java-native</groupId>
<artifactId>jssc</artifactId>
<version>2.9.1</version>
<version>2.9.2-SNAPSHOT</version>

<name>Java Simple Serial Connector</name>
<description>
A small, single Java library for working with serial ports across various systems
based on the work from scream3r/java-simple-serial-connector.
</description>
<url>https://github.com/java-native/jssc</url>

<licenses>
<license>
<name>GNU LGPL 3</name>
<url>http://www.gnu.org/licenses/lgpl.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<developers>
<developer>
<name>Tres Finocchiaro</name>
<url>https://github.com/tresf</url>
</developer>
</developers>

<scm>
<connection>scm:git:https://github.com/java-native/jssc.git</connection>
<developerConnection>scm:git:[email protected]:java-native/jssc.git</developerConnection>
<url>https://github.com/java-native/jssc</url>
</scm>

<properties>
<java.version>1.6</java.version>
Expand Down Expand Up @@ -46,19 +74,6 @@
<plugin.compiler.version>3.8.0</plugin.compiler.version>
</properties>

<organization>
<name>Java Native</name>
<url>https://github.com/java-native/</url>
</organization>

<licenses>
<license>
<name>GNU LGPL 3</name>
<url>http://www.gnu.org/licenses/lgpl.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<dependencies>
<dependency>
<groupId>org.scijava</groupId>
Expand All @@ -81,8 +96,6 @@

<build>
<defaultGoal>install</defaultGoal>
<!-- FIXME: apply maven conventions -->
<sourceDirectory>src/java</sourceDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/main/resources-precompiled</directory>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.