6 Commits

Author SHA1 Message Date
Magesh Umasankar
ca91f8cb7e Merge changes made to 1.5 Beta1.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272826 13f79535-47bb-0310-9956-ffa450edef68
2002-06-01 12:26:43 +00:00
Stefan Bodewig
83b9942620 The always entertaining 2002 patch of the morning.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271720 13f79535-47bb-0310-9956-ffa450edef68
2002-03-04 08:49:35 +00:00
Magesh Umasankar
4ab1950bd8 Zip task
duplicate (attribute): behavior when a duplicate file is found.  Valid values are add, preserve, and fail. The default value is add.

zipgroupfileset (nested fileset): allows for multiple zip files to be merged into the archive. Each file found in this fileset is added to the archive the same way that "zipfileset src" files are added.


Jar task

duplicate/zipgroupfileset: same as in Zip task

filesetmanifest (attribute): behavior when a Manifest is found in a zipfileset or zipgroupfileset file is found.  Valid values are skip, merge, and mergewithoutmain.  mergewill merge all of manifests together, and merge this into any other specified manifests  mergewithoutmain merges everything but the Main section of the manifests.  Default value is skip

manifest (existing attribute): this attribute now also accepts the name of a jar added through a fileset.  If its the name of an added jar, the task expects the manifest to be in the jar at META-INF/Manifest.mf

Submitted by: Brian Deitte <bdeitte@macromedia.com>

PR: 5667, 5036


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271698 13f79535-47bb-0310-9956-ffa450edef68
2002-03-03 06:52:07 +00:00
Stephane Bailliez
777b00eee6 Fix HTML title to be more useful for indexing.
PR: 5020
Reported By: jesse.glick@netbeans.com (Jesse Glick)


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271132 13f79535-47bb-0310-9956-ffa450edef68
2002-02-03 22:11:39 +00:00
Stefan Bodewig
b6a3e9df36 License police on documentation files:
(1) Make sure there is a Copyright notice on all visible files.

(2) Make sure all years in which the file has been modified are
listed.

(3) Make sure the format is consistent, i.e. separate consecutive
years with a dash, not a comma.

When Stephane changed starteam.html it has been 2001 in France but
2002 in Australia - does that mean we add 2002 to the Copyright line
or not?  ;-)


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270652 13f79535-47bb-0310-9956-ffa450edef68
2002-01-10 08:48:33 +00:00
Conor MacNeill
5337488612 Merge of 1.3 branch changes into the main branch
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268652 13f79535-47bb-0310-9956-ffa450edef68
2001-02-13 12:32:01 +00:00