Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/add GitHub workflow #32

Merged
merged 9 commits into from
May 15, 2021
Merged

Feature/add GitHub workflow #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b342e23
fix implicit declaration of minor()/major() kernel calls
alibabashack Apr 11, 2021
9d82b22
fix osx compiler flags
alibabashack Apr 11, 2021
5151643
maven: upgrade plugins
alibabashack Apr 17, 2021
df1cd16
maven: fail build if a native binary is missing in release mode
alibabashack Apr 17, 2021
a1e4bd1
maven: remove automatic binary selection by os
alibabashack Apr 17, 2021
3372c0b
maven: print informational error message if user omits binary selection
alibabashack Apr 17, 2021
1866f2b
maven: use profiles only for binary platform selection
alibabashack Apr 17, 2021
572584d
maven: do not require binary selection during release bundle
alibabashack Apr 17, 2021
b5cc865
add github workflow rxtx-distribution
alibabashack Apr 11, 2021
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
63 changes: 63 additions & 0 deletions .github/workflows/rxtx-distribution.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# This workflow will build a distribution bundle containing everything needed to run rxtx on supported platforms.

name: build rxtx-distribution

on:
push:
branches: [ development ]
pull_request:
branches: [ development ]

jobs:
build-osx-binaries:

runs-on: macos-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'adopt'
- name: Build with Maven
run: mvn --batch-mode -Pwith-osx-x86_64 package --file pom.xml
- name: upload rxtxSerial binaries built on osx
uses: actions/upload-artifact@v2
with:
name: rxtxSerial-binaries-built-on-osx
path: rxtxSerial-osx-*/target/librxtxSerial-osx-*.jnilib
if-no-files-found: error

main-build:
needs: build-osx-binaries
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
- name: Prepare installation of 32bit packages
run: sudo dpkg --add-architecture i386 && sudo apt update
- name: Install cross toolchains and libraries
run: sudo apt install libc6-dev-i386 linux-libc-dev:i386 gcc-arm-linux-gnueabi binutils-arm-linux-gnueabi gcc-arm-linux-gnueabihf binutils-arm-linux-gnueabihf gcc-mingw-w64-i686 gcc-mingw-w64-x86-64
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'adopt'
- uses: actions/download-artifact@v2
with:
name: rxtxSerial-binaries-built-on-osx
- name: install osx native library
run: cd rxtxSerial-osx-x86_64 && mvn --batch-mode install:install-file -Dfile=target/librxtxSerial-osx-x86_64.jnilib -DgroupId=gnu.io.rxtx -DartifactId=librxtxSerial-osx-x86_64 -Dversion=2.2-stabilize-SNAPSHOT -Dpackaging=jnilib --file pom.xml
- name: Build for all other platforms
run: mvn --batch-mode -Pwith-linux-x86,with-linux-x86_64,with-linux-armel,with-linux-armhf,with-windows-x86,with-windows-x86_64 package install --file pom.xml
- name: Bundle rxtx Java and native libs
run: mvn --batch-mode -Dmake.release package --file pom.xml
- name: upload rxtx-distribution
uses: actions/upload-artifact@v2
with:
name: rxtx-distribution
path: |
rxtx-api/target/rxtx-api-*.jar
rxtxSerial/target/rxtxSerial-*.jar
if-no-files-found: error
132 changes: 40 additions & 92 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,168 +100,116 @@
</dependency>
</dependencies>
</dependencyManagement>
<modules>
<module>rxtx-api</module>
<module>rxtxSerial-java</module>
<module>rxtxSerial-native</module>
<module>rxtxSerial-bin</module>
<module>rxtxSerial</module>
<module>rxtxSerial-test</module>
</modules>
<profiles>
<profile>
<id>run-release-prepare</id>
<activation>
<property>
<name>make.release</name>
<value>prepare</value>
</property>
</activation>
<modules>
<module>cross-toolchain-wrapper</module>
<module>rxtx-api</module>
<module>rxtxSerial-java</module>
<module>rxtxSerial-native</module>
</modules>
</profile>
<profile>
<id>run-release-assembly</id>
<activation>
<property>
<name>make.release</name>
<value>bundle</value>
</property>
</activation>
<modules>
<module>rxtxSerial-bin</module>
<module>rxtxSerial</module>
<module>rxtxSerial-test</module>
</modules>
</profile>
<profile>
<id>run-development-build-head</id>
<activation>
<property>
<name>!make.release</name>
</property>
</activation>
<modules>
<module>cross-toolchain-wrapper</module>
<module>rxtx-api</module>
<module>rxtxSerial-java</module>
<module>rxtxSerial-native</module>
</modules>
</profile>
<profile>
<id>with-linux-x86</id>
<activation>
<os>
<family>unix</family>
<name>linux</name>
<arch>i386</arch>
</os>
</activation>
<modules>
<module>rxtxSerial-linux-x86</module>
</modules>
</profile>
<profile>
<id>with-linux-x86_64</id>
<activation>
<os>
<family>unix</family>
<name>linux</name>
<arch>amd64</arch>
</os>
</activation>
<modules>
<module>rxtxSerial-linux-x86_64</module>
</modules>
</profile>
<profile>
<id>with-linux-armel</id>
<modules>
<module>cross-toolchain-wrapper</module>
<module>rxtxSerial-linux-armel</module>
</modules>
</profile>
<profile>
<id>with-linux-armhf</id>
<modules>
<module>cross-toolchain-wrapper</module>
<module>rxtxSerial-linux-armhf</module>
</modules>
</profile>
<profile>
<id>with-windows-x86</id>
<modules>
<module>cross-toolchain-wrapper</module>
<module>rxtxSerial-windows-x86</module>
</modules>
</profile>
<profile>
<id>with-windows-x86_64</id>
<modules>
<module>cross-toolchain-wrapper</module>
<module>rxtxSerial-windows-x86_64</module>
</modules>
</profile>
<profile>
<id>with-osx-x86_64</id>
<activation>
<os>
<family>mac</family>
<arch>x86_64</arch>
</os>
</activation>
<modules>
<module>cross-toolchain-wrapper</module>
<module>rxtxSerial-osx-x86_64</module>
</modules>
</profile>
<profile>
<id>run-development-build-tail</id>
<id>run-release-assembly</id>
<activation>
<property>
<name>!make.release</name>
<name>make.release</name>
</property>
</activation>
<modules>
<module>rxtxSerial-bin</module>
<module>rxtxSerial</module>
<module>rxtxSerial-test</module>
</modules>
</profile>
<!-- The presence of this profile prevents activation of profile failNoBinarySelected during release bundle mode. -->
</profile>
<profile>
<id>failOnUnsupportedPlatforms</id>
<id>failNoBinarySelected</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.1.1</version>
<executions>
<execution>
<id>enforce</id>
<goals>
<goal>enforce</goal>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<configuration>
<rules>
<AlwaysFail>
<message>Your platform (=os/arch combination) is currently unsupported to build its own binary, however it might be possible to use other platforms to compile the necessary binary for you. This message does not necessarily mean that there is no way to run rxtx on your platform.</message>
<level>ERROR</level>
<message>No rxtx native target selected. Select target(s) by activating one or more of the following profiles: with-linux-x86, with-linux-x86_64, with-linux-armel, with-linux-armhf, with-windows-x86, with-windows-x86_64, with-osx-x86_64. Profiles can be activated using the maven option -P. Example: "mvn -Pwith-linux-x86,with-windows-x86 install". In order to successfully build the respective native targets, the proper (cross) compiler(s) must be installed. Refer to the rxtx documentation.</message>
</AlwaysFail>
</rules>
<fail>true</fail>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</rules>
<fail>true</fail>
<failFast>true</failFast>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.1.1</version>
<version>3.0.0-M3</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
14 changes: 0 additions & 14 deletions rxtxSerial-bin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,6 @@
<property>
<name>make.release</name>
</property>
<os>
<family>unix</family>
<name>linux</name>
<arch>i386</arch>
</os>
</activation>
<dependencies>
<dependency>
Expand All @@ -84,11 +79,6 @@
<property>
<name>make.release</name>
</property>
<os>
<family>unix</family>
<name>linux</name>
<arch>amd64</arch>
</os>
</activation>
<dependencies>
<dependency>
Expand Down Expand Up @@ -159,10 +149,6 @@
<property>
<name>make.release</name>
</property>
<os>
<family>mac</family>
<arch>x86_64</arch>
</os>
</activation>
<dependencies>
<dependency>
Expand Down
1 change: 1 addition & 0 deletions rxtxSerial-bin/src/assemble/release.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<include>gnu.io.rxtx:rxtxSerial-windows-x86_64</include>
<include>gnu.io.rxtx:librxtxSerial-osx-x86_64</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>/gnu/io/impl/serial/</outputDirectory>
<unpack>false</unpack>
Expand Down
8 changes: 7 additions & 1 deletion rxtxSerial-native/src/main/c/SerialImp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@
# include <sys/signal.h>
#endif /* HAVE_SYS_SIGNAL_H */
#include <sys/types.h>
#ifdef HAVE_SYSMACROS_H
# include <sys/sysmacros.h>
#endif /* HAVE_SYSMACROS_H */
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif /* HAVE_SYS_TIME_H */
Expand Down Expand Up @@ -5503,6 +5506,7 @@ int fhs_lock( const char *filename, pid_t pid )
rather than an exercise, we will handle them.

----------------------------------------------------------*/
#if 0
int uucp_lock( const char *filename, pid_t pid )
{
char lockfilename[80], lockinfo[12], message[80];
Expand Down Expand Up @@ -5566,6 +5570,7 @@ int uucp_lock( const char *filename, pid_t pid )
close( fd );
return 0;
}
#endif

/*----------------------------------------------------------
check_lock_status
Expand Down Expand Up @@ -5648,6 +5653,7 @@ void fhs_unlock( const char *filename, int openpid )
exceptions: none
comments: http://docs.freebsd.org/info/uucp/uucp.info.UUCP_Lock_Files.html
----------------------------------------------------------*/
#if 0
void uucp_unlock( const char *filename, int openpid )
{
struct stat buf;
Expand Down Expand Up @@ -5686,7 +5692,7 @@ void uucp_unlock( const char *filename, int openpid )
report( message );
}
}

#endif
/*----------------------------------------------------------
check_lock_pid

Expand Down
2 changes: 1 addition & 1 deletion rxtxSerial-osx-x86_64/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<compilerStartOption>-DHAVE_STDINT_H</compilerStartOption>
<compilerStartOption>-DHAVE_SYS_FCNTL_H</compilerStartOption>
<compilerStartOption>-DHAVE_SYS_SIGNAL_H</compilerStartOption>
<compilerStartOption>-shared</compilerStartOption>
<compilerStartOption>-DHAVE_SYS_TIME_H</compilerStartOption>
<compilerStartOption>-fPIC</compilerStartOption>
<compilerStartOption>-I${project.build.directory}/jni-headers</compilerStartOption>
<compilerStartOption>-I/System/Library/Frameworks/JavaVM.framework/Headers</compilerStartOption>
Expand Down