aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/assembly/dist-linux-aarch64.xml71
-rw-r--r--src/main/assembly/dist-linux-x64.xml (renamed from src/main/assembly/dist-linux.xml)10
-rw-r--r--src/main/assembly/dist-macosx-aarch64.xml68
-rw-r--r--src/main/assembly/dist-macosx-x64.xml (renamed from src/main/assembly/dist-macosx.xml)10
-rw-r--r--src/main/assembly/dist-windows-x64.xml (renamed from src/main/assembly/dist-windows.xml)8
5 files changed, 153 insertions, 14 deletions
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.xml b/src/main/assembly/dist-linux-x64.xml
index d68cfc9..f13e733 100644
--- a/src/main/assembly/dist-linux.xml
+++ b/src/main/assembly/dist-linux-x64.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
- <id>linux</id>
+ <id>linux-x64</id>
<formats>
<format>zip</format>
</formats>
- <baseDirectory>sonar-scanner-${project.version}-linux</baseDirectory>
+ <baseDirectory>sonar-scanner-${project.version}-linux-x64</baseDirectory>
<fileSets>
<!-- jre basic, except bin/ -->
<fileSet>
- <directory>${unpack.dir}/linux/${jre.dirname.linux}</directory>
+ <directory>${unpack.dir}/linux-x64/${jre.dirname.linux}</directory>
<outputDirectory>jre</outputDirectory>
<excludes>
<exclude>bin/**</exclude>
@@ -22,7 +22,7 @@
<!-- jre bin/java -->
<fileSet>
- <directory>${unpack.dir}/linux/${jre.dirname.linux}/bin</directory>
+ <directory>${unpack.dir}/linux-x64/${jre.dirname.linux}/bin</directory>
<outputDirectory>jre/bin</outputDirectory>
<includes>
<include>java</include>
@@ -32,7 +32,7 @@
<!-- jre lib executable files -->
<fileSet>
- <directory>${unpack.dir}/linux/${jre.dirname.linux}/lib</directory>
+ <directory>${unpack.dir}/linux-x64/${jre.dirname.linux}/lib</directory>
<outputDirectory>jre/lib</outputDirectory>
<includes>
<include>jspawnhelper</include>
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.xml b/src/main/assembly/dist-macosx-x64.xml
index d914152..9429ff6 100644
--- a/src/main/assembly/dist-macosx.xml
+++ b/src/main/assembly/dist-macosx-x64.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
- <id>macosx</id>
+ <id>macosx-x64</id>
<formats>
<format>zip</format>
</formats>
- <baseDirectory>sonar-scanner-${project.version}-macosx</baseDirectory>
+ <baseDirectory>sonar-scanner-${project.version}-macosx-x64</baseDirectory>
<fileSets>
<!-- jre basic, except bin/ and misc -->
<fileSet>
- <directory>${unpack.dir}/macosx/${jre.dirname.macosx}</directory>
+ <directory>${unpack.dir}/macosx-x64/${jre.dirname.macosx}</directory>
<outputDirectory>jre</outputDirectory>
<excludes>
<exclude>bin/**</exclude>
@@ -20,7 +20,7 @@
<!-- jre bin/java -->
<fileSet>
- <directory>${unpack.dir}/macosx/${jre.dirname.macosx}/bin</directory>
+ <directory>${unpack.dir}/macosx-x64/${jre.dirname.macosx}/bin</directory>
<outputDirectory>jre/bin</outputDirectory>
<includes>
<include>java</include>
@@ -30,7 +30,7 @@
<!-- jre lib executable files -->
<fileSet>
- <directory>${unpack.dir}/macosx/${jre.dirname.macosx}/lib</directory>
+ <directory>${unpack.dir}/macosx-x64/${jre.dirname.macosx}/lib</directory>
<outputDirectory>jre/lib</outputDirectory>
<includes>
<include>jspawnhelper</include>
diff --git a/src/main/assembly/dist-windows.xml b/src/main/assembly/dist-windows-x64.xml
index f35a152..4f5b01c 100644
--- a/src/main/assembly/dist-windows.xml
+++ b/src/main/assembly/dist-windows-x64.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
- <id>windows</id>
+ <id>windows-x64</id>
<formats>
<format>zip</format>
</formats>
- <baseDirectory>sonar-scanner-${project.version}-windows</baseDirectory>
+ <baseDirectory>sonar-scanner-${project.version}-windows-x64</baseDirectory>
<fileSets>
<!-- jre basic, except bin/ -->
<fileSet>
- <directory>${unpack.dir}/windows/${jre.dirname.windows}</directory>
+ <directory>${unpack.dir}/windows-x64/${jre.dirname.windows}</directory>
<outputDirectory>jre</outputDirectory>
<excludes>
<exclude>bin/**</exclude>
@@ -20,7 +20,7 @@
<!-- jre bin -->
<fileSet>
- <directory>${unpack.dir}/windows/${jre.dirname.windows}/bin</directory>
+ <directory>${unpack.dir}/windows-x64/${jre.dirname.windows}/bin</directory>
<outputDirectory>jre/bin</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>