17 Commits

Author SHA1 Message Date
Stefan Bodewig
ee260aac02 Indicate default for update attribute, Bug 18949
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274433 13f79535-47bb-0310-9956-ffa450edef68
2003-04-11 13:31:18 +00:00
Stefan Bodewig
c89a66172d Preparing merge to 1.5 branch
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274134 13f79535-47bb-0310-9956-ffa450edef68
2003-02-19 07:57:30 +00:00
Stefan Bodewig
afa2b7af9e 2003
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273988 13f79535-47bb-0310-9956-ffa450edef68
2003-02-05 11:20:21 +00:00
Stefan Bodewig
3255fa8ff4 Add support for Unix permissions to <zip> and friends, doing it the
Info-Zip way.

PR: 6492


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273629 13f79535-47bb-0310-9956-ffa450edef68
2002-12-09 12:40:38 +00:00
Magesh Umasankar
6bd8d6e938 Merge changes made to 1.5 Beta2.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272967 13f79535-47bb-0310-9956-ffa450edef68
2002-06-22 23:38:38 +00:00
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
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
e967d77e02 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@271131 13f79535-47bb-0310-9956-ffa450edef68
2002-02-03 22:00:42 +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
Steve Loughran
5d79a4f5eb Addition of destFile(File) attr to the zip/war/ear/jar tasks, fixup of docs, replacement of deprecation methods and appropriate changes to the tests.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270605 13f79535-47bb-0310-9956-ffa450edef68
2002-01-07 06:22:11 +00:00
Stefan Bodewig
93ee07ad35 Show that Ant is an Apache project.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269839 13f79535-47bb-0310-9956-ffa450edef68
2001-10-30 10:05:39 +00:00
Peter Donald
16e0c28649 Unify the attribute of the archive to "file" rather than having three separate attributes (zipfile, jarfile and warfile).
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269684 13f79535-47bb-0310-9956-ffa450edef68
2001-09-12 14:21:43 +00:00
Nico Seessle
c6124454ff - Applied manual patches supplied by Daniel Martin <dtmartin24@home.com>
- Fixed some other places too.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269675 13f79535-47bb-0310-9956-ffa450edef68
2001-09-08 01:05:18 +00:00
Conor MacNeill
a8d4391240 Merge from 1.4 changes
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269662 13f79535-47bb-0310-9956-ffa450edef68
2001-08-30 13:23:14 +00:00
Stefan Bodewig
e5fcb12320 New filesonly attribute for <zip> and friends - suppresses directories.
PR: 2053
Submitted by:	Peter Janes <peterj@liberate.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269324 13f79535-47bb-0310-9956-ffa450edef68
2001-07-12 07:36:50 +00:00
Stefan Bodewig
fc7cfffc89 Add encoding attribute to the zip tasks and the ZipOutputStream to
make the classes flexible enough to deal with non US-ASCII filenames
either consistent with the command line ZIP tools (it has been since
it uses the org.apache classes instead of java.util.zip) or the jar
command (which it has been up to Ant 1.3).


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269272 13f79535-47bb-0310-9956-ffa450edef68
2001-07-05 13:10:26 +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