You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by ke...@apache.org on 2006/08/28 09:52:19 UTC

svn commit: r437589 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java

Author: kevj
Date: Mon Aug 28 00:52:18 2006
New Revision: 437589

URL: http://svn.apache.org/viewvc?rev=437589&view=rev
Log:
fixed AntVersionTest failures with Beta1 - this should fix the problem, let me know if it still breaks for you

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java?rev=437589&r1=437588&r2=437589&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java Mon Aug 28 00:52:18 2006
@@ -65,7 +65,7 @@
         p.init();
         String versionString = p.getProperty("ant.version");
         String v = versionString.substring(versionString.indexOf("Ant version")+12, 
-                versionString.indexOf("compiled on")-1);
+                versionString.indexOf("Ant version")+17);
         char[] cs = v.toCharArray();
         int end = cs.length;
         for (int i = cs.length; i > 0; i--) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Re: svn commit: r437589 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java

Posted by Antoine Levy-Lambert <an...@gmx.de>.
Hello Kev,

may be we can fill a String Buffer by hand with digits and dots until we find something else ?

Regards,

Antoine
-------- Original-Nachricht --------
Datum: Mon, 28 Aug 2006 21:02:42 +0700
Von: Kev Jackson <fo...@gmail.com>
An: "Ant Developers List" <de...@ant.apache.org>
Betreff: Re: svn commit: r437589 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java

> 
> On 28 Aug 2006, at 19:09, Antoine Levy-Lambert wrote:
> 
> > Hi,
> >
> > I am not very fond of this versionString.indexOf("Ant version") 
> > +17); either.
> > A regular expression looking for a string of digits and dots would  
> > be what we are looking for ?
> 
> Unfortunately regexps aren't available in Java 1.2[1], do you have  
> another suggestion for avoiding the brittle indexOf method?
> 
> I'm happy to work on this to fix it, or if you are still unhappy,  
> pull it from the release - your call.
> 
> Thanks
> Kev
> 
> [1] http://marc.theaimsgroup.com/?l=ant-dev&m=114861730527898&w=2
> --
> "Government is begotten of aggression, by aggression" - Herbert Spencer
> 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Re: svn commit: r437589 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java

Posted by Kev Jackson <fo...@gmail.com>.
On 28 Aug 2006, at 19:09, Antoine Levy-Lambert wrote:

> Hi,
>
> I am not very fond of this versionString.indexOf("Ant version") 
> +17); either.
> A regular expression looking for a string of digits and dots would  
> be what we are looking for ?

Unfortunately regexps aren't available in Java 1.2[1], do you have  
another suggestion for avoiding the brittle indexOf method?

I'm happy to work on this to fix it, or if you are still unhappy,  
pull it from the release - your call.

Thanks
Kev

[1] http://marc.theaimsgroup.com/?l=ant-dev&m=114861730527898&w=2
--
"Government is begotten of aggression, by aggression" - Herbert Spencer


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Re: svn commit: r437589 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java

Posted by Antoine Levy-Lambert <an...@gmx.de>.
Hi,

I am not very fond of this versionString.indexOf("Ant version")+17);  
either.
A regular expression looking for a string of digits and dots would be  
what we are looking for ?

Antoine
On Aug 28, 2006, at 10:52 AM, kevj@apache.org wrote:

> Author: kevj
> Date: Mon Aug 28 00:52:18 2006
> New Revision: 437589
>
> URL: http://svn.apache.org/viewvc?rev=437589&view=rev
> Log:
> fixed AntVersionTest failures with Beta1 - this should fix the  
> problem, let me know if it still breaks for you
>
> Modified:
>     ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/ 
> AntVersion.java
>
> Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ 
> condition/AntVersion.java
> URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/ 
> apache/tools/ant/taskdefs/condition/AntVersion.java? 
> rev=437589&r1=437588&r2=437589&view=diff
> ====================================================================== 
> ========
> --- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/ 
> AntVersion.java (original)
> +++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/ 
> AntVersion.java Mon Aug 28 00:52:18 2006
> @@ -65,7 +65,7 @@
>          p.init();
>          String versionString = p.getProperty("ant.version");
>          String v = versionString.substring(versionString.indexOf 
> ("Ant version")+12,
> -                versionString.indexOf("compiled on")-1);
> +                versionString.indexOf("Ant version")+17);
>          char[] cs = v.toCharArray();
>          int end = cs.length;
>          for (int i = cs.length; i > 0; i--) {
>
>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org