You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2012/01/09 22:21:17 UTC

svn commit: r1229357 - /incubator/accumulo/branches/1.4/src/assemble/dist.xml

Author: ecn
Date: Mon Jan  9 21:21:16 2012
New Revision: 1229357

URL: http://svn.apache.org/viewvc?rev=1229357&view=rev
Log:
ACCUMULO-269 better pattern matching for excluding generated files from tar.gz

Modified:
    incubator/accumulo/branches/1.4/src/assemble/dist.xml

Modified: incubator/accumulo/branches/1.4/src/assemble/dist.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/assemble/dist.xml?rev=1229357&r1=1229356&r2=1229357&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/assemble/dist.xml (original)
+++ incubator/accumulo/branches/1.4/src/assemble/dist.xml Mon Jan  9 21:21:16 2012
@@ -23,17 +23,45 @@
   <baseDirectory>accumulo-${project.version}</baseDirectory>
   <fileSets>
     <fileSet>
-      <directory>bin</directory>
+      <includes>
+        <include>bin/**</include>
+        <include>**/*.sh</include>
+        <include>**/*.pl</include>
+        <include>**/run.py</include>
+      </includes>
+      <excludes>
+        <exclude>conf/*.sh</exclude>
+      </excludes>
       <fileMode>0755</fileMode>
       <directoryMode>0755</directoryMode>
     </fileSet>
     <fileSet>
-      <directory>logs</directory>
+      <includes>
+        <include>conf/*.example</include>
+        <include>conf/*_logger.xml</include>
+        <include>conf/log4j.properties</include>
+      </includes>
       <directoryMode>0700</directoryMode>
+      <fileMode>0600</fileMode>
     </fileSet>
     <fileSet>
-      <directory>walogs</directory>
+      <includes>
+        <include>logs/</include>
+      </includes>
       <directoryMode>0700</directoryMode>
+      <excludes>
+        <exclude>logs/**.**</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <includes>
+        <include>walogs/</include>
+      </includes>
+      <directoryMode>0700</directoryMode>
+      <excludes>
+        <exclude>walogs/.lock</exclude>
+        <exclude>walogs/**-**</exclude>
+      </excludes>
     </fileSet>
     <fileSet>
       <includes>
@@ -42,38 +70,30 @@
         <include>**/*.sh</include>
       </includes>
       <excludes>
-        <exclude>**/target*/**</exclude>
+        <exclude>**/target/**</exclude>
         <exclude>**/accumulo-env.sh</exclude>
         <exclude>**/continuous-env.sh</exclude>
+        <exclude>bin/**</exclude>
       </excludes>
       <fileMode>0755</fileMode>
     </fileSet>
     <fileSet>
-      <useDefaultExcludes>true</useDefaultExcludes>
+      <includes>
+        <include>[A-Z]*</include>
+        <include>contrib/**</include>
+        <include>docs/**</include>
+        <include>lib/**</include>
+        <include>src/**</include>
+        <include>test/**</include>
+      </includes>
       <excludes>
-        <!-- the following ignored because they were included above -->
-        <exclude>**/bin/**</exclude>
-        <exclude>**/*.sh</exclude>
-        <exclude>**/*.py</exclude>
-        <exclude>**/*.pl</exclude>
-
         <!-- the following directories ignored because they should not be in the tarball -->
         <exclude>**/.*/**</exclude>
-        <exclude>**/logs/**</exclude>
-        <exclude>**/walogs/**</exclude>
         <exclude>**/target*/**</exclude>
 
         <!-- the following files ignored because they should not be in the tarball -->
         <exclude>**/.*</exclude>
-        <exclude>**/accumulo-site.xml</exclude>
-        <exclude>**/accumulo-env.sh</exclude>
-        <exclude>**/accumulo-metrics.xml</exclude>
         <exclude>**/test-*</exclude>
-        <exclude>**/slaves</exclude>
-        <exclude>**/masters</exclude>
-        <exclude>**/monitor</exclude>
-        <exclude>**/tracers</exclude>
-        <exclude>**/gc</exclude>
         <exclude>**/walkers.txt</exclude>
         <exclude>**/ingesters.txt</exclude>
         <exclude>**/continuous-env.sh</exclude>
@@ -81,7 +101,10 @@
         <exclude>**/randomwalk/conf/logger.xml</exclude>
         <exclude>**/randomwalk/conf/randomwalk.conf</exclude>
         <exclude>**/randomwalk/conf/walkers</exclude>
-        <exclude>src/**/*.so</exclude>
+        <exclude>**/*.py</exclude>
+        <exclude>**/*.py</exclude>
+        <exclude>**/*.sh</exclude>
+        <exclude>bin/**</exclude>
       </excludes>
       <fileMode>0644</fileMode>
       <directoryMode>0755</directoryMode>