harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Tim Ellison <t.p.elli...@gmail.com>
Subject Re: [build] Re: svn commit: r429702 - /incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
Date Wed, 09 Aug 2006 13:26:35 GMT
Alexei Zakharov wrote:
> Hi,
> 
> I am unable to build the luni module after this commit. Am I right
> that the command line svn client is now a requirement? Currently I use
> TortoiseSVN client, a graphical one.

It should not be a requirement - my goal was to make it optional (hence
the check for .svn as proposed on the list recently).  Let me tweak it
to deal with the exec failure too.

Regards,
Tim

> Thanks,
> 
> 2006/8/8, tellison@apache.org <tellison@apache.org>:
>> Author: tellison
>> Date: Tue Aug  8 08:58:47 2006
>> New Revision: 429702
>>
>> URL: http://svn.apache.org/viewvc?rev=429702&view=rev
>> Log:
>> Storing build revision info in the JAR file.
>>
>> 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/modules/luni/build.xml?rev=429702&r1=429701&r2=429702&view=diff
>>
>> ==============================================================================
>>
>> --- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
>> (original)
>> +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
>> Tue Aug  8 08:58:47 2006
>> @@ -267,10 +267,39 @@
>>         </javac>
>>     </target>
>>
>> -    <target name="build.jar">
>> +    <target name="-svn-detect">
>> +      <available file=".svn" type="dir" property="svn.available"/>
>> +    </target>
>> +
>> +    <target name="-svn-prop" depends="-svn-detect" if="svn.available">
>> +        <exec executable="svn">
>> +            <arg value="info" />
>> +            <redirector outputproperty="svn.info">
>> +                <outputfilterchain>
>> +                    <linecontainsregexp>
>> +                        <regexp pattern="Repository Root:|Revision:" />
>> +                    </linecontainsregexp>
>> +                    <tokenfilter>
>> +                        <replacestring from="Repository Root: " to=""/>
>> +                        <replacestring from="Revision: " to=" "/>
>> +                    </tokenfilter>
>> +                    <striplinebreaks/>
>> +                </outputfilterchain>
>> +            </redirector>
>> +        </exec>
>> +    </target>
>> +
>> +    <target name="-nosvn-prop" depends="-svn-detect"
>> unless="svn.available">
>> +        <property name="svn.info" value ="Unknown"/>
>> +    </target>
>> +
>> +    <target name="build.jar" depends="-svn-prop, -nosvn-prop">
>>         <jar destfile="${hy.jdk}/jre/lib/boot/luni.jar"
>>              manifest="${hy.luni}/META-INF/MANIFEST.MF">
>>             <fileset refid="classes" />
>> +            <manifest>
>> +                <attribute name="Implementation-Version"
>> value="${svn.info}"/>
>> +            </manifest>
>>         </jar>
>>     </target>
>>
>>
>>
>>
> 
> 

-- 

Tim Ellison (t.p.ellison@gmail.com)
IBM Java technology centre, UK.

---------------------------------------------------------------------
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