honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make .zip and .tar.gz release artifacts contain same files. 

This commit changes the build to include .exe and sigar/.dll files in
both the zip and tar artifacts.

Closes #2793
This commit is contained in:
Andrew Selden 2014-09-03 16:13:17 -07:00
parent 18a713a2ae
commit 80a3038f83
3 changed files with 42 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/assemblies/common-bin.xml
View File

@ -28,6 +28,46 @@
<include>*</include> <include>*</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet>
<filtered>true</filtered>
<directory>bin</directory>
<outputDirectory>bin</outputDirectory>
<lineEnding>dos</lineEnding>
<includes>
<include>elasticsearch.bat</include>
<include>plugin.bat</include>
<include>service.bat</include>
</includes>
</fileSet>
<fileSet>
<filtered>false</filtered>
<directory>bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
<include>*.exe</include>
</includes>
</fileSet>
<fileSet>
<filtered>true</filtered>
<directory>bin</directory>
<outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
<lineEnding>unix</lineEnding>
<includes>
<include>elasticsearch.in.sh</include>
<include>elasticsearch</include>
<include>plugin</include>
</includes>
</fileSet>
<fileSet>
<directory>lib/sigar</directory>
<outputDirectory>lib/sigar</outputDirectory>
<includes>
<include>*</include>
</includes>
</fileSet>
</fileSets> </fileSets>
<files> <files>
<file> <file>

27
src/main/assemblies/targz-bin.xml
View File

@ -7,32 +7,7 @@
<includeBaseDirectory>true</includeBaseDirectory> <includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>bin</directory>
<outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
<lineEnding>unix</lineEnding>
<filtered>true</filtered>
<includes>
<include>elasticsearch.in.sh</include>
<include>elasticsearch</include>
<include>plugin</include>
</includes>
</fileSet>
<fileSet>
<directory>lib/sigar</directory>
<outputDirectory>lib/sigar</outputDirectory>
<excludes>
<exclude>*.dll</exclude>
<exclude>**winnt**</exclude>
</excludes>
</fileSet>
</fileSets>
<componentDescriptors> <componentDescriptors>
<componentDescriptor>src/main/assemblies/common-bin.xml</componentDescriptor> <componentDescriptor>src/main/assemblies/common-bin.xml</componentDescriptor>
</componentDescriptors> </componentDescriptors>
</assembly> </assembly>

45
src/main/assemblies/zip-bin.xml
View File

@ -7,50 +7,7 @@
<includeBaseDirectory>true</includeBaseDirectory> <includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
<fileSet>
<filtered>true</filtered>
<directory>bin</directory>
<outputDirectory>bin</outputDirectory>
<lineEnding>dos</lineEnding>
<includes>
<include>elasticsearch.bat</include>
<include>plugin.bat</include>
<include>service.bat</include>
</includes>
</fileSet>
<fileSet>
<filtered>false</filtered>
<directory>bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
<include>*.exe</include>
</includes>
</fileSet>
<fileSet>
<filtered>true</filtered>
<directory>bin</directory>
<outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
<lineEnding>unix</lineEnding>
<includes>
<include>elasticsearch.in.sh</include>
<include>elasticsearch</include>
<include>plugin</include>
</includes>
</fileSet>
<fileSet>
<directory>lib/sigar</directory>
<outputDirectory>lib/sigar</outputDirectory>
<includes>
<include>*</include>
</includes>
</fileSet>
</fileSets>
<componentDescriptors> <componentDescriptors>
<componentDescriptor>src/main/assemblies/common-bin.xml</componentDescriptor> <componentDescriptor>src/main/assemblies/common-bin.xml</componentDescriptor>
</componentDescriptors> </componentDescriptors>
</assembly> </assembly>