harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mark Hindess <mark.hind...@googlemail.com>
Subject Re: svn commit: r430050 - /incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
Date Wed, 09 Aug 2006 14:16:08 GMT

On 9 August 2006 at 13:33, tellison@apache.org 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/trunk/m
> odules/luni/build.xml?rev=430050&r1=430049&r2=430050&view=diff
> =============================================================================
> =
> --- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (origina
> l)
> +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Wed Aug 
>  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: harmony-dev-unsubscribe@incubator.apache.org
For additional commands, e-mail: harmony-dev-help@incubator.apache.org


Mime
View raw message