[gccsdk] ELF vs AOF Desklib

John Tytgat John.Tytgat at aaug.net
Tue Feb 6 13:18:34 PST 2007


In message <20070206190018.GW13494 at chiark.greenend.org.uk>
          Theo Markettos <theo at markettos.org.uk> wrote:

> As Adam and I discovered on the 'Building Desklib' thread in csa.p, there
> are two branches of Desklib: trunk/ for ELK and branches/aof/ for AOF.  The
> autobuilder is picking up the trunk version, which is fine if you're
> building ELF but not if you're using GCC 3.4.  Currently it doesn't build
> with GCC 3.4 unless you hack the setvars file to use the AOF branch.
> 
> What's the best design for the autobuilder to handle this?  I could imagine
> an AOF branch of the autobuilder SVN too, but that'd be somewhat annoying if
> there wasn't much difference between the two.  Would it be sensible to have
> an option to the autobuilder 'build' script, --elf or --aof or something,
> and pass that through to switch package build options?

There is indeed something missing in the autobuilder to support for a
limited period the, currently experimental, ELF build and AOF build together
at the same time.

There is already a variable AB_ELFBUILD (set or not set to "yes") to make
some difference in the projects so that's good news but something more is
needed if you want to let this determine the value of AB_SVN as this
is simply grepped from the setvars file in fetch-program.

Maybe the introduction of AB_SVN_AOF for projects which are AOF only and
that this gets used when AB_ELFBUILD is not set to "yes", and in all other
cases continue using AB_SVN (for the SVN stored projects of course).
I've attached a not-tested (!) patch illustrating this.  Would this help ?

John.
-- 
John Tytgat, in his comfy chair at home                                 BASS
John.Tytgat at aaug.net                             ARM powered, RISC OS driven
-------------- next part --------------
Index: fetch-program
===================================================================
--- fetch-program	(revision 2542)
+++ fetch-program	(working copy)
@@ -3,7 +3,11 @@
 AB_CVS_ROOT=$(grep AB_CVS_ROOT $AB_HOME/$AB_PACKAGEDIR/setvars | cut -d = -f 2)
 AB_CVS_MODULE=$(grep AB_CVS_MODULE $AB_HOME/$AB_PACKAGEDIR/setvars | cut -d = -f 2)
 AB_CVS_TAGORBRANCH=$(grep AB_CVS_TAGORBRANCH $AB_HOME/$AB_PACKAGEDIR/setvars | cut -d = -f 2)
-AB_SVN=$(grep AB_SVN $AB_HOME/$AB_PACKAGEDIR/setvars | cut -d = -f 2)
+if [ "$AB_ELFBUILD" == "yes" ] ; then
+  AB_SVN=$(grep AB_SVN $AB_HOME/$AB_PACKAGEDIR/setvars | cut -d = -f 2)
+else
+  AB_SVN=$(grep AB_SVN_AOF $AB_HOME/$AB_PACKAGEDIR/setvars | cut -d = -f 2)
+fi
 AB_URL=$(grep AB_URL $AB_HOME/$AB_PACKAGEDIR/setvars | cut -d = -f 2)
 AB_NOREMOTE=$(grep AB_NOREMOTE $AB_HOME/$AB_PACKAGEDIR/setvars | cut -d = -f 2)

Index: libraries/riscos/desklib/setvars
===================================================================
--- libraries/riscos/desklib/setvars	(revision 2542)
+++ libraries/riscos/desklib/setvars	(working copy)
@@ -1,4 +1,5 @@
 AB_SVN=svn://svn.riscos.info/DeskLib/trunk/
+AB_SVN_AOF=svn://svn.riscos.info/DeskLib/branches/aof/
 AB_ZIPNAME=desklib-svn-$(date +%Y%m%d)

 AB_INSTALL=yes


More information about the gcc mailing list