diff options
| author | Michael Forney <mforney@mforney.org> | 2016-12-11 16:04:20 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-12-13 23:10:30 -0800 |
| commit | 293f5a93b77d92fd65db7f3d0df654f102e46cfb (patch) | |
| tree | 6ecd1170e3dd793862dd852814dc1b4cd5e44260 /pkg/velox | |
| parent | 9a506a6834df01a26795cea222b410f206efa9fa (diff) | |
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
Diffstat (limited to 'pkg/velox')
| -rw-r--r-- | pkg/velox/gen.rc | 42 | ||||
| -rw-r--r-- | pkg/velox/rev | 1 | ||||
| m--------- | pkg/velox/src | 0 |
3 files changed, 43 insertions, 0 deletions
diff --git a/pkg/velox/gen.rc b/pkg/velox/gen.rc new file mode 100644 index 00000000..4c3c77b5 --- /dev/null +++ b/pkg/velox/gen.rc @@ -0,0 +1,42 @@ +cflags\ + -D 'VELOX_LIBEXEC=''"/libexec/velox"''' \ + -isystem pkg/fontconfig/src\ + -isystem pkg/libxkbcommon/src\ + -isystem '$builddir'/pkg/pixman/include\ + -isystem '$builddir'/pkg/swc/include\ + -isystem '$builddir'/pkg/wayland/include\ + -isystem '$builddir'/pkg/wld/include\ + -I '$outdir' + +waylandproto protocol/velox.xml\ + protocol/velox-^(client server)^-protocol.h velox-protocol.c +build '$outdir'/protocol/swc-client-protocol.h copy '$builddir'/pkg/swc/include/swc-client-protocol.h + +phony deps\ + '$outdir'/protocol/^(swc-client velox-^(client server))^-protocol.h\ + '$builddir'/pkg/^(fontconfig libxkbcommon swc)^/fetch.stamp\ + pkg/^(pixman swc wayland wld)^/headers + +exe velox -d '$dir'/deps \ + config.c\ + layout.c\ + screen.c\ + tag.c\ + util.c\ + velox.c\ + velox-protocol.c.o\ + window.c\ + '$builddir'/pkg/^(\ + swc/libswc.a.d\ + wayland/libwayland-server.a.d\ + ) +file bin/velox '$outdir'/velox 755 + +exe status_bar -d '$dir'/deps clients/status_bar.c velox-protocol.c.o '$builddir'/pkg/^(\ + swc/swc-protocol.c.o\ + wld/libwld.a.d\ + wayland/libwayland-client.a.d\ +) +file libexec/velox/status_bar '$outdir'/status_bar 755 + +fetch git diff --git a/pkg/velox/rev b/pkg/velox/rev new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/pkg/velox/rev @@ -0,0 +1 @@ +2 diff --git a/pkg/velox/src b/pkg/velox/src new file mode 160000 +Subproject a95412ddddfe6640bf14e8524e591c41cf769fc |