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

3 files changed, 0 insertions, 34 deletions

diff --git a/core/ninja/gen.rc b/core/ninja/gen.rc
deleted file mode 100644
index c4f2d321..00000000
--- a/core/ninja/gen.rc
+++ /dev/null
@@ -1,33 +0,0 @@
-set cc '$cxx'
-set cflags '$cxxflags' \
-	-Wall -Wextra -Wno-deprecated -Wno-unused-parameter\
-	-fno-rtti -fno-exceptions '-fvisibility=hidden' \
-	-D USE_PPOLL
-
-exe ninja src/^(\
-	ninja.cc\
-	build.cc\
-	build_log.cc\
-	clean.cc\
-	clparser.cc\
-	debug_flags.cc\
-	depfile_parser.cc\
-	deps_log.cc\
-	disk_interface.cc\
-	edit_distance.cc\
-	eval_env.cc\
-	graph.cc\
-	graphviz.cc\
-	lexer.cc\
-	line_printer.cc\
-	manifest_parser.cc\
-	metrics.cc\
-	state.cc\
-	util.cc\
-	version.cc\
-	subprocess-posix.cc\
-)
-
-file bin/ninja '$outdir'/ninja 755
-
-fetch git
diff --git a/core/ninja/rev b/core/ninja/rev
deleted file mode 100644
index 0cfbf088..00000000
--- a/core/ninja/rev
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/core/ninja/src b/core/ninja/src
deleted file mode 160000
-Subproject 717b7b4a31db6027207588c0fb89c3ead384747