You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/08/08 17:58:47 UTC
svn commit: r429702 -
/incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
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>
Re: [build] Re: svn commit: r429702 - /incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
Posted by Alexei Zakharov <al...@gmail.com>.
> (hence the check for .svn as proposed on the list recently)
Sorry, it seems I have missed that discussion.
Alexei
2006/8/9, Tim Ellison <t....@gmail.com>:
> 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 <te...@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
>
>
--
Alexei Zakharov,
Intel Middleware Product Division
---------------------------------------------------------------------
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
Re: [build] Re: svn commit: r429702 - /incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
Posted by Geir Magnusson Jr <ge...@pobox.com>.
Cute, btw :)
geir
Tim Ellison wrote:
> 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 <te...@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>
>>>
>>>
>>>
>>>
>>
>
---------------------------------------------------------------------
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
Re: [build] Re: svn commit: r429702 - /incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
Posted by Tim Ellison <t....@gmail.com>.
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 <te...@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
[build] Re: svn commit: r429702 - /incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
Posted by Alexei Zakharov <al...@gmail.com>.
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.
Thanks,
2006/8/8, tellison@apache.org <te...@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>
>
>
>
>
--
Alexei Zakharov,
Intel Middleware Product Division
---------------------------------------------------------------------
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