diff options
| author | Michael Forney <mforney@mforney.org> | 2021-11-15 14:33:00 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2021-11-17 13:46:31 -0800 |
| commit | c255c74a8d5b673b6c7b5cd37e5cfdfb2b8afac3 (patch) | |
| tree | 0e40ad2bcd3b301ce6e6aa91267af8c133ce520f /pkg/git/gen.lua | |
| parent | 1f511fd065175a005cd891c6459e172003bc805c (diff) | |
git: Update to 2.34.0
Diffstat (limited to 'pkg/git/gen.lua')
| -rw-r--r-- | pkg/git/gen.lua | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua index 664c55fd..85a897b4 100644 --- a/pkg/git/gen.lua +++ b/pkg/git/gen.lua @@ -8,20 +8,27 @@ cflags{ } pkg.deps = { - '$outdir/config-list.h', '$outdir/command-list.h', + '$outdir/config-list.h', + '$outdir/hook-list.h', 'pkg/curl/headers', 'pkg/zlib/headers', } rule('cmdlist', 'cd $srcdir && ./generate-cmdlist.sh $$OLDPWD/$in >$$OLDPWD/$out') build('cmdlist', '$outdir/command-list.h', { - '$srcdir/command-list.txt', '|', expand{'$srcdir/Documentation/', lines('commands.txt')}, + '$srcdir/command-list.txt', + '|', '$srcdir/generate-cmdlist.sh', expand{'$srcdir/Documentation/', lines('commands.txt')}, }) -rule('configlist', 'cd $srcdir && ./generate-configlist.sh $$OLDPWD/$in >$$OLDPWD/$out') +rule('configlist', 'cd $srcdir && ./generate-configlist.sh >$$OLDPWD/$out') build('configlist', '$outdir/config-list.h', { - '$srcdir/command-list.txt', '|', expand{'$srcdir/Documentation/', lines('configs.txt')}, + '|', '$srcdir/generate-configlist.sh', expand{'$srcdir/Documentation/', lines('configs.txt')}, +}) + +rule('hooklist', 'cd $srcdir && ./generate-hooklist.sh >$$OLDPWD/$out') +build('hooklist', '$outdir/hook-list.h', { + '|', '$srcdir/generate-hooklist.sh', '$srcdir/Documentation/githooks.txt' }) cc('exec-cmd.c', nil, {cflags=[[$cflags '-DFALLBACK_RUNTIME_PREFIX=""']]}) @@ -51,6 +58,7 @@ lib('libgit.a', [[ bulk-checkin.c bundle.c cache-tree.c + cbtree.c chdir-notify.c checkout.c chunk-format.c @@ -109,6 +117,7 @@ lib('libgit.a', [[ hashmap.c help.c hex.c + hook.c ident.c json-writer.c kwset.c @@ -148,6 +157,7 @@ lib('libgit.a', [[ oid-array.c oidmap.c oidset.c + oidtree.c pack-bitmap-write.c pack-bitmap.c pack-check.c @@ -272,6 +282,8 @@ lib('libgit.a', [[ sha256/block/sha256.c + compat/linux/procinfo.c + libxdiff.a $builddir/pkg/zlib/libz.a ]]) @@ -450,7 +462,6 @@ local scripts = { -- src/Makefile:/^SCRIPT_LIB.\+= {'mergetool--lib', '644'}, - {'rebase--preserve-merges', '644'}, {'sh-i18n', '644'}, {'sh-setup', '644'}, } |