git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273829 13f79535-47bb-0310-9956-ffa450edef68master
@@ -98,6 +98,8 @@ Fixed bugs: | |||||
Other changes: | Other changes: | ||||
-------------- | -------------- | ||||
* **/.DS_Store has been added to the list of default pattern excludes. | |||||
* The filesetmanifest attribute of <jar> has been reenabled. | * The filesetmanifest attribute of <jar> has been reenabled. | ||||
* The start and end tokens for <translate> may now be longer than a | * The start and end tokens for <translate> may now be longer than a | ||||
@@ -163,6 +163,7 @@ They are:</p> | |||||
**/vssver.scc | **/vssver.scc | ||||
**/.svn | **/.svn | ||||
**/.svn/** | **/.svn/** | ||||
**/.DS_Store | |||||
</pre> | </pre> | ||||
<p>If you do not want these default excludes applied, you may disable them with the | <p>If you do not want these default excludes applied, you may disable them with the | ||||
<code>defaultexcludes="no"</code> attribute.</p> | <code>defaultexcludes="no"</code> attribute.</p> | ||||
@@ -157,19 +157,31 @@ public class DirectoryScanner implements FileScanner, SelectorScanner { | |||||
* @see #addDefaultExcludes() | * @see #addDefaultExcludes() | ||||
*/ | */ | ||||
protected static final String[] DEFAULTEXCLUDES = { | protected static final String[] DEFAULTEXCLUDES = { | ||||
// Miscellaneous typical temporary files | |||||
"**/*~", | "**/*~", | ||||
"**/#*#", | "**/#*#", | ||||
"**/.#*", | "**/.#*", | ||||
"**/%*%", | "**/%*%", | ||||
"**/._*", | "**/._*", | ||||
// CVS | |||||
"**/CVS", | "**/CVS", | ||||
"**/CVS/**", | "**/CVS/**", | ||||
"**/.cvsignore", | "**/.cvsignore", | ||||
// SCCS | |||||
"**/SCCS", | "**/SCCS", | ||||
"**/SCCS/**", | "**/SCCS/**", | ||||
// Visual SourceSafe | |||||
"**/vssver.scc", | "**/vssver.scc", | ||||
// Subversion | |||||
"**/.svn", | "**/.svn", | ||||
"**/.svn/**" | |||||
"**/.svn/**", | |||||
// Mac | |||||
"**/.DS_Store" | |||||
}; | }; | ||||
/** The base directory to be scanned. */ | /** The base directory to be scanned. */ | ||||