-
-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This patch adds support for linux-riscv64. It requires updating uraimo/run-on-arch-action to v2.4.0 for support for riscv64. It also uses JDK 21 for riscv64 as it's the first LTS version with support for riscv64 (backports to JDK 17 done and JDK 11 in progress).
- Loading branch information
Showing
8 changed files
with
259 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| #!/bin/bash | ||
|
|
||
| CURPATH=$(pwd) | ||
| TARGET_CLASSES_PATH="target/classes/lib/linux-riscv64" | ||
| TARGET_PATH="target" | ||
|
|
||
| exitWithError() { | ||
| cd ${CURPATH} | ||
| echo "*** An error occurred. Please check log messages. ***" | ||
| exit $1 | ||
| } | ||
|
|
||
| mkdir -p "$TARGET_CLASSES_PATH" | ||
|
|
||
| cd "$TARGET_PATH" | ||
| cmake ../../../ || exitWithError $? | ||
| make || exitWithError $? | ||
| rm -f "$CURPATH/${TARGET_CLASSES_PATH}/libbrotli.so" | ||
| cp "./libbrotli.so" "$CURPATH/${TARGET_CLASSES_PATH}" || exitWithError $? | ||
|
|
||
| cd "${CURPATH}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Copyright (c) 2020-2023, Aayush Atharva | ||
| Brotli4j licenses this file to you under the | ||
| Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <parent> | ||
| <artifactId>natives</artifactId> | ||
| <groupId>com.aayushatharva.brotli4j</groupId> | ||
| <version>1.12.0</version> | ||
| </parent> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <artifactId>native-linux-riscv64</artifactId> | ||
| <packaging>jar</packaging> | ||
|
|
||
| <properties> | ||
| <javaModuleName>com.aayushatharva.brotli4j.linux.riscv64</javaModuleName> | ||
| </properties> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.moditect</groupId> | ||
| <artifactId>moditect-maven-plugin</artifactId> | ||
| <version>1.0.0.RC2</version> | ||
| <executions> | ||
| <execution> | ||
| <id>add-module-infos</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>add-module-info</goal> | ||
| </goals> | ||
| <configuration> | ||
| <jvmVersion>9</jvmVersion> | ||
| <module> | ||
| <moduleInfoSource> | ||
| module ${javaModuleName} { | ||
| requires com.aayushatharva.brotli4j.service; | ||
| exports ${javaModuleName} to com.aayushatharva.brotli4j; | ||
| provides com.aayushatharva.brotli4j.service.BrotliNativeProvider with | ||
| ${javaModuleName}.NativeLoader; | ||
| } | ||
| </moduleInfoSource> | ||
| </module> | ||
| <jdepsExtraArgs> | ||
| <arg>--multi-release</arg> | ||
| <arg>9</arg> | ||
| </jdepsExtraArgs> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| <profiles> | ||
| <profile> | ||
| <id>linux-riscv64</id> | ||
| <activation> | ||
| <os> | ||
| <family>Linux</family> | ||
| <arch>riscv64</arch> | ||
| </os> | ||
| </activation> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>exec-maven-plugin</artifactId> | ||
| <version>3.1.0</version> | ||
| <executions> | ||
| <execution> | ||
| <id>build-native</id> | ||
| <phase>process-classes</phase> | ||
| <goals> | ||
| <goal>exec</goal> | ||
| </goals> | ||
| <configuration> | ||
| <executable>/bin/bash</executable> | ||
| <arguments> | ||
| <argument>build.sh</argument> | ||
| </arguments> | ||
| <workingDirectory>${project.basedir}</workingDirectory> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
|
|
||
| <profile> | ||
| <id>release</id> | ||
| <build> | ||
| <resources> | ||
| <resource> | ||
| <directory>resources</directory> | ||
| </resource> | ||
| </resources> | ||
| </build> | ||
| </profile> | ||
| </profiles> | ||
|
|
||
| </project> |
30 changes: 30 additions & 0 deletions
30
...es/linux-riscv64/src/main/java/com/aayushatharva/brotli4j/linux/riscv64/NativeLoader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| * Copyright (c) 2020-2023, Aayush Atharva | ||
| * | ||
| * Brotli4j licenses this file to you under the | ||
| * Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.aayushatharva.brotli4j.linux.riscv64; | ||
|
|
||
| import com.aayushatharva.brotli4j.service.BrotliNativeProvider; | ||
|
|
||
| /** | ||
| * Service class to access the native lib in a JPMS context | ||
| */ | ||
| public class NativeLoader implements BrotliNativeProvider { | ||
|
|
||
| @Override | ||
| public String platformName() { | ||
| return "linux-riscv64"; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters