On 9 August 2006 at 15:53, Tim Ellison <[EMAIL PROTECTED]> wrote: > > Just saw your note after committing a further tweak. > > I thought the same thing, but did it in a slightly different way. We > could play like this for hours :-)
I tried something like the way you did it first... but... that ends up with "svn.info" set to "svn: '.' is not a working copy" for the case where 'svn' executable is available but .svn is not. -Mark. > Hopefully this fixes it for Alexei. If it doesn't cause more havoc I'll > promote it to make/property.xml and apply it to all modules. > > Regards, > Tim > > Mark Hindess wrote: > > On 9 August 2006 at 13:33, [EMAIL PROTECTED] wrote: > >> Author: tellison > >> Date: Wed Aug 9 06:33:00 2006 > >> New Revision: 430050 > >> > >> URL: http://svn.apache.org/viewvc?rev=430050&view=rev > >> Log: > >> Don't stop building if svn info is unavailable. > >> > >> Modified: > >> incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml > >> > >> Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml > >> URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trun > k/m > >> odules/luni/build.xml?rev=430050&r1=430049&r2=430050&view=diff > >> ========================================================================== > === > >> = > >> --- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (orig > ina > >> l) > >> +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Wed A > ug > >> 9 06:33:00 2006 > >> @@ -272,7 +272,7 @@ > >> </target> > >> > >> <target name="-svn-prop" depends="-svn-detect" if="svn.available"> > >> - <exec executable="svn"> > >> + <exec executable="svn" failifexecutionfails="false"> > >> <arg value="info" /> > >> <redirector outputproperty="svn.info"> > >> <outputfilterchain> > >> > > > > Now you've changed this I wonder if we need the svn-detect/svn.available > > check at all? We might just do: > > > > <target name="-svn-prop"> > > <exec executable="svn" failifexecutionfails="false" > > resultproperty="svn.res" > > > <arg value="info" /> > > <redirector outputproperty="svn.info.tmp"> > > <outputfilterchain> > > <linecontainsregexp> > > <regexp pattern="Repository Root:|Revision:" /> > > </linecontainsregexp> > > <tokenfilter> > > <replacestring from="Repository Root: " to=""/> > > <replacestring from="Revision: " to=" "/> > > </tokenfilter> > > <striplinebreaks/> > > </outputfilterchain> > > </redirector> > > </exec> > > <condition property="svn.info" value="${svn.info.tmp}" > > > <equals arg1="${svn.res}" arg2="0" /> > > </condition> > > <property name="svn.info" value="Unknown" /> > > </target> > > > > This sets it to Unknown even in the case of .svn being there and the > > executable being missing. > > > > Incidentally, my "svn info" doesn't have a "Repository Root:" line? > > > > Regards, > > Mark. > > > > > > > > --------------------------------------------------------------------- > > Terms of use : http://incubator.apache.org/harmony/mailing.html > > To unsubscribe, e-mail: [EMAIL PROTECTED] > > For additional commands, e-mail: [EMAIL PROTECTED] > > > > > > -- > > Tim Ellison ([EMAIL PROTECTED]) > IBM Java technology centre, UK. > > --------------------------------------------------------------------- > Terms of use : http://incubator.apache.org/harmony/mailing.html > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] --------------------------------------------------------------------- Terms of use : http://incubator.apache.org/harmony/mailing.html To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
