From 293f5a93b77d92fd65db7f3d0df654f102e46cfb Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 11 Dec 2016 16:04:20 -0800
Subject: 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
---
 core/zlib/gen.rc | 33 ---------------------------------
 core/zlib/rev    |  1 -
 core/zlib/src    |  1 -
 3 files changed, 35 deletions(-)
 delete mode 100644 core/zlib/gen.rc
 delete mode 100644 core/zlib/rev
 delete mode 160000 core/zlib/src

(limited to 'core/zlib')

diff --git a/core/zlib/gen.rc b/core/zlib/gen.rc
deleted file mode 100644
index 56ac0a0a..00000000
--- a/core/zlib/gen.rc
+++ /dev/null
@@ -1,33 +0,0 @@
-cflags\
-	-D HAVE_HIDDEN\
-	-D HAVE_STDARG_H\
-	-D HAVE_UNISTD_H\
-	-D _LARGEFILE64_SOURCE
-
-lib libz.a\
-	adler32.c\
-	crc32.c\
-	deflate.c\
-	infback.c\
-	inffast.c\
-	inflate.c\
-	inftrees.c\
-	trees.c\
-	zutil.c\
-	\
-	compress.c\
-	uncompr.c\
-	gzclose.c\
-	gzlib.c\
-	gzread.c\
-	gzwrite.c
-file lib/libz.a '$outdir'/libz.a 644
-
-hdrs=(zlib.h zconf.h)
-for(hdr in $hdrs) {
-	build '$outdir'/include/$hdr copy '$srcdir'/$hdr
-	file include/$hdr '$srcdir'/$hdr 644
-}
-phony headers '$outdir'/include/$hdrs
-
-fetch git
diff --git a/core/zlib/rev b/core/zlib/rev
deleted file mode 100644
index d00491fd..00000000
--- a/core/zlib/rev
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/core/zlib/src b/core/zlib/src
deleted file mode 160000
index 50893291..00000000
--- a/core/zlib/src
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 50893291621658f355bc5b4d450a8d06a563053d
-- 
cgit v1.2.3