Move to flat package hierarchy

Note to self: never try to move submodules again

To migrate your existing submodules (more or less):

	set -x
	set -e

	mkdir .git/modules/pkg
	for old in */*/src ; do
	        new="pkg/${old#*/}"
	        if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
			continue
		fi
		git -C ".git/modules/$old" config core.worktree "../../../../../$new"
		rmdir "$new"
		mv "$old" "$new"
	        sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
	        mv "$new/.git.tmp" "$new/.git"
		mkdir ".git/modules/${new%/src}"
	        mv ".git/modules/$old" ".git/modules/$new"

		rm "${old%/src}"/*.ninja
		mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
		rmdir "${old%/src}" || true
	done
	sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
	mv .git/config.tmp .git/config

1 files changed, 5 insertions, 4 deletions

diff --git a/ninja.rc b/ninja.rc
index 2d2267aa..d9a049f2 100644
--- a/ninja.rc
+++ b/ninja.rc
@@ -153,14 +153,14 @@ fn waylandproto {
 	build '$outdir'/$1 waylandproto $proto ; with type client-header
 	build '$outdir'/$2 waylandproto $proto ; with type server-header
 	build '$outdir'/$3 waylandproto $proto ; with type code
-	cc '$outdir'/$3 '||' desktop/wayland/headers
+	cc '$outdir'/$3 '||' pkg/wayland/headers
 }
 
 # packaging rules
 
 fn file {
 	~ $#* 3
-	if(fs $dir $1) {
+	if(~ $dir . util || fs $pkg $1) {
 		out='$builddir/$repo.hash'/$1
 		mode=`{printf %4s $3 | tr ' ' 0 | tail -c 4}
 		build $out githash $2 '|' '$builddir/$repo.stamp' scripts/hash.rc ; with\
@@ -174,13 +174,14 @@ fn file {
 
 fn dir {
 	~ $#* 2
-	if(fs $dir $1) tree_perms=($tree_perms '040'$2' '$1)
+	if(~ $dir . util || fs $pkg $1)
+		tree_perms=($tree_perms '040'$2' '$1)
 	status=()
 }
 
 fn sym {
 	~ $#* 2
-	if(fs $dir $1) {
+	if(~ $dir . util || fs $pkg $1) {
 		out='$builddir/$repo.hash'/$1
 		build $out githash '|' '$builddir/$repo.stamp' scripts/hash.rc ; with\
 			args 120000' '$1' '$2