From a6b1600237cf100efbcfc0bbcf8ed44fe66a1683 Mon Sep 17 00:00:00 2001
From: Julien HENRY <julien.henry@sonarsource.com>
Date: Mon, 24 Jun 2024 14:29:12 +0200
Subject: SCANCLI-147 Add aarch64 distributions for Linux and MacOSX

---
 src/main/assembly/dist-linux-aarch64.xml  | 71 +++++++++++++++++++++++++++++++
 src/main/assembly/dist-linux-x64.xml      | 71 +++++++++++++++++++++++++++++++
 src/main/assembly/dist-linux.xml          | 71 -------------------------------
 src/main/assembly/dist-macosx-aarch64.xml | 68 +++++++++++++++++++++++++++++
 src/main/assembly/dist-macosx-x64.xml     | 68 +++++++++++++++++++++++++++++
 src/main/assembly/dist-macosx.xml         | 68 -----------------------------
 src/main/assembly/dist-windows-x64.xml    | 55 ++++++++++++++++++++++++
 src/main/assembly/dist-windows.xml        | 55 ------------------------
 8 files changed, 333 insertions(+), 194 deletions(-)
 create mode 100644 src/main/assembly/dist-linux-aarch64.xml
 create mode 100644 src/main/assembly/dist-linux-x64.xml
 delete mode 100644 src/main/assembly/dist-linux.xml
 create mode 100644 src/main/assembly/dist-macosx-aarch64.xml
 create mode 100644 src/main/assembly/dist-macosx-x64.xml
 delete mode 100644 src/main/assembly/dist-macosx.xml
 create mode 100644 src/main/assembly/dist-windows-x64.xml
 delete mode 100644 src/main/assembly/dist-windows.xml

(limited to 'src')

diff --git a/src/main/assembly/dist-linux-aarch64.xml b/src/main/assembly/dist-linux-aarch64.xml
new file mode 100644
index 0000000..3e92aa7
--- /dev/null
+++ b/src/main/assembly/dist-linux-aarch64.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+  <id>linux-aarch64</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <baseDirectory>sonar-scanner-${project.version}-linux-aarch64</baseDirectory>
+  <fileSets>
+
+    <!-- jre basic, except bin/ -->
+    <fileSet>
+      <directory>${unpack.dir}/linux-aarch64/${jre.dirname.linux}</directory>
+      <outputDirectory>jre</outputDirectory>
+      <excludes>
+        <exclude>bin/**</exclude>
+        <exclude>man/**</exclude>
+        <exclude>lib/jspawnhelper</exclude>
+        <exclude>lib/jexec</exclude>
+        <exclude>plugin/**</exclude>
+      </excludes>
+    </fileSet>
+
+    <!-- jre bin/java -->
+    <fileSet>
+      <directory>${unpack.dir}/linux-aarch64/${jre.dirname.linux}/bin</directory>
+      <outputDirectory>jre/bin</outputDirectory>
+      <includes>
+        <include>java</include>
+      </includes>
+      <fileMode>0755</fileMode>
+    </fileSet>
+
+    <!-- jre lib executable files -->
+    <fileSet>
+      <directory>${unpack.dir}/linux-aarch64/${jre.dirname.linux}/lib</directory>
+      <outputDirectory>jre/lib</outputDirectory>
+      <includes>
+        <include>jspawnhelper</include>
+        <include>jexec</include>
+      </includes>
+      <fileMode>0755</fileMode>
+    </fileSet>
+
+    <!-- scanner files -->
+    <fileSet>
+      <directory>${project.build.directory}</directory>
+      <outputDirectory>lib</outputDirectory>
+      <fileMode>0644</fileMode>
+      <includes>
+        <include>${scanner.jar}</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/assembly/conf</directory>
+      <outputDirectory>conf</outputDirectory>
+      <fileMode>0644</fileMode>
+      <lineEnding>unix</lineEnding>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/assembly/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>0755</fileMode>
+      <lineEnding>unix</lineEnding>
+      <filtered>true</filtered>
+      <includes>
+        <include>sonar-scanner</include>
+        <include>sonar-scanner-debug</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/src/main/assembly/dist-linux-x64.xml b/src/main/assembly/dist-linux-x64.xml
new file mode 100644
index 0000000..f13e733
--- /dev/null
+++ b/src/main/assembly/dist-linux-x64.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+  <id>linux-x64</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <baseDirectory>sonar-scanner-${project.version}-linux-x64</baseDirectory>
+  <fileSets>
+
+    <!-- jre basic, except bin/ -->
+    <fileSet>
+      <directory>${unpack.dir}/linux-x64/${jre.dirname.linux}</directory>
+      <outputDirectory>jre</outputDirectory>
+      <excludes>
+        <exclude>bin/**</exclude>
+        <exclude>man/**</exclude>
+        <exclude>lib/jspawnhelper</exclude>
+        <exclude>lib/jexec</exclude>
+        <exclude>plugin/**</exclude>
+      </excludes>
+    </fileSet>
+
+    <!-- jre bin/java -->
+    <fileSet>
+      <directory>${unpack.dir}/linux-x64/${jre.dirname.linux}/bin</directory>
+      <outputDirectory>jre/bin</outputDirectory>
+      <includes>
+        <include>java</include>
+      </includes>
+      <fileMode>0755</fileMode>
+    </fileSet>
+
+    <!-- jre lib executable files -->
+    <fileSet>
+      <directory>${unpack.dir}/linux-x64/${jre.dirname.linux}/lib</directory>
+      <outputDirectory>jre/lib</outputDirectory>
+      <includes>
+        <include>jspawnhelper</include>
+        <include>jexec</include>
+      </includes>
+      <fileMode>0755</fileMode>
+    </fileSet>
+
+    <!-- scanner files -->
+    <fileSet>
+      <directory>${project.build.directory}</directory>
+      <outputDirectory>lib</outputDirectory>
+      <fileMode>0644</fileMode>
+      <includes>
+        <include>${scanner.jar}</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/assembly/conf</directory>
+      <outputDirectory>conf</outputDirectory>
+      <fileMode>0644</fileMode>
+      <lineEnding>unix</lineEnding>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/assembly/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>0755</fileMode>
+      <lineEnding>unix</lineEnding>
+      <filtered>true</filtered>
+      <includes>
+        <include>sonar-scanner</include>
+        <include>sonar-scanner-debug</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/src/main/assembly/dist-linux.xml b/src/main/assembly/dist-linux.xml
deleted file mode 100644
index d68cfc9..0000000
--- a/src/main/assembly/dist-linux.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly>
-  <id>linux</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <baseDirectory>sonar-scanner-${project.version}-linux</baseDirectory>
-  <fileSets>
-
-    <!-- jre basic, except bin/ -->
-    <fileSet>
-      <directory>${unpack.dir}/linux/${jre.dirname.linux}</directory>
-      <outputDirectory>jre</outputDirectory>
-      <excludes>
-        <exclude>bin/**</exclude>
-        <exclude>man/**</exclude>
-        <exclude>lib/jspawnhelper</exclude>
-        <exclude>lib/jexec</exclude>
-        <exclude>plugin/**</exclude>
-      </excludes>
-    </fileSet>
-
-    <!-- jre bin/java -->
-    <fileSet>
-      <directory>${unpack.dir}/linux/${jre.dirname.linux}/bin</directory>
-      <outputDirectory>jre/bin</outputDirectory>
-      <includes>
-        <include>java</include>
-      </includes>
-      <fileMode>0755</fileMode>
-    </fileSet>
-
-    <!-- jre lib executable files -->
-    <fileSet>
-      <directory>${unpack.dir}/linux/${jre.dirname.linux}/lib</directory>
-      <outputDirectory>jre/lib</outputDirectory>
-      <includes>
-        <include>jspawnhelper</include>
-        <include>jexec</include>
-      </includes>
-      <fileMode>0755</fileMode>
-    </fileSet>
-
-    <!-- scanner files -->
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>lib</outputDirectory>
-      <fileMode>0644</fileMode>
-      <includes>
-        <include>${scanner.jar}</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/assembly/conf</directory>
-      <outputDirectory>conf</outputDirectory>
-      <fileMode>0644</fileMode>
-      <lineEnding>unix</lineEnding>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/assembly/bin</directory>
-      <outputDirectory>bin</outputDirectory>
-      <fileMode>0755</fileMode>
-      <lineEnding>unix</lineEnding>
-      <filtered>true</filtered>
-      <includes>
-        <include>sonar-scanner</include>
-        <include>sonar-scanner-debug</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/src/main/assembly/dist-macosx-aarch64.xml b/src/main/assembly/dist-macosx-aarch64.xml
new file mode 100644
index 0000000..2329b9b
--- /dev/null
+++ b/src/main/assembly/dist-macosx-aarch64.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+  <id>macosx-aarch64</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <baseDirectory>sonar-scanner-${project.version}-macosx-aarch64</baseDirectory>
+  <fileSets>
+
+    <!-- jre basic, except bin/ and misc -->
+    <fileSet>
+      <directory>${unpack.dir}/macosx-aarch64/${jre.dirname.macosx}</directory>
+      <outputDirectory>jre</outputDirectory>
+      <excludes>
+        <exclude>bin/**</exclude>
+        <exclude>man/**</exclude>
+        <exclude>lib/jspawnhelper</exclude>
+      </excludes>
+    </fileSet>
+
+    <!-- jre bin/java -->
+    <fileSet>
+      <directory>${unpack.dir}/macosx-aarch64/${jre.dirname.macosx}/bin</directory>
+      <outputDirectory>jre/bin</outputDirectory>
+      <includes>
+        <include>java</include>
+      </includes>
+      <fileMode>0755</fileMode>
+    </fileSet>
+
+    <!-- jre lib executable files -->
+    <fileSet>
+      <directory>${unpack.dir}/macosx-aarch64/${jre.dirname.macosx}/lib</directory>
+      <outputDirectory>jre/lib</outputDirectory>
+      <includes>
+        <include>jspawnhelper</include>
+      </includes>
+      <fileMode>0755</fileMode>
+    </fileSet>
+
+    <!-- scanner files -->
+    <fileSet>
+      <directory>${project.build.directory}</directory>
+      <outputDirectory>lib</outputDirectory>
+      <fileMode>0644</fileMode>
+      <includes>
+        <include>${scanner.jar}</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/assembly/conf</directory>
+      <outputDirectory>conf</outputDirectory>
+      <fileMode>0644</fileMode>
+      <lineEnding>unix</lineEnding>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/assembly/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>0755</fileMode>
+      <lineEnding>unix</lineEnding>
+      <filtered>true</filtered>
+      <includes>
+        <include>sonar-scanner</include>
+        <include>sonar-scanner-debug</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/src/main/assembly/dist-macosx-x64.xml b/src/main/assembly/dist-macosx-x64.xml
new file mode 100644
index 0000000..9429ff6
--- /dev/null
+++ b/src/main/assembly/dist-macosx-x64.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+  <id>macosx-x64</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <baseDirectory>sonar-scanner-${project.version}-macosx-x64</baseDirectory>
+  <fileSets>
+
+    <!-- jre basic, except bin/ and misc -->
+    <fileSet>
+      <directory>${unpack.dir}/macosx-x64/${jre.dirname.macosx}</directory>
+      <outputDirectory>jre</outputDirectory>
+      <excludes>
+        <exclude>bin/**</exclude>
+        <exclude>man/**</exclude>
+        <exclude>lib/jspawnhelper</exclude>
+      </excludes>
+    </fileSet>
+
+    <!-- jre bin/java -->
+    <fileSet>
+      <directory>${unpack.dir}/macosx-x64/${jre.dirname.macosx}/bin</directory>
+      <outputDirectory>jre/bin</outputDirectory>
+      <includes>
+        <include>java</include>
+      </includes>
+      <fileMode>0755</fileMode>
+    </fileSet>
+
+    <!-- jre lib executable files -->
+    <fileSet>
+      <directory>${unpack.dir}/macosx-x64/${jre.dirname.macosx}/lib</directory>
+      <outputDirectory>jre/lib</outputDirectory>
+      <includes>
+        <include>jspawnhelper</include>
+      </includes>
+      <fileMode>0755</fileMode>
+    </fileSet>
+
+    <!-- scanner files -->
+    <fileSet>
+      <directory>${project.build.directory}</directory>
+      <outputDirectory>lib</outputDirectory>
+      <fileMode>0644</fileMode>
+      <includes>
+        <include>${scanner.jar}</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/assembly/conf</directory>
+      <outputDirectory>conf</outputDirectory>
+      <fileMode>0644</fileMode>
+      <lineEnding>unix</lineEnding>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/assembly/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>0755</fileMode>
+      <lineEnding>unix</lineEnding>
+      <filtered>true</filtered>
+      <includes>
+        <include>sonar-scanner</include>
+        <include>sonar-scanner-debug</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/src/main/assembly/dist-macosx.xml b/src/main/assembly/dist-macosx.xml
deleted file mode 100644
index d914152..0000000
--- a/src/main/assembly/dist-macosx.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly>
-  <id>macosx</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <baseDirectory>sonar-scanner-${project.version}-macosx</baseDirectory>
-  <fileSets>
-
-    <!-- jre basic, except bin/ and misc -->
-    <fileSet>
-      <directory>${unpack.dir}/macosx/${jre.dirname.macosx}</directory>
-      <outputDirectory>jre</outputDirectory>
-      <excludes>
-        <exclude>bin/**</exclude>
-        <exclude>man/**</exclude>
-        <exclude>lib/jspawnhelper</exclude>
-      </excludes>
-    </fileSet>
-
-    <!-- jre bin/java -->
-    <fileSet>
-      <directory>${unpack.dir}/macosx/${jre.dirname.macosx}/bin</directory>
-      <outputDirectory>jre/bin</outputDirectory>
-      <includes>
-        <include>java</include>
-      </includes>
-      <fileMode>0755</fileMode>
-    </fileSet>
-
-    <!-- jre lib executable files -->
-    <fileSet>
-      <directory>${unpack.dir}/macosx/${jre.dirname.macosx}/lib</directory>
-      <outputDirectory>jre/lib</outputDirectory>
-      <includes>
-        <include>jspawnhelper</include>
-      </includes>
-      <fileMode>0755</fileMode>
-    </fileSet>
-
-    <!-- scanner files -->
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>lib</outputDirectory>
-      <fileMode>0644</fileMode>
-      <includes>
-        <include>${scanner.jar}</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/assembly/conf</directory>
-      <outputDirectory>conf</outputDirectory>
-      <fileMode>0644</fileMode>
-      <lineEnding>unix</lineEnding>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/assembly/bin</directory>
-      <outputDirectory>bin</outputDirectory>
-      <fileMode>0755</fileMode>
-      <lineEnding>unix</lineEnding>
-      <filtered>true</filtered>
-      <includes>
-        <include>sonar-scanner</include>
-        <include>sonar-scanner-debug</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
diff --git a/src/main/assembly/dist-windows-x64.xml b/src/main/assembly/dist-windows-x64.xml
new file mode 100644
index 0000000..4f5b01c
--- /dev/null
+++ b/src/main/assembly/dist-windows-x64.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+  <id>windows-x64</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <baseDirectory>sonar-scanner-${project.version}-windows-x64</baseDirectory>
+  <fileSets>
+
+    <!-- jre basic, except bin/ -->
+    <fileSet>
+      <directory>${unpack.dir}/windows-x64/${jre.dirname.windows}</directory>
+      <outputDirectory>jre</outputDirectory>
+      <excludes>
+        <exclude>bin/**</exclude>
+        <exclude>man/**</exclude>
+        <exclude>plugin/**</exclude>
+      </excludes>
+    </fileSet>
+
+    <!-- jre bin -->
+    <fileSet>
+      <directory>${unpack.dir}/windows-x64/${jre.dirname.windows}/bin</directory>
+      <outputDirectory>jre/bin</outputDirectory>
+      <fileMode>0755</fileMode>
+    </fileSet>
+
+    <!-- scanner files -->
+    <fileSet>
+      <directory>${project.build.directory}</directory>
+      <outputDirectory>lib</outputDirectory>
+      <fileMode>0644</fileMode>
+      <includes>
+        <include>${scanner.jar}</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/assembly/conf</directory>
+      <outputDirectory>conf</outputDirectory>
+      <fileMode>0644</fileMode>
+      <lineEnding>unix</lineEnding>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/assembly/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>0755</fileMode>
+      <lineEnding>dos</lineEnding>
+      <filtered>true</filtered>
+      <includes>
+        <include>sonar-scanner.bat</include>
+        <include>sonar-scanner-debug.bat</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/src/main/assembly/dist-windows.xml b/src/main/assembly/dist-windows.xml
deleted file mode 100644
index f35a152..0000000
--- a/src/main/assembly/dist-windows.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly>
-  <id>windows</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <baseDirectory>sonar-scanner-${project.version}-windows</baseDirectory>
-  <fileSets>
-
-    <!-- jre basic, except bin/ -->
-    <fileSet>
-      <directory>${unpack.dir}/windows/${jre.dirname.windows}</directory>
-      <outputDirectory>jre</outputDirectory>
-      <excludes>
-        <exclude>bin/**</exclude>
-        <exclude>man/**</exclude>
-        <exclude>plugin/**</exclude>
-      </excludes>
-    </fileSet>
-
-    <!-- jre bin -->
-    <fileSet>
-      <directory>${unpack.dir}/windows/${jre.dirname.windows}/bin</directory>
-      <outputDirectory>jre/bin</outputDirectory>
-      <fileMode>0755</fileMode>
-    </fileSet>
-
-    <!-- scanner files -->
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <outputDirectory>lib</outputDirectory>
-      <fileMode>0644</fileMode>
-      <includes>
-        <include>${scanner.jar}</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/assembly/conf</directory>
-      <outputDirectory>conf</outputDirectory>
-      <fileMode>0644</fileMode>
-      <lineEnding>unix</lineEnding>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/assembly/bin</directory>
-      <outputDirectory>bin</outputDirectory>
-      <fileMode>0755</fileMode>
-      <lineEnding>dos</lineEnding>
-      <filtered>true</filtered>
-      <includes>
-        <include>sonar-scanner.bat</include>
-        <include>sonar-scanner-debug.bat</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
-- 
cgit v1.2.3