harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Stepan Mishura" <stepan.mish...@gmail.com>
Subject Re: svn commit: r614507 - /harmony/enhanced/trunk/build.xml
Date Wed, 23 Jan 2008 17:47:06 GMT
No problems
I also had an itch to fix all those inconsistencies with dependency
management and so on. If you have more changes so please go forward
with them.

FYI, I made additional fix at r614567. The problem was if 'ant' task
is invoked in next way:
<ant ... >
...
  <property name="use.libstdc++6" value="${use.libstdc++6}"/>
</ant>

Then it assigns to property 'use.libstdc++6' value
'${use.libstdc++6}'. (i.e. it becomes defined). I committed the
workaround to fix Windows build.

Thanks,
Stepan.

On 1/23/08, Mark Hindess <mark.hindess@googlemail.com> wrote:
>
> Thanks Stepan.
> -Mark.
>
> On 23 January 2008 at 11:56, smishura@apache.org wrote:
> > Author: smishura
> > Date: Wed Jan 23 03:56:49 2008
> > New Revision: 614507
> >
> > URL: http://svn.apache.org/viewvc?rev=614507&view=rev
> > Log:
> > Quick fix for commit r614462. After it the build fails on Linux with error:
> > line 299: -Duse.libstdc++6=${use.libstdc++6}: bad substitution
> >
> > Modified:
> >     harmony/enhanced/trunk/build.xml
> >
> > Modified: harmony/enhanced/trunk/build.xml
> > URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?rev=614507
> > &r1=614506&r2=614507&view=diff
> > =============================================================================
> > =
> > --- harmony/enhanced/trunk/build.xml (original)
> > +++ harmony/enhanced/trunk/build.xml Wed Jan 23 03:56:49 2008
> > @@ -408,13 +408,20 @@
> >      </target>
> >
> >      <target name="build_vm_unix_build" depends="init" if="is.unix">
> > +
> > +        <condition property="use.libstdc++6.argline"
> > +                   value="-Duse.libstdc++6=${use.libstdc++6}"
> > +                   else="">
> > +            <isset property="use.libstdc++6" />
> > +        </condition>
> > +
> >          <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}" />
> >              <arg line="-Dhy.no.sig=${hy.no.sig}"/>
> >              <arg line="-Dhy.local.zlib=${hy.local.zlib}"/>
> > -            <arg line="-Duse.libstdc++6=${use.libstdc++6}"/>
> > +            <arg line="${use.libstdc++6.argline}"/>
> >              <arg line="${custom.props}"/>
> >              <env key="BUILD_CFG" value="${hy.cfg}"/>
> >          </exec>
> >
>
>
>

Mime
View raw message