Adjusted package assembly to enforce line endings and remove spaces in dist folder/archive names
This commit is contained in:
parent
c52d28c33c
commit
bf51b4b06e
3 changed files with 51 additions and 10 deletions
22
pom.xml
22
pom.xml
|
@ -14,11 +14,11 @@
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Don't include meta-packages as dependencies.
|
Don't include meta-packages as dependencies.
|
||||||
They cause the "jar-with-dependencies" task
|
They cause the "jar-with-dependencies" task
|
||||||
to throw an error about "Negative Time",
|
to throw an error about "Negative Time",
|
||||||
probably for setting timestamps on their
|
probably for setting timestamps on their
|
||||||
non-existent class files.
|
non-existent class files.
|
||||||
-->
|
-->
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -65,11 +65,15 @@
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<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>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-assembly-plugin</artifactId>
|
<artifactId>maven-assembly-plugin</artifactId>
|
||||||
<version>2.4.1</version> <!-- Plexus Archiver had bad tar support before. -->
|
<version>2.4.1</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution> <!-- Build jar. -->
|
<execution> <!-- Build jar. -->
|
||||||
<id>jar-with-dependencies</id>
|
<id>jar-with-dependencies</id>
|
||||||
|
@ -104,7 +108,7 @@
|
||||||
<descriptors>
|
<descriptors>
|
||||||
<descriptor>src/main/assembly/dist-win.xml</descriptor>
|
<descriptor>src/main/assembly/dist-win.xml</descriptor>
|
||||||
</descriptors>
|
</descriptors>
|
||||||
<finalName>${project.name} v${project.version}-Win</finalName>
|
<finalName>SlipstreamModManager_${project.version}-Win</finalName>
|
||||||
<appendAssemblyId>false</appendAssemblyId>
|
<appendAssemblyId>false</appendAssemblyId>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
@ -118,7 +122,7 @@
|
||||||
<descriptors>
|
<descriptors>
|
||||||
<descriptor>src/main/assembly/dist-unix.xml</descriptor>
|
<descriptor>src/main/assembly/dist-unix.xml</descriptor>
|
||||||
</descriptors>
|
</descriptors>
|
||||||
<finalName>${project.name} v${project.version}-Unix</finalName>
|
<finalName>SlipstreamModManager_${project.version}-Unix</finalName>
|
||||||
<appendAssemblyId>false</appendAssemblyId>
|
<appendAssemblyId>false</appendAssemblyId>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
|
|
@ -7,12 +7,25 @@
|
||||||
<fileSet>
|
<fileSet>
|
||||||
<directory>skel_common</directory>
|
<directory>skel_common</directory>
|
||||||
<outputDirectory>/</outputDirectory>
|
<outputDirectory>/</outputDirectory>
|
||||||
|
<excludes>
|
||||||
|
<exclude>**/*.txt</exclude>
|
||||||
|
</excludes>
|
||||||
</fileSet>
|
</fileSet>
|
||||||
|
<fileSet>
|
||||||
|
<directory>skel_common</directory>
|
||||||
|
<outputDirectory>/</outputDirectory>
|
||||||
|
<includes>
|
||||||
|
<include>**/*.txt</include>
|
||||||
|
</includes>
|
||||||
|
<lineEnding>lf</lineEnding>
|
||||||
|
</fileSet>
|
||||||
|
|
||||||
<fileSet> <!-- Non-executables. -->
|
<fileSet> <!-- Non-executables. -->
|
||||||
<directory>skel_unix</directory>
|
<directory>skel_unix</directory>
|
||||||
<outputDirectory>/</outputDirectory>
|
<outputDirectory>/</outputDirectory>
|
||||||
<excludes>
|
<excludes>
|
||||||
<exclude>**/*.command</exclude>
|
<exclude>**/*.command</exclude>
|
||||||
|
<exclude>**/*.desktop</exclude>
|
||||||
<exclude>**/*.sh</exclude>
|
<exclude>**/*.sh</exclude>
|
||||||
</excludes>
|
</excludes>
|
||||||
</fileSet>
|
</fileSet>
|
||||||
|
@ -21,10 +34,13 @@
|
||||||
<outputDirectory>/</outputDirectory>
|
<outputDirectory>/</outputDirectory>
|
||||||
<includes>
|
<includes>
|
||||||
<include>**/*.command</include>
|
<include>**/*.command</include>
|
||||||
|
<include>**/*.desktop</include>
|
||||||
<include>**/*.sh</include>
|
<include>**/*.sh</include>
|
||||||
</includes>
|
</includes>
|
||||||
<fileMode>755</fileMode>
|
<fileMode>755</fileMode>
|
||||||
|
<lineEnding>lf</lineEnding>
|
||||||
</fileSet>
|
</fileSet>
|
||||||
|
|
||||||
<fileSet>
|
<fileSet>
|
||||||
<directory>${project.build.directory}</directory>
|
<directory>${project.build.directory}</directory>
|
||||||
<outputDirectory>/</outputDirectory>
|
<outputDirectory>/</outputDirectory>
|
||||||
|
|
|
@ -7,14 +7,35 @@
|
||||||
<fileSet>
|
<fileSet>
|
||||||
<directory>skel_common</directory>
|
<directory>skel_common</directory>
|
||||||
<outputDirectory>/</outputDirectory>
|
<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>
|
||||||
<fileSet>
|
<fileSet>
|
||||||
<directory>skel_win</directory>
|
<directory>skel_win</directory>
|
||||||
<outputDirectory>/</outputDirectory>
|
<outputDirectory>/</outputDirectory>
|
||||||
<includes>
|
<includes>
|
||||||
<include>*</include>
|
<include>**/*.txt</include>
|
||||||
</includes>
|
</includes>
|
||||||
|
<lineEnding>crlf</lineEnding>
|
||||||
</fileSet>
|
</fileSet>
|
||||||
|
|
||||||
<fileSet>
|
<fileSet>
|
||||||
<directory>${project.build.directory}</directory>
|
<directory>${project.build.directory}</directory>
|
||||||
<outputDirectory>/</outputDirectory>
|
<outputDirectory>/</outputDirectory>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue