Hi Theo Thanks for sorting that out. I've managed to successfully cross-compile DeskLib via the autobuilder with the attached patch. It currently requires some changes in the autobuilder branch in my fork, but once the relevant PR has been merged, the recipe can be changed to build from the upstream repository instead. I've also tried cloning DeskLib on RISC OS using SimpleGit, which seems to work but I've been unable to build natively because GCC can't locate the DeskLib headers for some reason.
Regards Cameron On Fri, 11 Mar 2022 at 23:54, Theo Markettos <t...@markettos.org.uk> wrote: > On Fri, Mar 11, 2022 at 09:48:38PM +0000, Cameron Cawley wrote: > > Hi > > > > I’ve noticed that the ccres subversion repository has recently been > > migrated to GitHub. Would the same thing be possible for DeskLib? I’d be > > interested in contributing some changes, and it would be easier if I > could > > work with branches and pull requests rather than loose patches. > > I've had a quick attempt: > https://github.com/riscos-dot-info/DeskLib > > This is marked as experimental for now - please give it a spin and see if > there's any issues. If there are, I may have to delete it and re-convert. > (if this happens you can likely replay any commits against the re-upload) > > In particular, the svn->git userid translation is missing a number of email > addresses (plus myself, John Tytgat and Alan Buckley which I have details > for): > > rosery = rosery <rosery> > no-author = no-author <no-author> > alex = alex <alex> > lee = lee <lee> > nick = nick <nick> > admin = admin <admin> > cpalmer = cpalmer <cpalmer> > jjvdgeer = jjvdgeer <jjvdgeer> > cgrasden = cgrasden <cgrasden> > jmb = jmb <jmb> > peter = peter <peter> > cpmartin = cpmartin <cpmartin> > phlamethrower = phlamethrower <phlamethrower> > stevef = stevef <stevef> > adam = adam <adam> > > If anyone on that list wants to provide an email address they are happy to > live in the git history, please let me know. > > I'm not sure if anyone is looking after Desklib these days (Steve F > committed something almost 2 years ago) so if you or anyone else wants > direct commit rights to the github repo, do let me know your github > username. > > Theo >
Index: fetch-program =================================================================== --- fetch-program (revision 7668) +++ fetch-program (working copy) @@ -13,15 +13,7 @@ AB_CVS_ROOT=$(grep ^AB_CVS_ROOT $AB_HOME/$AB_PACKAGEDIR/setvars 2>/dev/null | cut -d = -f 2-) AB_CVS_MODULE=$(grep ^AB_CVS_MODULE $AB_HOME/$AB_PACKAGEDIR/setvars 2>/dev/null | cut -d = -f 2-) AB_CVS_TAGORBRANCH=$(grep ^AB_CVS_TAGORBRANCH $AB_HOME/$AB_PACKAGEDIR/setvars 2>/dev/null | cut -d = -f 2-) -if [ "$AB_ELFBUILD" == "yes" ] ; then - AB_SVN=$(grep ^AB_SVN $AB_HOME/$AB_PACKAGEDIR/setvars 2>/dev/null | grep -v AOF | cut -d = -f 2-) -else - # AB_SVN_AOF support is only temporary. - AB_SVN=$(grep ^AB_SVN_AOF $AB_HOME/$AB_PACKAGEDIR/setvars | cut -d = -f 2-) - if [ -z "$AB_SVN" ] ; then - AB_SVN=$(grep ^AB_SVN $AB_HOME/$AB_PACKAGEDIR/setvars | cut -d = -f 2-) - fi -fi +AB_SVN=$(grep ^AB_SVN $AB_HOME/$AB_PACKAGEDIR/setvars 2>/dev/null | cut -d = -f 2-) AB_GIT=$(grep ^AB_GIT $AB_HOME/$AB_PACKAGEDIR/setvars 2>/dev/null | cut -d = -f 2-) AB_GIT_TAGORBRANCH=$(grep ^AB_GIT_TAGORBRANCH $AB_HOME/$AB_PACKAGEDIR/setvars 2>/dev/null | cut -d = -f 2-) AB_URL=$(grep ^AB_URL $AB_HOME/$AB_PACKAGEDIR/setvars 2>/dev/null | cut -d = -f 2-) Index: setvars-template =================================================================== --- setvars-template (revision 7668) +++ setvars-template (working copy) @@ -15,11 +15,7 @@ # Note: consider defining "AB_PVERSION=cvs-$(date +%Y%m%d)" as well. # # 2. Either via SVN: -# For both AOF or ELF based builds: #AB_SVN= -# For AOF builds needing another branch (if this is not defined AB_SVN is -# used instead): -#AB_SVN_AOF= # Note: consider defining "AB_ZIPNAME=xxx-svn-$(date +%Y%m%d)" as well. # # 3. Either via git: Index: libraries/riscos/desklib/preprocess =================================================================== --- libraries/riscos/desklib/preprocess (nonexistent) +++ libraries/riscos/desklib/preprocess (working copy) @@ -0,0 +1,3 @@ +if [ "$AB_ELFBUILD" != "yes" ] ; then + git checkout aof +fi Index: libraries/riscos/desklib/setvars =================================================================== --- libraries/riscos/desklib/setvars (revision 7668) +++ libraries/riscos/desklib/setvars (working copy) @@ -1,7 +1,8 @@ -AB_SVN=svn://svn.riscos.info/DeskLib/trunk/ -AB_SVN_AOF=svn://svn.riscos.info/DeskLib/branches/aof/ -AB_PVERSION=svn-$(date +%Y%m%d) +#AB_GIT=https://github.com/riscos-dot-info/DeskLib.git +AB_GIT=https://github.com/ccawley2011/DeskLib.git +AB_GIT_TAGORBRANCH=autobuilder +AB_PVERSION=git-$(date +%Y%m%d) AB_INSTALL=yes @@ -43,16 +44,13 @@ ab_create_app DeskLib Apps/Library desklib - rsync -av --exclude='*/.svn*' ../\!DLUser $A/.. - rsync -av --exclude='*/.svn*' ../\!DeskLib $A/.. - rsync -av --exclude='*/.svn*' ../Examples $A/../\!DeskLib + rsync -av ../\!DLUser $A/.. + rsync -av ../\!DeskLib $A/.. + rsync -av ../Examples $A/../\!DeskLib move_riscos_source $A/../\!DLUser move_riscos_source $A - # Change library name to GCC friendly name - mv -f $A/DeskLib.a $A/libDesk.a - # Remove shared library - it should be packaged in Sharedlibs rm -f $A/libDesk.so Index: libraries/riscos/desklib-scl/Makefile.unix.p =================================================================== --- libraries/riscos/desklib-scl/Makefile.unix.p (revision 7668) +++ libraries/riscos/desklib-scl/Makefile.unix.p (nonexistent) @@ -1,11 +0,0 @@ ---- !DLSources/Makefile.unix.orig 2012-11-22 18:55:16.044642720 +0000 -+++ !DLSources/Makefile.unix 2012-11-22 18:57:51.796170082 +0000 -@@ -80,7 +80,7 @@ - mkdir -p $(GCCSDK_INSTALL_ENV)/include/DeskLib - $(GCCSDK_INSTALL_ENV)/ro-install $(DESKLIB_INCLUDE)/*.h $(DESKLIB_OLD_INCLUDE)/*.h $(GCCSDK_INSTALL_ENV)/include/DeskLib - mkdir -p $(GCCSDK_INSTALL_ENV)/lib -- if [ "$(SCL)" == "true" ] ; then \ -+ if [ "$(SCL)" ] ; then \ - $(GCCSDK_INSTALL_ENV)/ro-install $(DESKLIB) $(GCCSDK_INSTALL_ENV)/lib/libDesk$(SCLNAME).a; \ - else \ - $(GCCSDK_INSTALL_ENV)/ro-install $(DESKLIB_STATIC) $(GCCSDK_INSTALL_ENV)/lib/libDesk.a; \ Index: libraries/riscos/desklib-scl/preprocess =================================================================== --- libraries/riscos/desklib-scl/preprocess (nonexistent) +++ libraries/riscos/desklib-scl/preprocess (working copy) @@ -0,0 +1,3 @@ +if [ "$AB_ELFBUILD" != "yes" ] ; then + git checkout aof +fi Index: libraries/riscos/desklib-scl/setvars =================================================================== --- libraries/riscos/desklib-scl/setvars (revision 7668) +++ libraries/riscos/desklib-scl/setvars (working copy) @@ -1,7 +1,9 @@ -AB_SVN=svn://svn.riscos.info/DeskLib/trunk/ -AB_SVN_AOF=svn://svn.riscos.info/DeskLib/branches/aof/ -AB_PVERSION=svn-$(date +%Y%m%d) +#AB_GIT=https://github.com/riscos-dot-info/DeskLib.git +AB_GIT=https://github.com/ccawley2011/DeskLib.git +AB_GIT_TAGORBRANCH=autobuilder +AB_PVERSION=git-$(date +%Y%m%d) + AB_INSTALL=yes AB_MAKE="cd $PWD/\!DLSources; $AB_MAKE -f Makefile.unix SCL=true"
_______________________________________________ GCCSDK mailing list gcc@gccsdk.riscos.info Bugzilla: http://www.riscos.info/bugzilla/index.cgi List Info: http://www.riscos.info/mailman/listinfo/gcc Main Page: http://www.riscos.info/index.php/GCCSDK
