ehatcher 2003/01/18 17:32:11
Modified: . WHATSNEW
docs/manual dirtasks.html
src/main/org/apache/tools/ant DirectoryScanner.java
Log:
added .DS_Store to default excludes
Revision Changes Path
1.344 +2 -0 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- WHATSNEW 17 Jan 2003 12:30:43 -0000 1.343
+++ WHATSNEW 19 Jan 2003 01:32:10 -0000 1.344
@@ -98,6 +98,8 @@
Other changes:
--------------
+* **/.DS_Store has been added to the list of default pattern excludes.
+
* The filesetmanifest attribute of <jar> has been reenabled.
* The start and end tokens for <translate> may now be longer than a
1.16 +1 -0 jakarta-ant/docs/manual/dirtasks.html
Index: dirtasks.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/dirtasks.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dirtasks.html 9 Jul 2002 21:05:50 -0000 1.15
+++ dirtasks.html 19 Jan 2003 01:32:10 -0000 1.16
@@ -163,6 +163,7 @@
**/vssver.scc
**/.svn
**/.svn/**
+ **/.DS_Store
</pre>
<p>If you do not want these default excludes applied, you may disable them
with the
<code>defaultexcludes="no"</code> attribute.</p>
1.32 +13 -1
jakarta-ant/src/main/org/apache/tools/ant/DirectoryScanner.java
Index: DirectoryScanner.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- DirectoryScanner.java 4 Dec 2002 16:42:26 -0000 1.31
+++ DirectoryScanner.java 19 Jan 2003 01:32:11 -0000 1.32
@@ -157,19 +157,31 @@
* @see #addDefaultExcludes()
*/
protected static final String[] DEFAULTEXCLUDES = {
+ // Miscellaneous typical temporary files
"**/*~",
"**/#*#",
"**/.#*",
"**/%*%",
"**/._*",
+
+ // CVS
"**/CVS",
"**/CVS/**",
"**/.cvsignore",
+
+ // SCCS
"**/SCCS",
"**/SCCS/**",
+
+ // Visual SourceSafe
"**/vssver.scc",
+
+ // Subversion
"**/.svn",
- "**/.svn/**"
+ "**/.svn/**",
+
+ // Mac
+ "**/.DS_Store"
};
/** The base directory to be scanned. */
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
