I don't know exactly what to expect, but I get:
> git clone --recursive http://github.com/boostorg/boost
Cloning into 'boost'...
remote: Counting objects: 138912, done.
remote: Compressing objects: 100% (53319/53319), done.
remote: Total 138912 (delta 84911), reused 138380 (delta 84398)
Receiving objects: 100% (138912/138912), 81.34 MiB | 3.98 MiB/s, done.
Resolving deltas: 100% (84911/84911), done.
No submodule mapping found in .gitmodules for path 'libs/chrono'
The .gitmodules file only have an entry for math:
[submodule "libs/math"]
path = libs/math
url = http://github.com/boostorg/math
and all folders in libs/* are empty.
--
Bjørn
yes that is better, it seems git commit today
Author: Paul A. Bristow <pbri...@hetp.u-net.com> 2013-05-17 12:39:59
Committer: Paul A. Bristow <pbri...@hetp.u-net.com> 2013-05-17
12:39:59
svn path=; revision=84317
added reference to lib/math in .gitmodules, but removed the other
entries in the file. I don't know if this is from svn 84317 or caused
by something in the conversion scripts.
--
Bjørn
> -----Original Message-----
> From: Boost [mailto:boost-...@lists.boost.org] On Behalf Of Bjørn Roald
> Sent: Friday, May 17, 2013 4:24 PM
> To: bo...@lists.boost.org
> Subject: Re: [boost] [githelp] modular boost instructions?
>
> On Fri, 2013-05-17 at 10:01 -0400, Nasos Iliopoulos wrote:
> > Unfortunately 1.8.3.rc2 gave me the same error.
> >
> > Furthermore it seems that .gitmodules in
> > 5b5883234251dbe6616c696c4b3f7fdda7fde7d7
> > was in a better state,
>
> yes that is better, it seems git commit today
>
> Author: Paul A. Bristow <pbri...@hetp.u-net.com> 2013-05-17 12:39:59
> Committer: Paul A. Bristow <pbri...@hetp.u-net.com> 2013-05-17
> 12:39:59
>
> svn path=; revision=84317
Guilty!
Revision: 84317
Author: pbristow
Date: 17 May 2013 11:39:59
Message:
New def links added
----
Modified : /trunk/libs/math/doc/math.qbk
And there are a few more later by me and John Maddock updating Boost.Math docs.
HTH
Paul
---
Paul A. Bristow,
Prizet Farmhouse, Kendal LA8 8AB UK
+44 1539 561830 07714330204
pbri...@hetp.u-net.com
>
>
> > -----Original Message-----
> > From: Boost [mailto:boost-...@lists.boost.org] On Behalf Of Bjørn
> Roald
> > Sent: Friday, May 17, 2013 4:24 PM
> > To: bo...@lists.boost.org
> > Subject: Re: [boost] [githelp] modular boost instructions?
> >
> > On Fri, 2013-05-17 at 10:01 -0400, Nasos Iliopoulos wrote:
> > > Unfortunately 1.8.3.rc2 gave me the same error.
> > >
> > > Furthermore it seems that .gitmodules in
> > > 5b5883234251dbe6616c696c4b3f7fdda7fde7d7
> > > was in a better state,
> >
> > yes that is better, it seems git commit today
> >
> > Author: Paul A. Bristow <pbri...@hetp.u-net.com> 2013-05-17 12:39:59
> > Committer: Paul A. Bristow <pbri...@hetp.u-net.com> 2013-05-17
> > 12:39:59
> >
> > svn path=; revision=84317
>
> Guilty!
>
This is a bug. Noted: https://github.com/ryppl/Boost2Git/issues/21
The git commits are generated by the Boost2git conversion script and
they are actually misleading on this point as the .gitmodules filr is
generated by the scrippts and not in the personal commits in svn.
> A few days ago .gitmodules was overwritten to include only boost.math,
> now it references only boost.log.
>
> Look at those commits for example:
> (older to newer)
>
> https://github.com/boostorg/boost/commit/ec263acde5756da86a6036b36eabc8dbe5720d22
> https://github.com/boostorg/boost/commit/1862b15a2b24f81a497c7d5fd198529159812c34#.gitmodules
> https://github.com/boostorg/boost/commit/57867018811951232b896c2808f3b1710c101fce#.gitmodules
I think all this is caused by a bug in the Boost2git conversion script
for incremental conversion.
https://github.com/ryppl/Boost2Git/issues/21
since the git repositories are slaves of svn until the switch, I think
this must be fixed as suggested in the bug report and then do a full
conversion to fix the affected part of git history.
> If this doesn't stop and build doesn't change it directory structure it
> won't work but only by manually moving things around.
Agree - why can't the needed parts of tools/build be as in converted git
repository until the switch is complete. To move the files afterwards
in step lock with the required bootstrap.(sh|bat) and boost-build.jam is
trivial. Alternatively more tricky scripting could be used to detect
and support both environments for bootstrap and ./b2.
--
Bjørn
> So you're saying if I look at the history of .gitmodules, I will find
> an older version that has the submodules for tools/build and build?
No, I am not saying that. I think conversion of tools/build is not
activated or it is broken.
I was talking of all the other submodules that was missing
from .gitmodules due to a bug in the conversion scripts that seems to
have been fixed.
--
Bjørn
> OK, so still looking for an answer to this question:
>
> What git repo do I clone in order to get the build tools?
I would wait until it is fixed proper or simply copy tools/build files
from latest boost release.
If you have to try out this with git, there is a repository you can
clone. But be warned, some of this is not trivial unless you know git
well. It is also a bit of a mess as the structure in tools/build is
changed in the conversion and the top level scripts are not updated
accordingly. It is still being discussed how to deal with this, and the
structure may change again or change back.
# clone boost
git clone --recursive http://github.com/boostorg/boost
cd boost
Now all should be in place, but as you noted tools/build is missing.
To add tools/build submodule manually in boost repository, you may
create a branch to work on add it.
git checkout -b feature/fix-broken-build
git submodule add http://github.com/boostorg/build tools/build
But as you will see, the cloned tools/build submodule suffers from the
restructure of tools/build into tools/build/build :-(
You could checkout a branch in the submodule and edit the submodule for
your own needs - whatever they are, e.g. setting structure back to
tools/build/v2, not tools/build/build/v2:
cd tools/build
git checkout -b feature/fix-broken-build
git mv build/* .
git commit -m "only tools/build, not tools/build/build"
Then in the boost meta repository you may add the changed build
submodule to index and commit.
cd ../..
git add tools/build
git commit -m "only tools/build, not tools/build/build"
Then later, when you get updates upstream you could rebase your changes
on top of upstream commits from Boost2Git conversion with something
like. Be warned, I suspect you may hit non-trivial possibly confusing
rebase if you try it on the boost meta repository as the conversion
scripts are still adjusted, thus history change all the time - that will
stabilize when the switch is done. So the rebase is simpler if you do
it only in your tools/build submodule to get your changes applied on top
of the latest upstream.
git fetch
git rebase origin/master
hope that helps,
--
Bjørn
>
> Hi Dave,
>
> On Wednesday, 22. May 2013 00:08:54 Dave Abrahams wrote:
> > I think this is probably fixed now. We'll know for sure after
> > http://jenkins.boost.org/job/Boost2Git/1538/ completes.
Correction, http://jenkins.boost.org/job/Boost2Git/1555
> Dave, can you please disable all history rewriting attemps for Boost.Build and
> start again?
What do you consider a "history rewriting attempt" and how would I disable it?
> It is much more important to get a working repository now as a
> lot of people want to start contributing.
I'm sorry, I don't know what you're referring to here
> HI Dave,
>
> On Wednesday, 22. May 2013 17:57:32 Dave Abrahams wrote:
>> > Dave, can you please disable all history rewriting attemps for Boost.Build
>> > and start again?
>>
>> What do you consider a "history rewriting attempt" and how would I disable
>> it?
>
> Sorry, that should have read "path rewriting". That means the move of
> "tools/build/v2/" to "tools/build" which now results in
> "tools/build/build/v2".
It's not actually doing less path rewriting for Boost.Build than for
almost any other repository. Currently, we simply take the
subdirectories of tools/ that are part of Boost.Build (i.e. tools/jam
and tools/build) and put them at the top level of the Boost.Build Git
repo. It's like taking the tools directory but throwing out everything
that's not part of Boost.Build. That seemed to me to be the most
faithful representation of what was happening in SVN.
>> > It is much more important to get a working repository now as a
>> > lot of people want to start contributing.
>>
>> I'm sorry, I don't know what you're referring to here
>
> I thought that the conversion was hanging on Boost.Build
It sort of was, for a while... but not for the reasons you think.
--
Dave Abrahams