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: r549600 - /harmony/enhanced/trunk/build.xml
Date Fri, 22 Jun 2007 07:48:18 GMT

On 22 June 2007 at 11:31, "Stepan Mishura" <stepan.mishura@gmail.com> wrote:
> Hi Mark,
> 
> After:
> - <property name="harmony.version" value="r${svn.revision}" />
> + <property name="harmony.version" value="${svn.revision}" />
> 
> I have to update scripts for snapshots that rely on 'r' char.(Sure, I
> can update scripts but I'd like to ask first ;-))

You can add the r back in to the snapshot names.  I'm trying to get
source snapshots working and having the 'r' meant I was getting two 'r'
characters in the java -version message.

It seemed easier to fix in the federation build.xml but clearly I
missed something.

Incidentally, it would be good if people can test the resulting
artifacts from 'ant bundle_src' in the federation build.  We really
should produce source builds for our milestone snapshots - I'd argue
that we should actually use the source builds to build our snapshots
since that would seem more in keeping with the apache way.  At least
that is my interpretation of the the comments about binaries in the
release requirements.

> What was the reason for the change? I couldn't find where in
> classlib/drlvm svn.revision is used.

It gets written to release.properties in the source snapshots so
that the svn revision is known when that is built.  All of the
build_* targets for classlib/drlvm should then use it unless I
missed something in the commit.

Regards,
 Mark.

> -----Original Message-----
> From: hindessm@apache.org [mailto:hindessm@apache.org]
> Sent: Friday, June 22, 2007 3:31 AM
> To: commits@harmony.apache.org
> Subject: svn commit: r549600 - /harmony/enhanced/trunk/build.xml
> 
> Author: hindessm
> Date: Thu Jun 21 13:30:32 2007
> New Revision: 549600
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=549600
> Log:
> Fixing source packaging.
> 
> Modified:
>     harmony/enhanced/trunk/build.xml
> 
> Modified: harmony/enhanced/trunk/build.xml
> URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?view=diff&
> rev=549600&r1=549599&r2=549600
> =============================================================================
> =
> --- harmony/enhanced/trunk/build.xml (original)
> +++ harmony/enhanced/trunk/build.xml Thu Jun 21 13:30:32 2007
> @@ -319,18 +319,24 @@
>      <target name="build_classlib" depends="auto_fetch_classlib_libs">
>          <ant antfile="working_classlib/build.xml" target="rebuild"
> inheritAll="false" >
>              <property name="hy.cfg" value="${hy.cfg}"/>
> +            <property name="svn.info" value="${harmony.long.version}"/>
> +            <property name="svn.version" value="${harmony.version}"/>
>          </ant>
>      </target>
> 
>      <target name="auto_fetch_classlib_libs" if="auto.fetch">
>          <ant target="fetch_classlib_libs">
>              <property name="hy.cfg" value="${hy.cfg}"/>
> +            <property name="svn.info" value="${harmony.long.version}"/>
> +            <property name="svn.version" value="${harmony.version}"/>
>          </ant>
>      </target>
> 
>      <target name="fetch_classlib_libs">
>          <ant antfile="working_classlib/build.xml"
> target="fetch-depends" inheritall="false" >
>              <property name="hy.cfg" value="${hy.cfg}"/>
> +            <property name="svn.info" value="${harmony.long.version}"/>
> +            <property name="svn.version" value="${harmony.version}"/>
>          </ant>
>      </target>
> 
> @@ -366,6 +372,7 @@
>          <exec executable="sh" dir="working_vm/build" failonerror="true">
>              <arg line="build.sh
> -Dexternal.dep.CLASSLIB.loc=${drlvm.classlib.offset}"/>
>              <arg line="-Ddeploy.canonical.flag=true"/>
> +            <arg line="-Dsvn.revision=${harmony.version}" />
>              <env key="BUILD_CFG" value="${hy.cfg}"/>
>          </exec>
>      </target>
> @@ -405,6 +412,8 @@
>      <target name="build_commonresources">
>          <ant antfile="common_resources/build.xml"
> target="fetch-depends" inheritall="false" >
>              <property name="hy.cfg" value="${hy.cfg}"/>
> +            <property name="svn.info" value="${harmony.long.version}"/>
> +            <property name="svn.version" value="${harmony.version}"/>
>          </ant>
>      </target>
> 
> @@ -414,6 +423,8 @@
>      <target name="build_jdktools" depends="auto_fetch_jdktools_libs">
>          <ant antfile="working_jdktools/build.xml" target="rebuild"
> inheritall="false" >
>              <property name="hy.cfg" value="${hy.cfg}"/>
> +            <property name="svn.info" value="${harmony.long.version}"/>
> +            <property name="svn.version" value="${harmony.version}"/>
>          </ant>
>      </target>
> 
> @@ -658,7 +669,33 @@
>              <equals arg1="${svn.rc}" arg2="0" />
>          </condition>
>          <property name="svn.revision" value="unknown" />
> - <property name="harmony.version" value="r${svn.revision}" />
> + <property name="harmony.version" value="${svn.revision}" />
> +
> +        <exec executable="svn"
> +              failifexecutionfails="false"
> +              resultproperty="svn.rc">
> +            <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.rc}" arg2="0" />
> +        </condition>
> +        <tstamp>
> +            <format property="svn.info"
> +                    pattern="'Unknown revision at' dd-MMM-yyyy hh:mm aa"/>
> +        </tstamp>
> + <property name="harmony.long.version" value="${svn.info}" />
>      </target>
> 
>      <target name="bundle_src"
> @@ -701,6 +738,7 @@
>          </exec>
>          <echo file="target/src/release.properties">
> harmony.version=${harmony.version}
> +harmony.long.version=${harmony.long.version}
> harmony.deploy.suffix=${harmony.deploy.suffix}
>          </echo>
>      </target>
> 
> 
> -- 
> Stepan Mishura
> Intel Enterprise Solutions Software Division
> 



Mime
View raw message