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 /core/tz | |
| 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 'core/tz')
| -rw-r--r-- | core/tz/gen.rc | 26 | ||||
| -rw-r--r-- | core/tz/rev | 1 | ||||
| m--------- | core/tz/src | 0 | ||||
| -rw-r--r-- | core/tz/tzdata.awk | 26 | ||||
| -rw-r--r-- | core/tz/version.h | 3 |
5 files changed, 0 insertions, 56 deletions
diff --git a/core/tz/gen.rc b/core/tz/gen.rc deleted file mode 100644 index b2a9377e..00000000 --- a/core/tz/gen.rc +++ /dev/null @@ -1,26 +0,0 @@ -cflags -I '$dir' - -exe zic zic.c - -rule zic '$zic -d $outdir/zoneinfo $in' -file bin/zic '$outdir'/zic 755 - -tzdata=(\ - africa\ - antarctica\ - asia\ - australasia\ - europe\ - northamerica\ - southamerica\ - pacificnew\ - etcetera\ - backward\ - systemv\ - factory\ -) -build '$outdir'/tzdata.index awk '$srcdir'/$tzdata '|' scripts/hash.rc '$dir/tzdata.awk' ; with\ - expr '-f $dir/tzdata.awk out=$outdir/zoneinfo repo=$builddir/$repo.git' -index_inputs=($index_inputs '$outdir'/tzdata.index) - -fetch git diff --git a/core/tz/rev b/core/tz/rev deleted file mode 100644 index 1e8b3149..00000000 --- a/core/tz/rev +++ /dev/null @@ -1 +0,0 @@ -6 diff --git a/core/tz/src b/core/tz/src deleted file mode 160000 -Subproject eeff212d0f2b94a8c08d7ce2e1ff2278c027936 diff --git a/core/tz/tzdata.awk b/core/tz/tzdata.awk deleted file mode 100644 index 6e24a588..00000000 --- a/core/tz/tzdata.awk +++ /dev/null @@ -1,26 +0,0 @@ -# usage: awk -f tzdata.awk repo=out/root.git out=out/core/tz/zoneinfo [file...] - -function run(cmd) { - status = system(cmd) - if (status != 0) - exit status -} - -BEGIN { - cmdfmt = "rc ./scripts/hash.rc %s %s share/zoneinfo/%s %s" -} - -FNR == 1 { - run(sprintf("zic -d %s %s", out, FILENAME)) -} - -$1 == "Link" { - s = $3 - gsub(/[^\/]+/, "..", s) - s = substr(s, 1, length(s) - 2) $2 - run(sprintf(cmdfmt, repo, 120000, $3, s)) -} - -$1 == "Zone" { - run(sprintf(cmdfmt, repo, 100644, $2, out "/" $2)) -} diff --git a/core/tz/version.h b/core/tz/version.h deleted file mode 100644 index 76f806c4..00000000 --- a/core/tz/version.h +++ /dev/null @@ -1,3 +0,0 @@ -static char const PKGVERSION[]="(tzcode) "; -static char const TZVERSION[]="2016j"; -static char const REPORT_BUGS_TO[]="tz@iana.org"; |
