Merge pull request #58 from ppalaga/200815-amd64-on-mac

Use amd64 arch label also on Mac
apache · Aug 15, 2020 · 0e7ddf8 · 0e7ddf8
2 parents 469c430 + 28d0765
commit 0e7ddf8
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 20 deletions.
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
@@ -176,7 +176,6 @@ jobs:
         fi
         echo "Using VERSION=$VERSION"
         echo "::set-env name=VERSION::$VERSION"
-        mv ./mvnd-dist.zip/mvnd-dist-*.zip ./mvnd-dist.zip/mvnd-dist.zip
 
     - name: Create Release
       id: create_release

diff --git a/client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java b/client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java
@@ -123,7 +123,12 @@ public ExecutionResult execute(ClientOutput output, List<String> argv) {
         // Print version if needed
         if (version || showVersion || debug) {
             final String nativeSuffix = Environment.isNative() ? " (native)" : "";
-            final String v = Ansi.ansi().bold().a("Maven Daemon " + buildProperties.getVersion() + nativeSuffix)
+            final String v = Ansi.ansi().bold().a(
+                    "Maven Daemon "
+                            + buildProperties.getVersion()
+                            + "-" + buildProperties.getOsName()
+                            + "-" + buildProperties.getOsArch()
+                            + nativeSuffix)
                     .reset().toString();
             output.accept(v);
             /*

diff --git a/client/src/main/java/org/jboss/fuse/mvnd/jpm/ScriptUtils.java b/client/src/main/java/org/jboss/fuse/mvnd/jpm/ScriptUtils.java
@@ -23,6 +23,7 @@
 import java.io.InterruptedIOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Scanner;
 import org.slf4j.Logger;
@@ -127,7 +128,7 @@ private static String filter(String line, Map<String, String> props) {
     private static final boolean windows;
 
     static {
-        windows = System.getProperty("os.name").toLowerCase().contains("windows");
+        windows = System.getProperty("os.name").toLowerCase(Locale.ROOT).startsWith("windows");
     }
 
     public static boolean isWindows() {

diff --git a/common/src/main/java/org/jboss/fuse/mvnd/common/BuildProperties.java b/common/src/main/java/org/jboss/fuse/mvnd/common/BuildProperties.java
@@ -34,16 +34,31 @@ public static BuildProperties load() {
         } catch (IOException e) {
             throw new RuntimeException("Could not read build.properties");
         }
-        return new BuildProperties(buildProperties.getProperty("version"));
+        return new BuildProperties(
+                buildProperties.getProperty("version"),
+                buildProperties.getProperty("os.detected.name"),
+                buildProperties.getProperty("os.detected.arch"));
     }
 
     private final String version;
+    private final String osName;
+    private final String osArch;
 
-    public BuildProperties(String version) {
+    public BuildProperties(String version, String os, String arch) {
         this.version = version;
+        this.osName = os;
+        this.osArch = arch;
     }
 
     public String getVersion() {
         return version;
     }
+
+    public String getOsName() {
+        return osName;
+    }
+
+    public String getOsArch() {
+        return osArch;
+    }
 }
diff --git a/common/src/main/resources/org/jboss/fuse/mvnd/common/build.properties b/common/src/main/resources/org/jboss/fuse/mvnd/common/build.properties
@@ -20,4 +20,6 @@ timestamp=${timestamp}
 version=${project.version}
 distributionId=${distributionId}
 distributionShortName=${distributionShortName}
-distributionName=${distributionName}
+distributionName=${distributionName}
+os.detected.name=${os.detected.name}
+os.detected.arch=${os.detected.arch}
diff --git a/daemon/pom.xml b/daemon/pom.xml
@@ -30,10 +30,6 @@
     <packaging>jar</packaging>
     <name>Maven Daemon</name>
 
-    <properties>
-        <os.arch>${os.arch}</os.arch><!-- provisio plugin does not see system properties -->
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.jboss.fuse.mvnd</groupId>

diff --git a/daemon/src/main/java/org/jboss/fuse/mvnd/plugin/CliPluginRealmCache.java b/daemon/src/main/java/org/jboss/fuse/mvnd/plugin/CliPluginRealmCache.java
@@ -36,6 +36,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
@@ -479,7 +480,8 @@ public void close() throws Exception {
     };
 
     public CliPluginRealmCache() {
-        this.watcher = System.getProperty("os.name").toLowerCase().contains("mac")
+        final String osName = System.getProperty("os.name").toLowerCase(Locale.ROOT);
+        this.watcher = osName.startsWith("osx") || osName.startsWith("mac os x")
                 ? new TimestampedRecordValidator()
                 : new MultiWatcher();
     }

diff --git a/daemon/src/main/provisio/maven-distro.xml b/daemon/src/main/provisio/maven-distro.xml
@@ -17,28 +17,28 @@
 -->
 <assembly>
 
-    <artifactSet to="mvnd-${project.version}-${os.detected.name}-${os.arch}">
+    <artifactSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}">
         <artifact id="org.apache.maven:apache-maven:tar.gz:bin">
             <unpack useRoot="false"
                     excludes="lib/slf4j*,conf/logging/*,lib/maven-slf4j-provider*,bin/mvn*"/>
         </artifact>
     </artifactSet>
 
-    <artifactSet to="mvnd-${project.version}-${os.detected.name}-${os.arch}/lib">
+    <artifactSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}/lib">
         <artifact id="org.apache.maven:maven-embedder"/>
         <artifactSet to="ext" ref="runtime.classpath"/>
     </artifactSet>
 
-    <fileSet to="mvnd-${project.version}-${os.detected.name}-${os.arch}">
+    <fileSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}">
         <directory path="${basedir}/src/main/distro"/>
     </fileSet>
-    <fileSet to="mvnd-${project.version}-${os.detected.name}-${os.arch}/bin">
+    <fileSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}/bin">
         <directory path="${basedir}/../client/target">
             <include>mvnd</include>
             <include>mvnd.exe</include>
         </directory>
     </fileSet>
 
-    <archive name="mvnd-${project.version}-${os.detected.name}-${os.arch}.zip" executable="**/bin/mvnd"/>
+    <archive name="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}.zip" executable="**/bin/mvnd"/>
 
 </assembly>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -32,7 +32,7 @@
     <properties>
         <maven.compiler.target>11</maven.compiler.target>
         <maven.compiler.source>11</maven.compiler.source>
-        <mvnd.home>${project.basedir}/../daemon/target/maven-distro/mvnd-${project.version}-${os.detected.name}-${os.arch}</mvnd.home>
+        <mvnd.home>${project.basedir}/../daemon/target/maven-distro/mvnd-${project.version}-${os.detected.name}-${os.detected.arch}</mvnd.home>
     </properties>
 
     <dependencies>
@@ -87,6 +87,8 @@
                     <systemPropertyVariables>
                         <project.version>${project.version}</project.version>
                         <mvnd.home>${mvnd.home}</mvnd.home>
+                        <os.detected.name>${os.detected.name}</os.detected.name>
+                        <os.detected.arch>${os.detected.arch}</os.detected.arch>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
@@ -111,6 +113,8 @@
                                     <systemPropertyVariables>
                                         <project.version>${project.version}</project.version>
                                         <mvnd.home>${mvnd.home}</mvnd.home>
+                                        <os.detected.name>${os.detected.name}</os.detected.name>
+                                        <os.detected.arch>${os.detected.arch}</os.detected.arch>
                                     </systemPropertyVariables>
                                 </configuration>
                             </execution>

diff --git a/integration-tests/src/test/java/org/jboss/fuse/mvnd/it/VersionNativeIT.java b/integration-tests/src/test/java/org/jboss/fuse/mvnd/it/VersionNativeIT.java
@@ -48,7 +48,11 @@ void version() throws IOException, InterruptedException {
 
         Assertions.assertThat(logMessage.getAllValues())
                 .is(new MatchInOrderAmongOthers<>(
-                        "\\QMaven Daemon " + System.getProperty("project.version") + "\\E",
+                        "\\QMaven Daemon "
+                                + System.getProperty("project.version")
+                                + "-" + System.getProperty("os.detected.name")
+                                + "-" + System.getProperty("os.detected.arch")
+                                + "\\E",
                         "\\QMaven home: " + layout.mavenHome() + "\\E"));
     }
 }
diff --git a/integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/MvndTestExtension.java b/integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/MvndTestExtension.java
@@ -23,6 +23,7 @@
 import java.nio.file.Paths;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.stream.Stream;
 import org.jboss.fuse.mvnd.client.Client;
@@ -98,7 +99,7 @@ public void beforeEach(ExtensionContext context) throws Exception {
                     } else if (f.getType() == Client.class) {
                         if (resource.isNative) {
                             final Path mvndNativeExecutablePath = resource.layout.mavenHome().resolve(
-                                    System.getProperty("os.name").toLowerCase().contains("windows")
+                                    System.getProperty("os.name").toLowerCase(Locale.ROOT).startsWith("windows")
                                             ? "bin/mvnd.exe"
                                             : "bin/mvnd")
                                     .toAbsolutePath().normalize();

diff --git a/pom.xml b/pom.xml
@@ -378,6 +378,8 @@ limitations under the License.</inlineHeader>
                         </goals>
                         <configuration>
                             <source>
+                                // Naming conventions coined by GraalVM
+                                // https://github.com/graalvm/graalvm-ce-builds/releases/
                                 String osName = System.getProperty('os.name').toLowerCase(Locale.ROOT)
                                 if (osName.startsWith('windows')) {
                                     project.properties['os.detected.name'] = 'windows'
@@ -386,7 +388,13 @@ limitations under the License.</inlineHeader>
                                 } else if (osName.startsWith('osx') || osName.startsWith('mac os x')) {
                                     project.properties['os.detected.name'] = 'darwin'
                                 } else {
-                                    throw new IllegalStateException('Unknown OS ' + osName);
+                                    project.properties['os.detected.name'] = osName
+                                }
+                                String osArch = System.getProperty('os.arch').toLowerCase(Locale.ROOT)
+                                if (osArch.equals('amd64') || osArch.equals('x86_64')) {
+                                    project.properties['os.detected.arch'] = 'amd64'
+                                } else {
+                                    project.properties['os.detected.arch'] = osArch
                                 }
                             </source>
                         </configuration>