mirror of
https://github.com/git/git.git
synced 2024-11-24 10:26:17 +08:00
Remove common-cmds.h
After the last patch, common-cmds.h is no longer used (and it was actually broken). Remove all related code. command-list.h will take its place from now on. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
cfb22a02ab
commit
60f487ac0e
1
.gitignore
vendored
1
.gitignore
vendored
@ -179,7 +179,6 @@
|
|||||||
/gitweb/gitweb.cgi
|
/gitweb/gitweb.cgi
|
||||||
/gitweb/static/gitweb.js
|
/gitweb/static/gitweb.js
|
||||||
/gitweb/static/gitweb.min.*
|
/gitweb/static/gitweb.min.*
|
||||||
/common-cmds.h
|
|
||||||
/command-list.h
|
/command-list.h
|
||||||
*.tar.gz
|
*.tar.gz
|
||||||
*.dsc
|
*.dsc
|
||||||
|
17
Makefile
17
Makefile
@ -757,7 +757,7 @@ LIB_FILE = libgit.a
|
|||||||
XDIFF_LIB = xdiff/lib.a
|
XDIFF_LIB = xdiff/lib.a
|
||||||
VCSSVN_LIB = vcs-svn/lib.a
|
VCSSVN_LIB = vcs-svn/lib.a
|
||||||
|
|
||||||
GENERATED_H += common-cmds.h command-list.h
|
GENERATED_H += command-list.h
|
||||||
|
|
||||||
LIB_H = $(shell $(FIND) . \
|
LIB_H = $(shell $(FIND) . \
|
||||||
-name .git -prune -o \
|
-name .git -prune -o \
|
||||||
@ -1914,9 +1914,9 @@ git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS)
|
|||||||
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \
|
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \
|
||||||
$(filter %.o,$^) $(LIBS)
|
$(filter %.o,$^) $(LIBS)
|
||||||
|
|
||||||
help.sp help.s help.o: common-cmds.h command-list.h
|
help.sp help.s help.o: command-list.h
|
||||||
|
|
||||||
builtin/help.sp builtin/help.s builtin/help.o: common-cmds.h command-list.h GIT-PREFIX
|
builtin/help.sp builtin/help.s builtin/help.o: command-list.h GIT-PREFIX
|
||||||
builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
|
builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
|
||||||
'-DGIT_HTML_PATH="$(htmldir_relative_SQ)"' \
|
'-DGIT_HTML_PATH="$(htmldir_relative_SQ)"' \
|
||||||
'-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \
|
'-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \
|
||||||
@ -1935,11 +1935,6 @@ $(BUILT_INS): git$X
|
|||||||
ln -s $< $@ 2>/dev/null || \
|
ln -s $< $@ 2>/dev/null || \
|
||||||
cp $< $@
|
cp $< $@
|
||||||
|
|
||||||
common-cmds.h: generate-cmdlist.sh command-list.txt
|
|
||||||
|
|
||||||
common-cmds.h: $(wildcard Documentation/git-*.txt)
|
|
||||||
$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh command-list.txt COMMON >$@+ && mv $@+ $@
|
|
||||||
|
|
||||||
command-list.h: generate-cmdlist.sh command-list.txt
|
command-list.h: generate-cmdlist.sh command-list.txt
|
||||||
|
|
||||||
command-list.h: $(wildcard Documentation/git-*.txt)
|
command-list.h: $(wildcard Documentation/git-*.txt)
|
||||||
@ -2153,7 +2148,7 @@ else
|
|||||||
# Dependencies on header files, for platforms that do not support
|
# Dependencies on header files, for platforms that do not support
|
||||||
# the gcc -MMD option.
|
# the gcc -MMD option.
|
||||||
#
|
#
|
||||||
# Dependencies on automatically generated headers such as common-cmds.h or command-list.h
|
# Dependencies on automatically generated headers such as command-list.h
|
||||||
# should _not_ be included here, since they are necessary even when
|
# should _not_ be included here, since they are necessary even when
|
||||||
# building an object for the first time.
|
# building an object for the first time.
|
||||||
|
|
||||||
@ -2532,7 +2527,7 @@ sparse: $(SP_OBJ)
|
|||||||
style:
|
style:
|
||||||
git clang-format --style file --diff --extensions c,h
|
git clang-format --style file --diff --extensions c,h
|
||||||
|
|
||||||
check: common-cmds.h command-list.h
|
check: command-list.h
|
||||||
@if sparse; \
|
@if sparse; \
|
||||||
then \
|
then \
|
||||||
echo >&2 "Use 'make sparse' instead"; \
|
echo >&2 "Use 'make sparse' instead"; \
|
||||||
@ -2780,7 +2775,7 @@ clean: profile-clean coverage-clean
|
|||||||
$(RM) $(TEST_PROGRAMS) $(NO_INSTALL)
|
$(RM) $(TEST_PROGRAMS) $(NO_INSTALL)
|
||||||
$(RM) -r bin-wrappers $(dep_dirs)
|
$(RM) -r bin-wrappers $(dep_dirs)
|
||||||
$(RM) -r po/build/
|
$(RM) -r po/build/
|
||||||
$(RM) *.pyc *.pyo */*.pyc */*.pyo common-cmds.h command-list.h $(ETAGS_TARGET) tags cscope*
|
$(RM) *.pyc *.pyo */*.pyc */*.pyo command-list.h $(ETAGS_TARGET) tags cscope*
|
||||||
$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
|
$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
|
||||||
$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
|
$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
|
||||||
$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
|
$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
|
||||||
|
@ -68,46 +68,6 @@ struct cmdname_help {
|
|||||||
uint32_t category;
|
uint32_t category;
|
||||||
};
|
};
|
||||||
"
|
"
|
||||||
if test -z "$2"
|
define_categories "$1"
|
||||||
then
|
echo
|
||||||
define_categories "$1"
|
print_command_list "$1"
|
||||||
echo
|
|
||||||
print_command_list "$1"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "static const char *common_cmd_groups[] = {"
|
|
||||||
|
|
||||||
grps=grps$$.tmp
|
|
||||||
match=match$$.tmp
|
|
||||||
trap "rm -f '$grps' '$match'" 0 1 2 3 15
|
|
||||||
|
|
||||||
sed -n '
|
|
||||||
1,/^### common groups/b
|
|
||||||
/^### command list/q
|
|
||||||
/^#/b
|
|
||||||
/^[ ]*$/b
|
|
||||||
h;s/^[^ ][^ ]*[ ][ ]*\(.*\)/ N_("\1"),/p
|
|
||||||
g;s/^\([^ ][^ ]*\)[ ].*/\1/w '$grps'
|
|
||||||
' "$1"
|
|
||||||
printf '};\n\n'
|
|
||||||
|
|
||||||
n=0
|
|
||||||
substnum=
|
|
||||||
while read grp
|
|
||||||
do
|
|
||||||
echo "^git-..*[ ]$grp"
|
|
||||||
substnum="$substnum${substnum:+;}s/[ ]$grp/$n/"
|
|
||||||
n=$(($n+1))
|
|
||||||
done <"$grps" >"$match"
|
|
||||||
|
|
||||||
printf 'static struct cmdname_help common_cmds[] = {\n'
|
|
||||||
grep -f "$match" "$1" |
|
|
||||||
sed 's/^git-//' |
|
|
||||||
sort |
|
|
||||||
while read cmd tags
|
|
||||||
do
|
|
||||||
tag=$(echo "$tags" | sed "$substnum; s/[^0-9]//g")
|
|
||||||
echo " {\"$cmd\", $(get_synopsis git-$cmd), $tag},"
|
|
||||||
done
|
|
||||||
echo "};"
|
|
||||||
|
Loading…
Reference in New Issue
Block a user