Skip to content

Commit

Permalink
use absolute paths to the script
Browse files Browse the repository at this point in the history
  • Loading branch information
pschichtel committed Feb 11, 2024
1 parent 55ae6f1 commit 7d137f8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Build with Maven
run: ./mvnw -B package deploy -Djavacan.compile-script="./ci/compile-native.sh" -Pall-architectures,android
run: ./mvnw -B package deploy -Djavacan.compile-script="$PWD/ci/compile-native.sh" -Pall-architectures,android
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,20 +123,22 @@ In case you have issues, have a look at the [troubleshooting document](TROUBLESH

For local compilation:

* Maven 3 or newer
* Maven 3.3.1 or newer
* GCC (or compatible)
* Java 8 (Maven will enforce this)
* a libc
* Bash

For cross compilation:

* Maven 3 or newer
* Maven 3.3.1 or newer
* Podman or docker and permissions to run containers (alternatively provide the `RUN_CONTAINER_COMMAND` env with a command that takes an image name)
* Java 8 (Maven will enforce this)
* Bash

For tests:

* Maven 3.3.1 or newer
* A fairly recent Linux kernel with CAN support
* The can-isotp kernel module loaded (Kernel 5.10 with `CONFIG_CAN_ISOTP` enabled or the [out-of-tree module](https://github.com/hartkopp/can-isotp))
* [can-utils](https://github.com/linux-can/can-utils) installed in the `PATH`
Expand Down
6 changes: 1 addition & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<dockcross.link-mode>dynamic</dockcross.link-mode>

<headers.target>${project.build.directory}/jni/${project.artifactId}</headers.target>
<javacan.compile-script>./compile-native.sh</javacan.compile-script>
<javacan.compile-script>${maven.multiModuleProjectDirectory}/compile-native.sh</javacan.compile-script>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -416,10 +416,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<workingDirectory>${project.basedir}</workingDirectory>
<executable>${javacan.compile-script}</executable>
</configuration>
<executions>
<execution>
<id>compile-native-default</id>
Expand Down

0 comments on commit 7d137f8

Please sign in to comment.