You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2016/12/06 16:06:13 UTC
[1/4] ant git commit: corrected comments
Repository: ant
Updated Branches:
refs/heads/master ceb531572 -> aa57218c6
corrected comments
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/0d1928a5
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/0d1928a5
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/0d1928a5
Branch: refs/heads/master
Commit: 0d1928a584368ec7c51f0fd1c0dc77b7fe7b8251
Parents: 61e1ccc
Author: Jeffrey Adamson <jw...@us.ibm.com>
Authored: Fri Oct 28 11:29:32 2016 -0400
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat Oct 29 06:28:51 2016 +0200
----------------------------------------------------------------------
src/script/ant | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/0d1928a5/src/script/ant
----------------------------------------------------------------------
diff --git a/src/script/ant b/src/script/ant
index 0f83e18..5d1d154 100644
--- a/src/script/ant
+++ b/src/script/ant
@@ -50,13 +50,13 @@ for arg in "$@" ; do
# wrap all arguments as "" strings, escape any internal back-slash, double-quote, $, or back-tick characters
# use printf to avoid echo interpretation behaviors such as escapes and line continuation
- # pad the value with leading/trailing X to protect whitespace
+ # pad the value with X to protect leading/trailing whitespace from subshell output trimming
esc_arg="X${arg}X"
case "$esc_tool" in
'sed')
# Mac bsd_sed does not support group-0, so pattern uses group-1
# Solaris sed only proceses lines with trailing newline, passing in an extra newline
- # sed will consume the trailing newline
+ # subshell assignment will trim the added trailing newline
esc_arg="$(printf '%s\n' "$esc_arg" | sed -e 's@\([$"\\`]\)@\\\1@g')"
;;
'awk')
[3/4] ant git commit: Bugzilla 58661: record fix by barney2k7
Posted by bo...@apache.org.
Bugzilla 58661: record fix by barney2k7
closes #27
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/8925f08b
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/8925f08b
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/8925f08b
Branch: refs/heads/master
Commit: 8925f08bea2210eeab0ec1a8e7aa631d0a2d7c32
Parents: 9eef94a
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Dec 6 17:04:52 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Dec 6 17:04:52 2016 +0100
----------------------------------------------------------------------
WHATSNEW | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/8925f08b/WHATSNEW
----------------------------------------------------------------------
diff --git a/WHATSNEW b/WHATSNEW
index ae03903..b7537bd 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -56,6 +56,10 @@ Fixed bugs:
command line.
Bugzilla Report 60150, 59445
+ * The report generated by <junitreport> could contain duplicate
+ characters in stack traces.
+ Bugzilla Report 58661
+
Other changes:
--------------
[2/4] ant git commit: Bug 58661: avoid duplicate characters in stack
traces
Posted by bo...@apache.org.
Bug 58661: avoid duplicate characters in stack traces
The problem was that $secondhalflen is actually less than
string-length($secondhalfword) in case the number of chars in word is
even. This leads to $firsthalflen being calculated too long, resulting
in a duplicated character.
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/9eef94a6
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/9eef94a6
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/9eef94a6
Branch: refs/heads/master
Commit: 9eef94a6fc053ee01028fe439149b4a2c4f2fb89
Parents: 0d1928a
Author: barney2k7 <ba...@gmail.com>
Authored: Tue Dec 6 15:25:41 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Dec 6 17:04:34 2016 +0100
----------------------------------------------------------------------
src/etc/junit-frames.xsl | 6 +++---
src/etc/junit-noframes.xsl | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/9eef94a6/src/etc/junit-frames.xsl
----------------------------------------------------------------------
diff --git a/src/etc/junit-frames.xsl b/src/etc/junit-frames.xsl
index afea6e0..624fd69 100644
--- a/src/etc/junit-frames.xsl
+++ b/src/etc/junit-frames.xsl
@@ -930,13 +930,13 @@ h6 {
<xsl:template name="br-replace">
<xsl:param name="word"/>
<xsl:param name="splitlimit">32</xsl:param>
- <xsl:variable name="secondhalflen" select="(string-length($word)+(string-length($word) mod 2)) div 2"/>
- <xsl:variable name="secondhalfword" select="substring($word, $secondhalflen)"/>
+ <xsl:variable name="secondhalfstartindex" select="(string-length($word)+(string-length($word) mod 2)) div 2"/>
+ <xsl:variable name="secondhalfword" select="substring($word, $secondhalfstartindex)"/>
<!-- When word is very big, a recursive replace is very heap/stack expensive, so subdivide on line break after middle of string -->
<xsl:choose>
<xsl:when test="(string-length($word) > $splitlimit) and (contains($secondhalfword, '
'))">
<xsl:variable name="secondhalfend" select="substring-after($secondhalfword, '
')"/>
- <xsl:variable name="firsthalflen" select="string-length($word) - $secondhalflen"/>
+ <xsl:variable name="firsthalflen" select="string-length($word) - string-length($secondhalfword)"/>
<xsl:variable name="firsthalfword" select="substring($word, 1, $firsthalflen)"/>
<xsl:variable name="firsthalfend" select="substring-before($secondhalfword, '
')"/>
<xsl:call-template name="br-replace">
http://git-wip-us.apache.org/repos/asf/ant/blob/9eef94a6/src/etc/junit-noframes.xsl
----------------------------------------------------------------------
diff --git a/src/etc/junit-noframes.xsl b/src/etc/junit-noframes.xsl
index bd7002a..fa3ac3e 100644
--- a/src/etc/junit-noframes.xsl
+++ b/src/etc/junit-noframes.xsl
@@ -470,13 +470,13 @@
<xsl:template name="br-replace">
<xsl:param name="word"/>
<xsl:param name="splitlimit">32</xsl:param>
- <xsl:variable name="secondhalflen" select="(string-length($word)+(string-length($word) mod 2)) div 2"/>
- <xsl:variable name="secondhalfword" select="substring($word, $secondhalflen)"/>
+ <xsl:variable name="secondhalfstartindex" select="(string-length($word)+(string-length($word) mod 2)) div 2"/>
+ <xsl:variable name="secondhalfword" select="substring($word, $secondhalfstartindex)"/>
<!-- When word is very big, a recursive replace is very heap/stack expensive, so subdivide on line break after middle of string -->
<xsl:choose>
<xsl:when test="(string-length($word) > $splitlimit) and (contains($secondhalfword, '
'))">
<xsl:variable name="secondhalfend" select="substring-after($secondhalfword, '
')"/>
- <xsl:variable name="firsthalflen" select="string-length($word) - $secondhalflen"/>
+ <xsl:variable name="firsthalflen" select="string-length($word) - string-length($secondhalfword)"/>
<xsl:variable name="firsthalfword" select="substring($word, 1, $firsthalflen)"/>
<xsl:variable name="firsthalfend" select="substring-before($secondhalfword, '
')"/>
<xsl:call-template name="br-replace">
[4/4] ant git commit: Merge branch '1.9.x'
Posted by bo...@apache.org.
Merge branch '1.9.x'
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/aa57218c
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/aa57218c
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/aa57218c
Branch: refs/heads/master
Commit: aa57218c645ffcd10465c719f5669c50020a5b10
Parents: ceb5315 8925f08
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Dec 6 17:05:47 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Dec 6 17:05:47 2016 +0100
----------------------------------------------------------------------
WHATSNEW | 4 ++++
src/etc/junit-frames.xsl | 6 +++---
src/etc/junit-noframes.xsl | 6 +++---
3 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/aa57218c/WHATSNEW
----------------------------------------------------------------------