From deb8a02ba1e8f8b18c0e3aefaf2f3fc3ae1d78fa Mon Sep 17 00:00:00 2001
From: Janos Gyerik <janos.gyerik@sonarsource.com>
Date: Tue, 21 Mar 2017 15:56:13 +0100
Subject: [PATCH] Improve assembly (#28)

* Make jre/lib/jspawnhelper executable on macosx

* Move from /lib/jre to /jre in dists
---
 src/main/assembly/bin/sonar-scanner     |  2 +-
 src/main/assembly/bin/sonar-scanner.bat |  2 +-
 src/main/assembly/dist-linux.xml        |  4 ++--
 src/main/assembly/dist-macosx.xml       | 17 ++++++++++++++---
 src/main/assembly/dist-windows.xml      |  4 ++--
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/main/assembly/bin/sonar-scanner b/src/main/assembly/bin/sonar-scanner
index b0c19f3..985de89 100755
--- a/src/main/assembly/bin/sonar-scanner
+++ b/src/main/assembly/bin/sonar-scanner
@@ -46,7 +46,7 @@ fi
 
 use_embedded_jre=${use_embedded_jre}
 if [ "$use_embedded_jre" = true ]; then
-  export JAVA_HOME=$sonar_scanner_home/lib/jre
+  export JAVA_HOME=$sonar_scanner_home/jre
 fi
 
 if [ -n "$JAVA_HOME" ]
diff --git a/src/main/assembly/bin/sonar-scanner.bat b/src/main/assembly/bin/sonar-scanner.bat
index 833dcbb..b10d8dc 100644
--- a/src/main/assembly/bin/sonar-scanner.bat
+++ b/src/main/assembly/bin/sonar-scanner.bat
@@ -20,7 +20,7 @@ set SONAR_SCANNER_HOME=%~dp0..
 
 set use_embedded_jre=${use_embedded_jre}
 if "%use_embedded_jre%" == "true" (
-  set JAVA_HOME=%SONAR_SCANNER_HOME%\lib\jre
+  set JAVA_HOME=%SONAR_SCANNER_HOME%\jre
 )
 
 if not "%JAVA_HOME%" == "" goto foundJavaHome
diff --git a/src/main/assembly/dist-linux.xml b/src/main/assembly/dist-linux.xml
index f24416a..0eef457 100644
--- a/src/main/assembly/dist-linux.xml
+++ b/src/main/assembly/dist-linux.xml
@@ -10,7 +10,7 @@
     <!-- jre basic, except bin/ -->
     <fileSet>
       <directory>${unpack.dir}/linux/${jre.dirname.linux}</directory>
-      <outputDirectory>lib/jre</outputDirectory>
+      <outputDirectory>jre</outputDirectory>
       <excludes>
         <exclude>bin/**</exclude>
         <exclude>man/**</exclude>
@@ -21,7 +21,7 @@
     <!-- jre bin/java -->
     <fileSet>
       <directory>${unpack.dir}/linux/${jre.dirname.linux}/bin</directory>
-      <outputDirectory>lib/jre/bin</outputDirectory>
+      <outputDirectory>jre/bin</outputDirectory>
       <includes>
         <include>java</include>
       </includes>
diff --git a/src/main/assembly/dist-macosx.xml b/src/main/assembly/dist-macosx.xml
index 1babd6a..d914152 100644
--- a/src/main/assembly/dist-macosx.xml
+++ b/src/main/assembly/dist-macosx.xml
@@ -7,26 +7,37 @@
   <baseDirectory>sonar-scanner-${project.version}-macosx</baseDirectory>
   <fileSets>
 
-    <!-- jre basic, except bin/ -->
+    <!-- jre basic, except bin/ and misc -->
     <fileSet>
       <directory>${unpack.dir}/macosx/${jre.dirname.macosx}</directory>
-      <outputDirectory>lib/jre</outputDirectory>
+      <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>lib/jre/bin</outputDirectory>
+      <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>
diff --git a/src/main/assembly/dist-windows.xml b/src/main/assembly/dist-windows.xml
index c65c2e4..f35a152 100644
--- a/src/main/assembly/dist-windows.xml
+++ b/src/main/assembly/dist-windows.xml
@@ -10,7 +10,7 @@
     <!-- jre basic, except bin/ -->
     <fileSet>
       <directory>${unpack.dir}/windows/${jre.dirname.windows}</directory>
-      <outputDirectory>lib/jre</outputDirectory>
+      <outputDirectory>jre</outputDirectory>
       <excludes>
         <exclude>bin/**</exclude>
         <exclude>man/**</exclude>
@@ -21,7 +21,7 @@
     <!-- jre bin -->
     <fileSet>
       <directory>${unpack.dir}/windows/${jre.dirname.windows}/bin</directory>
-      <outputDirectory>lib/jre/bin</outputDirectory>
+      <outputDirectory>jre/bin</outputDirectory>
       <fileMode>0755</fileMode>
     </fileSet>
 
-- 
2.39.5