On Thursday 16 December 2010 15:30:15 Sylvain Joyeux wrote:
> On 12/16/2010 03:19 PM, Peter Soetens wrote:
> > On Thursday 16 December 2010 15:10:01 Sylvain Joyeux wrote:
> >> On 12/16/2010 03:07 PM, Peter Soetens wrote:
> >>> I don't understand yet how it could have happened then, but I probably
> >>> forgot to erase the 'dev' directory (because I renamed it to
> >>> orocos-toolchain). An example config.yml file that contains the minimum
> >>> of what must be in there would have helped though.
> >>
> >> The process for me is:
> >> * bootstrap and configure once manually
> >> * copy the resulting config.yml and use it for following builds.
> >>>
> >>> I'm still running it, but I think it's fixed now...
> >>
> >> OK
> >
> > It isn't :-) master branch works fine. When you change on top
> > 'branch=toolchain-2.2' in the script I've sent, you'll have this error:
> >
> > ...
> > autoproj bootstrap successfully finished
> >
> > To further use autoproj and the installed software, you
> >
> > must add the following line at the bottom of your .bashrc:
> > source
> > /home/kaltan/vbox/hudson/jobs/bootstrap-toolchain/workspace/orocos-
> >
> > toolchain/env.sh
> >
> > WARNING: autoproj will not work until your restart all
> >
> > your consoles, or run the following in them:
> > $ source
> > /home/kaltan/vbox/hudson/jobs/bootstrap-toolchain/workspace/orocos-
> >
> > toolchain/env.sh
> >
> > To import and build the packages, you can now run
> >
> > autoproj update
> > autoproj build
> >
> > The resulting software is installed in
> >
> > /home/kaltan/vbox/hudson/jobs/bootstrap-toolchain/workspace/orocos-
> >
> > toolchain/install
> >
> > + . ./env.sh
> > + export RUBYOPT=-rubygems
> > + export GEM_HOME=/home/kaltan/vbox/hudson/jobs/bootstrap-
> > toolchain/workspace/orocos-toolchain/.gems
> > + export PATH=/home/kaltan/vbox/hudson/jobs/bootstrap-
> > toolchain/workspace/orocos-toolchain/.gems/bin:/home/kaltan/src/git/oroco
> > s- toolchain/orogen/bin:/opt/orocos/bin:/home/kaltan/src/git/orocos-
> > toolchain/.gems/bin:/opt/ros/cturtle/ros/bin:/usr/lib/ccache:/home/kalta
> > n/bin:/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/
> > sbin:/bin:/usr/games + autoproj full-build
> >
> > Access method to gitorious (git, http or ssh): git
> > autodetecting the operating system
> > looking for RubyGems updates
> > updating autoproj main configuration
> > checking out branch master for autoproj_main_configuration
> >
> > Build failed: autoproj_main_configuration: failed in import phase
> >
> > 'git checkout -b master FETCH_HEAD' returned status 1
> > see
> > /home/kaltan/vbox/hudson/jobs/bootstrap-toolchain/workspace/orocos-
> >
> > toolchain/install/log/autoproj_main_configuration-import.log for details
> >
> > last 10 lines are:
> >
> >
> > From
> > /home/kaltan/vbox/hudson/jobs/bootstrap-toolchain/workspace/buildco
> > nf
> >
> > * branch master -> FETCH_HEAD
> >
> > Thu Dec 16 15:16:22 +0100 2010: running
> >
> > git update-ref -m updated by autobuild
> > refs/remotes/autobuild/master
> >
> > cf10a8154670f0a2598201f24e587c9ad633de3c
> >
> > Thu Dec 16 15:16:22 +0100 2010: running
> >
> > git checkout -b master FETCH_HEAD
> >
> > error: You have local changes to 'config.yml'; cannot switch
> > branches.
> >
> > It tries to check out the master branch, while we're working on
> > toolchain-2.2. Did you test your script using a branch other than
> > 'master' ?
>
> The script does not take a branch name, and my guess is that there is
> therefore a mixup between the "git clone"/ add config.yml and the
> bootstrap line.
>
> You must:
>
> * in the "adding config.yml part", make sure you add it to the right
> branch

I did:

+ git checkout -b toolchain-2.2 origin/toolchain-2.2
Branch toolchain-2.2 set up to track remote branch toolchain-2.2 from origin.
Switched to a new branch 'toolchain-2.2'
+ cp -f /home/kaltan/vbox/hudson/jobs/bootstrap-toolchain/workspace/config.yml
config.yml
+ git add -f config.yml
+ git commit -a -m build server configuration
[toolchain-2.2 13da46d] build server configuration
1 files changed, 11 insertions(+), 0 deletions(-)
create mode 100644 config.yml

> * when bootstrapping, make sure you give the right branch to bootstrap

I did:

+ ruby autoproj_bootstrap git /home/kaltan/vbox/hudson/jobs/bootstrap-
toolchain/workspace/buildconf branch=toolchain-2.2

Peter