jan-leila/Slipstream-Mod-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjusted package assembly to enforce line endings and remove spaces in dist folder/archive names

Browse source
This commit is contained in:
Vhati 2017-12-11 21:42:59 -05:00
parent c52d28c33c
commit bf51b4b06e
3 changed files with 51 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
pom.xml
View file

@ -14,11 +14,11 @@
</properties>
<!--
Don't include meta-packages as dependencies.
They cause the "jar-with-dependencies" task
to throw an error about "Negative Time",
probably for setting timestamps on their
non-existent class files.
Don't include meta-packages as dependencies.
They cause the "jar-with-dependencies" task
to throw an error about "Negative Time",
probably for setting timestamps on their
non-existent class files.
-->
<dependencies>
<dependency>
@ -65,11 +65,15 @@
</configuration>
</plugin>
<plugin>
<!-- Assembly 2.4 needed its own dependencies pinned to get around a tar bug. -->
<!--
Assembly 2.4.0 needed its own dependencies pinned to get
around a Plexus Archiver tar bug. And Assembly 2.4.1 fixed
fileSet lineEnding bug that ate the final newlines.
-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4.1</version> <!-- Plexus Archiver had bad tar support before. -->
<version>2.4.1</version>
<executions>
<execution> <!-- Build jar. -->
<id>jar-with-dependencies</id>
@ -104,7 +108,7 @@
<descriptors>
<descriptor>src/main/assembly/dist-win.xml</descriptor>
</descriptors>
<finalName>${project.name} v${project.version}-Win</finalName>
<finalName>SlipstreamModManager_${project.version}-Win</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
@ -118,7 +122,7 @@
<descriptors>
<descriptor>src/main/assembly/dist-unix.xml</descriptor>
</descriptors>
<finalName>${project.name} v${project.version}-Unix</finalName>
<finalName>SlipstreamModManager_${project.version}-Unix</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>

16
src/main/assembly/dist-unix.xml
View file

@ -7,12 +7,25 @@
<fileSet>
<directory>skel_common</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>**/*.txt</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>skel_common</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>**/*.txt</include>
</includes>
<lineEnding>lf</lineEnding>
</fileSet>
<fileSet> <!-- Non-executables. -->
<directory>skel_unix</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>**/*.command</exclude>
<exclude>**/*.desktop</exclude>
<exclude>**/*.sh</exclude>
</excludes>
</fileSet>
@ -21,10 +34,13 @@
<outputDirectory>/</outputDirectory>
<includes>
<include>**/*.command</include>
<include>**/*.desktop</include>
<include>**/*.sh</include>
</includes>
<fileMode>755</fileMode>
<lineEnding>lf</lineEnding>
</fileSet>
<fileSet>
<directory>${project.build.directory}</directory>
<outputDirectory>/</outputDirectory>

23
src/main/assembly/dist-win.xml
View file

@ -7,14 +7,35 @@
<fileSet>
<directory>skel_common</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>**/*.txt</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>skel_common</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>**/*.txt</include>
</includes>
<lineEnding>crlf</lineEnding>
</fileSet>
<fileSet>
<directory>skel_win</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>**/*.txt</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>skel_win</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*</include>
<include>**/*.txt</include>
</includes>
<lineEnding>crlf</lineEnding>
</fileSet>
<fileSet>
<directory>${project.build.directory}</directory>
<outputDirectory>/</outputDirectory>