Skip to content

Commit 9f55578

Browse files
jiangxingitster
authored andcommitted
Makefile: generate "po/git.pot" from stable LOCALIZED_C
Different users may generate a different message template file "po/git.pot". This is because the POT file is generated from "$(LOCALIZED_C)", which is supposed to list all the sources that we extract the strings to be translated from. But "$(LOCALIZED_C)" includes "$(C_OBJ)", which only lists the source files used in the current build for a specific platform and specific compiler conditions. Instead of using "$(C_OBJ)", we use "$(FOUND_C_SOURCES)", which lists all source files we keep track of (or ship in a tarball extract), to form a stable "LOCALIZED_C". We also add "$(SCALAR_SOURCES)", which is part of "$(C_OBJ)" but not included in "$(FOUND_C_SOURCES)". With this update, the newly generated "po/git.pot" will have 30 new entries coming from the following C source files: * compat/fsmonitor/fsm-listen-win32.c * compat/mingw.c * compat/regex/regcomp.c * compat/simple-ipc/ipc-win32.c Signed-off-by: Jiang Xin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ea3f639 commit 9f55578

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2713,7 +2713,8 @@ XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \
27132713
--keyword=gettextln --keyword=eval_gettextln
27142714
XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \
27152715
--keyword=__ --keyword=N__ --keyword="__n:1,2"
2716-
LOCALIZED_C = $(sort $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H))
2716+
LOCALIZED_C = $(sort $(FOUND_C_SOURCES) $(FOUND_H_SOURCES) $(SCALAR_SOURCES) \
2717+
$(GENERATED_H))
27172718
LOCALIZED_SH = $(sort $(SCRIPT_SH) git-sh-setup.sh)
27182719
LOCALIZED_PERL = $(sort $(SCRIPT_PERL))
27192720

0 commit comments

Comments
 (0)