diff options
| author | Janos Gyerik <janos.gyerik@sonarsource.com> | 2017-03-21 15:56:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-21 15:56:13 +0100 |
| commit | deb8a02ba1e8f8b18c0e3aefaf2f3fc3ae1d78fa (patch) | |
| tree | 228724998eab04b99e5b2a7f0e17e016f0525cba /src/main/assembly/dist-macosx.xml | |
| parent | 5a376fb05e50a3af2d57225f0edf3cc28a08abbe (diff) | |
| download | sonar-scanner-cli-deb8a02ba1e8f8b18c0e3aefaf2f3fc3ae1d78fa.tar.gz sonar-scanner-cli-deb8a02ba1e8f8b18c0e3aefaf2f3fc3ae1d78fa.zip | |
Improve assembly (#28)
* Make jre/lib/jspawnhelper executable on macosx
* Move from /lib/jre to /jre in dists
Diffstat (limited to 'src/main/assembly/dist-macosx.xml')
| -rw-r--r-- | src/main/assembly/dist-macosx.xml | 17 |
1 files changed, 14 insertions, 3 deletions
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> |