0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix assembly

Browse source
This commit is contained in:
Kaoru FUZITA 2015-12-13 17:20:29 +09:00
parent a693939dce
commit 42ff3469ca
4 changed files with 16 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pom.xml
View file

@ -291,32 +291,6 @@
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<id>copy-resources</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/bin</outputDirectory>
<resources>
<resource>
<directory>${basedir}/bin</directory>
<filtering>true</filtering>
<excludes>
<exclude>*.exe</exclude>
</excludes>
</resource>
<resource>
<directory>${basedir}/bin</directory>
<filtering>false</filtering>
<includes>
<include>*.exe</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-resources-rpm</id>
<phase>prepare-package</phase>
@ -373,6 +347,7 @@
<finalName>${project.artifactId}-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<outputDirectory>${project.build.directory}/releases/</outputDirectory>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptors>
<descriptor>${basedir}/src/main/assemblies/targz-bin.xml</descriptor>
<descriptor>${basedir}/src/main/assemblies/zip-bin.xml</descriptor>

26
src/main/assemblies/common-bin.xml
View file

@ -1,7 +1,7 @@
<component>
<dependencySets>
<dependencySet>
<outputDirectory>/app</outputDirectory>
<outputDirectory>fess-${project.version}/app</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<unpack>true</unpack>
<includes>
@ -13,7 +13,7 @@
<fileSet>
<filtered>true</filtered>
<directory>src/main/assemblies/files</directory>
<outputDirectory>bin</outputDirectory>
<outputDirectory>fess-${project.version}/bin</outputDirectory>
<lineEnding>dos</lineEnding>
<includes>
<include>fess.in.bat</include>
@ -24,7 +24,7 @@
<fileSet>
<filtered>false</filtered>
<directory>src/main/assemblies/files</directory>
<outputDirectory>bin</outputDirectory>
<outputDirectory>fess-${project.version}/bin</outputDirectory>
<includes>
<include>*.exe</include>
</includes>
@ -32,7 +32,7 @@
<fileSet>
<filtered>true</filtered>
<directory>src/main/assemblies/files</directory>
<outputDirectory>bin</outputDirectory>
<outputDirectory>fess-${project.version}/bin</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
<lineEnding>unix</lineEnding>
@ -45,14 +45,14 @@
<!-- lib -->
<fileSet>
<directory>${project.build.directory}/tomcat-lib</directory>
<outputDirectory>/lib/classes</outputDirectory>
<outputDirectory>fess-${project.version}/lib/classes</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.build.directory}/fess/WEB-INF/classes/org/codelibs/fess/</directory>
<includes>
<include>FessBoot**</include>
</includes>
<outputDirectory>/lib/classes/org/codelibs/fess</outputDirectory>
<outputDirectory>fess-${project.version}/lib/classes/org/codelibs/fess</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/assemblies/files</directory>
@ -60,12 +60,12 @@
<include>logging.properties</include>
<include>tomcat_config.properties</include>
</includes>
<outputDirectory>/lib/classes</outputDirectory>
<outputDirectory>fess-${project.version}/lib/classes</outputDirectory>
</fileSet>
<!-- logs -->
<fileSet>
<directory>src/main/assemblies/files</directory>
<outputDirectory>/logs</outputDirectory>
<outputDirectory>fess-${project.version}/logs</outputDirectory>
<excludes>
<exclude>*</exclude>
</excludes>
@ -74,7 +74,7 @@
<!-- temp -->
<fileSet>
<directory>src/main/assemblies/files</directory>
<outputDirectory>/temp</outputDirectory>
<outputDirectory>fess-${project.version}/temp</outputDirectory>
<excludes>
<exclude>*</exclude>
</excludes>
@ -83,12 +83,12 @@
<!-- es/plugins -->
<fileSet>
<directory>${project.basedir}/plugins</directory>
<outputDirectory>/es/plugins</outputDirectory>
<outputDirectory>fess-${project.version}/es/plugins</outputDirectory>
</fileSet>
<!-- es/data -->
<fileSet>
<directory>src/main/assemblies/files</directory>
<outputDirectory>/es/data</outputDirectory>
<outputDirectory>fess-${project.version}/es/data</outputDirectory>
<excludes>
<exclude>*</exclude>
</excludes>
@ -98,11 +98,11 @@
<files>
<file>
<source>README.md</source>
<outputDirectory>/</outputDirectory>
<outputDirectory>fess-${project.version}</outputDirectory>
</file>
<file>
<source>LICENSE</source>
<outputDirectory>/</outputDirectory>
<outputDirectory>fess-${project.version}</outputDirectory>
</file>
</files>
</component>

2
src/main/assemblies/targz-bin.xml
View file

@ -5,7 +5,7 @@
<format>tar.gz</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<includeBaseDirectory>false</includeBaseDirectory>
<componentDescriptors>
<componentDescriptor>src/main/assemblies/common-bin.xml

2
src/main/assemblies/zip-bin.xml
View file

@ -5,7 +5,7 @@
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<includeBaseDirectory>false</includeBaseDirectory>
<componentDescriptors>
<componentDescriptor>src/main/assemblies/common-bin.xml