You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jh...@apache.org on 2015/02/23 09:52:33 UTC
[1/3] ant git commit: typo
Repository: ant
Updated Branches:
refs/heads/master da83de920 -> 32062cc59
typo
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/c848f9a5
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c848f9a5
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c848f9a5
Branch: refs/heads/master
Commit: c848f9a5760794e05c3594b284f975c649b8c168
Parents: da83de9
Author: Jan Matèrne <jh...@apache.org>
Authored: Mon Feb 23 08:38:11 2015 +0100
Committer: Jan Matèrne <jh...@apache.org>
Committed: Mon Feb 23 08:38:11 2015 +0100
----------------------------------------------------------------------
manual/Types/multirootfileset.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/c848f9a5/manual/Types/multirootfileset.html
----------------------------------------------------------------------
diff --git a/manual/Types/multirootfileset.html b/manual/Types/multirootfileset.html
index e11beb2..29a4f54 100644
--- a/manual/Types/multirootfileset.html
+++ b/manual/Types/multirootfileset.html
@@ -19,7 +19,7 @@
<head>
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
-<title>MultiRooFileSet Type</title>
+<title>MultiRootFileSet Type</title>
</head>
<body>
@@ -29,7 +29,7 @@
<p><em>Since Ant 1.9.4</em></p>
<p>A MultiRootFileSet is a group of files or directories. These files
-or drectories can be found in a directory forrest starting with a set
+or directories can be found in a directory forrest starting with a set
of base directories and are matched by patterns taken from a number of
<a href="patternset.html">PatternSets</a> and <a
href="selectors.html">Selectors</a>.</p>
[2/3] ant git commit: Example derived from the example in the java
source.
Posted by jh...@apache.org.
Example derived from the example in the java source.
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/931c004a
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/931c004a
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/931c004a
Branch: refs/heads/master
Commit: 931c004a55f64359322e47d10e1b66718ccca731
Parents: c848f9a
Author: Jan Matèrne <jh...@apache.org>
Authored: Mon Feb 23 08:54:52 2015 +0100
Committer: Jan Matèrne <jh...@apache.org>
Committed: Mon Feb 23 08:54:52 2015 +0100
----------------------------------------------------------------------
manual/Tasks/propertyfile.html | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/931c004a/manual/Tasks/propertyfile.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/propertyfile.html b/manual/Tasks/propertyfile.html
index 7450c0a..e4030f8 100644
--- a/manual/Tasks/propertyfile.html
+++ b/manual/Tasks/propertyfile.html
@@ -228,5 +228,22 @@ Concatenation of strings :</p>
<p>Each time called, a "." will be appended to "progress"
</p>
+<p>Pumps the project version to the next minor version (increase minor and set path=0):
+<blockquote><pre><target name="nextMinorVersion">
+ <property
+ name="header"
+ value="##Generated file - do not modify!"/>
+ <propertyfile file="version.properties" comment="${header}">
+ <entry key="product.build.major" type="int" value="3" />
+ <entry key="product.build.minor" type="int" operation="+" />
+ <entry key="product.build.patch" type="int" value="0" />
+ <entry key="product.build.date" type="date" value="now" />
+ </propertyfile>
+</target>
+</pre></blockquote>
+After running this target the version changed e.g. from 3.2.2 to 3.3.0.
+</p>
+
+
</body>
</html>
[3/3] ant git commit: Precise the manual: uses AND for
combining nested resource selectors
Posted by jh...@apache.org.
Precise the manual: <restrict> uses AND for combining nested resource selectors
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/32062cc5
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/32062cc5
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/32062cc5
Branch: refs/heads/master
Commit: 32062cc59c08a47eeaa6d3ab5b323ece50eedfc4
Parents: 931c004
Author: Jan Matèrne <jh...@apache.org>
Authored: Mon Feb 23 09:00:44 2015 +0100
Committer: Jan Matèrne <jh...@apache.org>
Committed: Mon Feb 23 09:00:44 2015 +0100
----------------------------------------------------------------------
manual/Types/resources.html | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/32062cc5/manual/Types/resources.html
----------------------------------------------------------------------
diff --git a/manual/Types/resources.html b/manual/Types/resources.html
index 1c39856..061168f 100644
--- a/manual/Types/resources.html
+++ b/manual/Types/resources.html
@@ -499,8 +499,9 @@ platforms.
<h4>Parameters specified as nested elements</h4>
<p>A single resource collection is required.</p>
<p>Nested resource selectors are used to "narrow down" the included
- resources. These are patterned after <a href="selectors.html">file
- selectors</a> but are, unsurprisingly, targeted to resources.
+ resources, combined via a logical <i>AND</i>. These are patterned
+ after <a href="selectors.html">file selectors</a> but are,
+ unsurprisingly, targeted to resources.
Several built-in resource selectors are available in the internal
<a href="antlib.html">antlib</a>
<code>org.apache.tools.ant.types.resources.selectors</code>: