Skip to content

Commit 6abb931

Browse files
committed
Fixes #125: Set correct file modes in distribution on Linux
Ensures that directory and file permissions are set correctly in the distribution package. Additionally, the line endings of the shell and batch scripts are converted to the one of the target platform. This commit adds tar.gz as an additional distribution file format since directory modes do not work correctly in zip-files created by the assembly plugin (see http://jira.codehaus.org/browse/MASSEMBLY-494 for an explanation and a workaround if desired). However, tar.gz files can be cumbersome to work with on Windows. Consequently, both archive formats should be offered.
1 parent 42bb838 commit 6abb931

File tree

1 file changed

+37
-9
lines changed

1 file changed

+37
-9
lines changed

src/main/assembly/assembly.xml

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,90 @@
1-
<assembly>
1+
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
4+
25
<id>bin</id>
6+
37
<formats>
8+
<format>tar.gz</format>
49
<format>zip</format>
510
</formats>
611

7-
<!-- Adds dependencies to zip package under lib directory -->
12+
<!-- Adds dependencies to distribution package under lib directory -->
813
<dependencySets>
914
<dependencySet>
1015
<useProjectArtifact>false</useProjectArtifact>
1116
<outputDirectory>lib</outputDirectory>
1217
<unpack>false</unpack>
18+
<directoryMode>0755</directoryMode>
19+
<fileMode>0644</fileMode>
1320
</dependencySet>
1421
</dependencySets>
1522

1623
<fileSets>
24+
<!-- adds jar package to the root directory of distribution package -->
25+
<fileSet>
26+
<directory>${project.build.directory}</directory>
27+
<outputDirectory></outputDirectory>
28+
<includes>
29+
<include>*.jar</include>
30+
</includes>
31+
<directoryMode>0755</directoryMode>
32+
<fileMode>0644</fileMode>
33+
</fileSet>
1734
<fileSet>
1835
<directory>${project.build.scriptSourceDirectory}</directory>
1936
<outputDirectory></outputDirectory>
2037
<includes>
2138
<include>*.bat</include>
22-
<include>*.sh</include>
2339
</includes>
2440
<filtered>true</filtered>
41+
<directoryMode>0755</directoryMode>
42+
<fileMode>0755</fileMode>
43+
<lineEnding>crlf</lineEnding>
2544
</fileSet>
26-
<!-- adds jar package to the root directory of zip package -->
2745
<fileSet>
28-
<directory>${project.build.directory}</directory>
46+
<directory>${project.build.scriptSourceDirectory}</directory>
2947
<outputDirectory></outputDirectory>
3048
<includes>
31-
<include>*.jar</include>
49+
<include>*.sh</include>
3250
</includes>
51+
<filtered>true</filtered>
52+
<directoryMode>0755</directoryMode>
53+
<fileMode>0755</fileMode>
54+
<lineEnding>lf</lineEnding>
3355
</fileSet>
34-
3556
<fileSet>
3657
<directory>examples/</directory>
3758
<outputDirectory>examples/</outputDirectory>
3859
<includes>
3960
<include>**/*</include>
4061
</includes>
62+
<directoryMode>0755</directoryMode>
63+
<fileMode>0644</fileMode>
4164
</fileSet>
4265
<fileSet>
43-
<directory>${project.basedir}/src/main/resources/schemata/
44-
</directory>
66+
<directory>${project.basedir}/src/main/resources/schemata/</directory>
4567
<outputDirectory>schemata/</outputDirectory>
4668
<includes>
4769
<include>*.xsd</include>
4870
</includes>
71+
<directoryMode>0755</directoryMode>
72+
<fileMode>0644</fileMode>
4973
</fileSet>
5074
<fileSet>
5175
<directory>modules/</directory>
5276
<outputDirectory>modules/</outputDirectory>
77+
<directoryMode>0755</directoryMode>
78+
<fileMode>0644</fileMode>
5379
</fileSet>
5480
<fileSet>
5581
<directory></directory>
5682
<outputDirectory></outputDirectory>
5783
<includes>
5884
<include>*.md</include>
5985
</includes>
86+
<directoryMode>0755</directoryMode>
87+
<fileMode>0644</fileMode>
6088
</fileSet>
6189
</fileSets>
6290
</assembly>

0 commit comments

Comments
 (0)