Update source assemblies to exclude ignored files.
Primarily removes windows build directories and contents but also
removes autoconf output and intermediate files (configure is the
exception) for the unix build.
diff --git a/src/assembly/native-src.xml b/src/assembly/native-src.xml
index 0523e56..287a6ba 100644
--- a/src/assembly/native-src.xml
+++ b/src/assembly/native-src.xml
@@ -36,9 +36,20 @@
<outputDirectory>unix</outputDirectory>
<lineEnding>lf</lineEnding>
<excludes>
- <exclude>**/*.sh</exclude> <!-- Excluded here, because processed below -->
- <exclude>configure</exclude>
+ <!-- Aligned with .gitignore file -->
+ <exclude>Makedefs</exclude>
+ <exclude>Makefile</exclude>
<exclude>autom4te.cache/**</exclude>
+ <exclude>config.log</exclude>
+ <exclude>config.nice</exclude>
+ <exclude>config.status</exclude>
+ <exclude>configure</exclude>
+ <exclude>jsvc</exclude>
+ <exclude>native/*.o</exclude>
+ <exclude>native/Makefile</exclude>
+ <exclude>native/libservice.a</exclude>
+ <!-- Excluded here, because processed below -->
+ <exclude>**/*.sh</exclude>
<!-- Bug http://jira.codehaus.org/browse/MASSEMBLY-462 -->
<exclude>**/*.formatted</exclude>
</excludes>
@@ -58,10 +69,13 @@
<outputDirectory>windows</outputDirectory>
<lineEnding>crlf</lineEnding>
<excludes>
+ <!-- Aligned with .gitignore file -->
+ <exclude>apps/prunmgr/*_GUI_RELEASE/**</exclude>
+ <exclude>apps/prunsrv/*_RELEASE/**</exclude>
+ <!-- Included below without line ending changes -->
<exclude>**/*.ico</exclude>
<exclude>**/*.bmp</exclude>
<exclude>**/*.rc</exclude>
- <exclude>apps/*/*_RELEASE/**</exclude>
<!-- Bug http://jira.codehaus.org/browse/MASSEMBLY-462 -->
<exclude>**/*.formatted</exclude>
</excludes>
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
index e3e6eb6..7e1640d 100644
--- a/src/assembly/src.xml
+++ b/src/assembly/src.xml
@@ -37,23 +37,22 @@
<fileSet>
<directory>src</directory>
<excludes>
- <exclude>**/*.sh</exclude>
- <exclude>native/unix/configure</exclude>
+ <!-- Aligned with .gitignore file -->
+ <exclude>native/unix/Makedefs</exclude>
+ <exclude>native/unix/Makefile</exclude>
<exclude>native/unix/autom4te.cache/**</exclude>
- <exclude>native/windows/**</exclude>
- <!--
- <exclude>media/**</exclude>
- <exclude>site/**</exclude>
- -->
- </excludes>
- </fileSet>
- <fileSet>
- <directory>src</directory>
- <includes>
- <include>native/windows/**</include>
- </includes>
- <excludes>
- <exclude>apps/*/*_RELEASE/**</exclude>
+ <exclude>native/unix/config.log</exclude>
+ <exclude>native/unix/config.nice</exclude>
+ <exclude>native/unix/config.status</exclude>
+ <exclude>native/unix/configure</exclude>
+ <exclude>native/unix/jsvc</exclude>
+ <exclude>native/unix/native/*.o</exclude>
+ <exclude>native/unix/native/Makefile</exclude>
+ <exclude>native/unix/native/libservice.a</exclude>
+ <exclude>native/windows/apps/prunmgr/*_GUI_RELEASE/**</exclude>
+ <exclude>native/windows/apps/prunsrv/*_RELEASE/**</exclude>
+ <!-- Excluded here, because processed below -->
+ <exclude>**/*.sh</exclude>
</excludes>
</fileSet>
<fileSet>
