Renamed ill-named linux binaries to "linux" (was "unix").

hendriks73 · Aug 1, 2023 · b717acc · b717acc
1 parent 8599432
commit b717acc
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 23 deletions.
diff --git a/NOTES.md b/NOTES.md
@@ -1,3 +1,8 @@
+- 0.9.53
+  - Renamed ill-named linux binaries to `linux` (was `unix`).
+  - Minor doc fixes.
+
+
 - 0.9.52
   - Added support for Linux arm64/aarch64 (not CI/CD tested due to lack of GH Linux arm64 runner).
   - Moved to FFmpeg 4.0.6, tagtraum package 4.0.10.

diff --git a/ffsampledsp-aarch64-unix/pom.xml → ffsampledsp-aarch64-linux/pom.xml b/ffsampledsp-aarch64-unix/pom.xml → ffsampledsp-aarch64-linux/pom.xml
@@ -6,10 +6,10 @@
         <version>0.9.53-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>ffsampledsp-aarch64-unix</artifactId>
+    <artifactId>ffsampledsp-aarch64-linux</artifactId>
     <packaging>so</packaging>
-    <name>FFSampledSP Native Library unix (arm64)</name>
-    <description>Unix ARM64 binary library for FFSampledSP.</description>
+    <name>FFSampledSP Native Library linux (arm64)</name>
+    <description>Linux ARM64 binary library for FFSampledSP.</description>
 
     <dependencies>
         <dependency>
@@ -34,7 +34,7 @@
 
     <properties>
         <arch>aarch64</arch>
-        <host>unix</host>
+        <host>linux</host>
         <maven.javadoc.skip>true</maven.javadoc.skip>
     </properties>
 

diff --git a/...ch64-unix/src/site/resources/css/site.css → ...h64-linux/src/site/resources/css/site.css b/...ch64-unix/src/site/resources/css/site.css → ...h64-linux/src/site/resources/css/site.css
diff --git a/ffsampledsp-aarch64-unix/src/site/site.xml → ffsampledsp-aarch64-linux/src/site/site.xml b/ffsampledsp-aarch64-unix/src/site/site.xml → ffsampledsp-aarch64-linux/src/site/site.xml
diff --git a/ffsampledsp-complete/pom.xml b/ffsampledsp-complete/pom.xml
@@ -199,13 +199,13 @@
             </build>
         </profile>
 
-        <!-- Unix x86-specific Config -->
+        <!-- Linux x86-specific Config -->
         <profile>
-            <id>ffsampledsp-x86_64-unix</id>
+            <id>ffsampledsp-x86_64-linux</id>
             <dependencies>
                 <dependency>
                     <groupId>com.tagtraum</groupId>
-                    <artifactId>ffsampledsp-x86_64-unix</artifactId>
+                    <artifactId>ffsampledsp-x86_64-linux</artifactId>
                     <version>${project.version}</version>
                     <type>so</type>
                     <scope>provided</scope>
@@ -227,12 +227,12 @@
                                     <artifactItems>
                                         <artifactItem>
                                             <groupId>com.tagtraum</groupId>
-                                            <artifactId>ffsampledsp-x86_64-unix</artifactId>
+                                            <artifactId>ffsampledsp-x86_64-linux</artifactId>
                                             <version>${project.version}</version>
                                             <type>so</type>
                                             <overWrite>true</overWrite>
                                             <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                                            <destFileName>ffsampledsp-x86_64-unix.so</destFileName>
+                                            <destFileName>ffsampledsp-x86_64-linux.so</destFileName>
                                         </artifactItem>
                                     </artifactItems>
                                 </configuration>
@@ -243,13 +243,13 @@
             </build>
         </profile>
 
-        <!-- Unix arm64-specific Config -->
+        <!-- Linux arm64-specific Config -->
         <profile>
-            <id>ffsampledsp-aarch64-unix</id>
+            <id>ffsampledsp-aarch64-linux</id>
             <dependencies>
                 <dependency>
                     <groupId>com.tagtraum</groupId>
-                    <artifactId>ffsampledsp-aarch64-unix</artifactId>
+                    <artifactId>ffsampledsp-aarch64-linux</artifactId>
                     <version>${project.version}</version>
                     <type>so</type>
                     <scope>provided</scope>
@@ -271,12 +271,12 @@
                                     <artifactItems>
                                         <artifactItem>
                                             <groupId>com.tagtraum</groupId>
-                                            <artifactId>ffsampledsp-aarch64-unix</artifactId>
+                                            <artifactId>ffsampledsp-aarch64-linux</artifactId>
                                             <version>${project.version}</version>
                                             <type>so</type>
                                             <overWrite>true</overWrite>
                                             <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                                            <destFileName>ffsampledsp-aarch64-unix.so</destFileName>
+                                            <destFileName>ffsampledsp-aarch64-linux.so</destFileName>
                                         </artifactItem>
                                     </artifactItems>
                                 </configuration>

diff --git a/ffsampledsp-java/src/main/java/com/tagtraum/ffsampledsp/FFNativeLibraryLoader.java b/ffsampledsp-java/src/main/java/com/tagtraum/ffsampledsp/FFNativeLibraryLoader.java
@@ -47,7 +47,7 @@ public final class FFNativeLibraryLoader {
     private static final String CLASS_FILE_EXTENSION = ".class";
     private static final String OS_NAME = System.getProperty("os.name").toLowerCase();
     private static final String HOST = OS_NAME.contains("mac")
-            ? "macos" : (OS_NAME.contains("win") ? "win" : "unix");
+            ? "macos" : (OS_NAME.contains("win") ? "win" : "linux");
     private static final String ARCH = arch();
     private static final String VERSION = readProjectVersion();
 

diff --git a/ffsampledsp-x86_64-unix/pom.xml → ffsampledsp-x86_64-linux/pom.xml b/ffsampledsp-x86_64-unix/pom.xml → ffsampledsp-x86_64-linux/pom.xml
@@ -6,10 +6,10 @@
         <version>0.9.53-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>ffsampledsp-x86_64-unix</artifactId>
+    <artifactId>ffsampledsp-x86_64-linux</artifactId>
     <packaging>so</packaging>
-    <name>FFSampledSP Native Library unix (64bit)</name>
-    <description>Unix 64bit binary library for FFSampledSP.</description>
+    <name>FFSampledSP Native Library linux (64bit)</name>
+    <description>Linux 64bit binary library for FFSampledSP.</description>
 
     <dependencies>
         <dependency>
@@ -34,7 +34,7 @@
 
     <properties>
         <arch>x86_64</arch>
-        <host>unix</host>
+        <host>linux</host>
         <maven.javadoc.skip>true</maven.javadoc.skip>
     </properties>
 

diff --git a/...6_64-unix/src/site/resources/css/site.css → ..._64-linux/src/site/resources/css/site.css b/...6_64-unix/src/site/resources/css/site.css → ..._64-linux/src/site/resources/css/site.css
diff --git a/ffsampledsp-x86_64-unix/src/site/site.xml → ffsampledsp-x86_64-linux/src/site/site.xml b/ffsampledsp-x86_64-unix/src/site/site.xml → ffsampledsp-x86_64-linux/src/site/site.xml
diff --git a/pom.xml b/pom.xml
@@ -582,9 +582,9 @@
         <!-- Linux-specific x86 Config -->
         <profile>
             <!-- must be explicitly activated! -->
-            <id>ffsampledsp-x86_64-unix</id>
+            <id>ffsampledsp-x86_64-linux</id>
             <modules>
-                <module>ffsampledsp-x86_64-unix</module>
+                <module>ffsampledsp-x86_64-linux</module>
             </modules>
             <properties>
                 <gcc.code>-m64</gcc.code>
@@ -600,9 +600,9 @@
         <!-- Linux-specific arm64 Config -->
         <profile>
             <!-- must be explicitly activated! -->
-            <id>ffsampledsp-aarch64-unix</id>
+            <id>ffsampledsp-aarch64-linux</id>
             <modules>
-                <module>ffsampledsp-aarch64-unix</module>
+                <module>ffsampledsp-aarch64-linux</module>
             </modules>
             <properties>
                 <ccompiler>aarch64-linux-gnu-gcc</ccompiler>