Author: kkolinko Date: Tue Nov 22 12:01:39 2011 New Revision: 1204938 URL: http://svn.apache.org/viewvc?rev=1204938&view=rev Log: Align .gitignore and build.xml with svn:ignore values. Remove .gitignore from defaultexcludes where it is since Ant 1.8.2.
Notes: - The filename filtering in build.xml uses Ant filename selectors. This is to simplify include of jdbc-pool module while all other modules are excluded. See the following page for a reference: http://ant.apache.org/manual/Types/selectors.html - The values of svn:ignore can be displayed recursively with "svn propget svn:ignore -R" Modified: tomcat/trunk/.gitignore tomcat/trunk/build.xml Modified: tomcat/trunk/.gitignore URL: http://svn.apache.org/viewvc/tomcat/trunk/.gitignore?rev=1204938&r1=1204937&r2=1204938&view=diff ============================================================================== --- tomcat/trunk/.gitignore (original) +++ tomcat/trunk/.gitignore Tue Nov 22 12:01:39 2011 @@ -16,7 +16,19 @@ # ----------------------------------------------------------------------------- target output -build.properties -work logs +work +build.properties +mvn.properties +.classpath +.project +.settings *.iml +*.asc +*.tmp +maven-ant-tasks-*.jar +thumbs.db +Thumbs.db +bin/setenv.* +modules/jdbc-pool/bin +modules/jdbc-pool/includes Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1204938&r1=1204937&r2=1204938&view=diff ============================================================================== --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Tue Nov 22 12:01:39 2011 @@ -154,6 +154,13 @@ <property name="test.name" value="**/Test*.java"/> <property name="test.formatter" value="-Dorg.apache.juli.formatter=java.util.logging.SimpleFormatter"/> + <!-- Include .gitignore in src distributions. --> + <!-- .git and .gitignore are in defaultexcludes since Ant 1.8.2 --> + <defaultexcludes add="**/.git" /> + <defaultexcludes add="**/.git/**" /> + <defaultexcludes remove="**/.gitignore" /> + <!--<defaultexcludes echo="true" />--> + <!-- Classpaths --> <path id="compile.classpath"> <pathelement location="${jdt.jar}"/> @@ -1631,26 +1638,36 @@ Apache Tomcat ${version} native binaries <!-- Tomcat source --> <copy todir="${tomcat.dist}/src"> <fileset dir="${basedir}" defaultexcludes="true"> - <exclude name=".settings/**"/> - <exclude name=".classpath"/> - <exclude name=".project"/> - <exclude name="*.launch"/> - <exclude name="modules/**"/> - <exclude name="output/**"/> - <exclude name="build.properties"/> - <exclude name=".git/**"/> - </fileset> - </copy> - <!--jdbc-pool sources --> - <copy todir="${tomcat.dist}/src"> - <fileset dir="${basedir}" defaultexcludes="true"> - <include name="modules/jdbc-pool/LICENSE"/> - <include name="modules/jdbc-pool/NOTICE"/> - <include name="modules/jdbc-pool/src/**"/> - <include name="modules/jdbc-pool/build.*"/> - <include name="modules/jdbc-pool/doc/**"/> - <include name="modules/jdbc-pool/resources/**"/> - <include name="modules/jdbc-pool/pom.xml"/> + <not> + <or> + <filename name="**/.settings/**" /> + <filename name="**/.classpath"/> + <filename name="**/.project"/> + <filename name="**/output/**"/> + <filename name="**/target/**"/> + <filename name="**/build.properties"/> + <filename name="**/mvn.properties"/> + <filename name="**/*.iml" /> + <filename name="**/*.asc" /> + <filename name="**/*.tmp" /> + <filename name="**/maven-ant-tasks-*.jar" /> + <filename name="**/thumbs.db" /> + <filename name="**/Thumbs.db" /> + <filename name="*.launch"/> + <filename name="bin/setenv.*" /> + <filename name="logs/**" /> + <filename name="work/**" /> + <filename name="modules/jdbc-pool/bin/**" /> + <filename name="modules/jdbc-pool/includes/**" /> + <and> + <!-- exclude all modules except jdbc-pool --> + <filename name="modules/**" /> + <not> + <filename name="modules/jdbc-pool/**" /> + </not> + </and> + </or> + </not> </fileset> </copy> </target> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
