Hello,
as discussed in the issue "Source-code package management" [1], I changed the directory layout of Genode's source tree in the staging branch [2].
[1] https://github.com/genodelabs/genode/issues/1082 [2] https://github.com/genodelabs/genode/tree/staging
All source-code repositories that formerly resided at the top level of the tree have been moved to the 'repos/' subdirectory.
Changing the top-level directory layout raises the question of how to rebase existing topic branches on top of the new version. Fortunately, at least in a few cherry-picking experiments I did, git dealt very well with the situation. Still, we should pay special care with merging topic branches into mainline now.
The new source-tree layout has the nice benefit that I could make the BUILD_DIR argument of the create_builddir tool optional. If no BUILD_DIR argument is supplied, the tool will create the build directory at '<genode-dir>/build/<platform>'. It would be worthwhile to revisit our documentation to simplify the steps to create build directories.
I hope the transition to the new new directory layout will be free of major trouble. If you have strong concerns, now (as the patch is not yet in the master branch) is the time to raise them. ;-)
Cheers Norman
Hello Norman,
as discussed in the issue "Source-code package management" [1], I changed the directory layout of Genode's source tree in the staging branch [2].
Finally :-)
I hope the transition to the new new directory layout will be free of major trouble. If you have strong concerns, now (as the patch is not yet in the master branch) is the time to raise them. ;-)
I have no objections but a few remarks:
Cherry-picking old commits that add new files will obviously place the new files in the old directories. To solve this issue one can move the files to the new directory and squash this commit after cherry-picking. Afterwards the usual rebase -i may be used to clean-up the history.
After switching to the staging branch Genode's top directory is still filled with old directories which contain contrib code. In this case either execute 'make cleanall' in all reporistories before switching the branch or execute 'git clean -f -d' thereafter. (However, witching back to master requires 'make prepare'.)
In addition to get the complete history of a file 'git log --follow' must be used.
Cheers Josef
I was able to update my current in-fly-branches (1126*, 1139*) to the change without much trouble. Merely one easy conflict and some manual squashes for new files. No concerns from my side.
Martin
On 07.05.2014 12:06, Norman Feske wrote:
Hello,
as discussed in the issue "Source-code package management" [1], I changed the directory layout of Genode's source tree in the staging branch [2].
[1] https://github.com/genodelabs/genode/issues/1082 [2] https://github.com/genodelabs/genode/tree/staging
All source-code repositories that formerly resided at the top level of the tree have been moved to the 'repos/' subdirectory.
Changing the top-level directory layout raises the question of how to rebase existing topic branches on top of the new version. Fortunately, at least in a few cherry-picking experiments I did, git dealt very well with the situation. Still, we should pay special care with merging topic branches into mainline now.
The new source-tree layout has the nice benefit that I could make the BUILD_DIR argument of the create_builddir tool optional. If no BUILD_DIR argument is supplied, the tool will create the build directory at '<genode-dir>/build/<platform>'. It would be worthwhile to revisit our documentation to simplify the steps to create build directories.
I hope the transition to the new new directory layout will be free of major trouble. If you have strong concerns, now (as the patch is not yet in the master branch) is the time to raise them. ;-)
Cheers Norman
Hello,
just as a quick notice, the new directory layout has reached the master branch. So now seems to be a good time for applying the new directory layout to topic branches by rebasing them to the new master branch. If you have trouble doing this, please don't hesitate to ask for assistance.
The documentation at genode.org still refers to the old directory layout. It will be updated with the next release by the end of May.
Regards, Norman
On 05/07/2014 04:02 PM, Martin Stein wrote:
I was able to update my current in-fly-branches (1126*, 1139*) to the change without much trouble. Merely one easy conflict and some manual squashes for new files. No concerns from my side.
Martin
On 07.05.2014 12:06, Norman Feske wrote:
Hello,
as discussed in the issue "Source-code package management" [1], I changed the directory layout of Genode's source tree in the staging branch [2].
[1] https://github.com/genodelabs/genode/issues/1082 [2] https://github.com/genodelabs/genode/tree/staging
All source-code repositories that formerly resided at the top level of the tree have been moved to the 'repos/' subdirectory.
Changing the top-level directory layout raises the question of how to rebase existing topic branches on top of the new version. Fortunately, at least in a few cherry-picking experiments I did, git dealt very well with the situation. Still, we should pay special care with merging topic branches into mainline now.
The new source-tree layout has the nice benefit that I could make the BUILD_DIR argument of the create_builddir tool optional. If no BUILD_DIR argument is supplied, the tool will create the build directory at '<genode-dir>/build/<platform>'. It would be worthwhile to revisit our documentation to simplify the steps to create build directories.
I hope the transition to the new new directory layout will be free of major trouble. If you have strong concerns, now (as the patch is not yet in the master branch) is the time to raise them. ;-)
Cheers Norman
-
Josef Söntgen -
Martin Stein -
Norman Feske