Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 41c92ac

Browse files
peterepetere
committed
Move PO files into subdirectories separate from the source code.
1 parent b7a5917 commit 41c92ac

File tree

25 files changed

+45
-64
lines changed

25 files changed

+45
-64
lines changed

‎src/backend/Makefile

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.84 2002/08/10 17:59:28 petere Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.85 2002/08/21 20:42:24 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -31,9 +31,6 @@ endif
3131

3232
all: submake-libpgport postgres $(POSTGRES_IMP)
3333
$(MAKE) -C utils/mb/conversion_procs $@
34-
ifeq ($(enable_nls), yes)
35-
$(MAKE) -C po all
36-
endif
3734

3835
ifneq ($(PORTNAME), win)
3936

@@ -111,9 +108,7 @@ distprep:
111108
$(MAKE) -C parser gram.c parse.h scan.c
112109
$(MAKE) -C bootstrap bootparse.c bootstrap_tokens.h bootscanner.c
113110
$(MAKE) -C utils/misc guc-file.c
114-
ifeq ($(enable_nls), yes)
115-
$(MAKE) -C po $@
116-
endif
111+
117112

118113
##########################################################################
119114

@@ -127,9 +122,6 @@ endif
127122
$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample $(DESTDIR)$(datadir)/pg_hba.conf.sample
128123
$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample $(DESTDIR)$(datadir)/pg_ident.conf.sample
129124
$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample
130-
ifeq ($(enable_nls), yes)
131-
$(MAKE) -C po $@
132-
endif
133125
$(MAKE) -C utils/mb $@
134126
$(MAKE) -C utils/mb/conversion_procs $@
135127

@@ -153,9 +145,7 @@ endif
153145
ifeq ($(MAKE_EXPORTS), true)
154146
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
155147
endif
156-
ifeq ($(enable_nls), yes)
157-
$(MAKE) -C po $@
158-
endif
148+
159149

160150
##########################################################################
161151

@@ -173,9 +163,6 @@ endif
173163
rm -f $(DESTDIR)$(datadir)/pg_hba.conf.sample \
174164
$(DESTDIR)$(datadir)/pg_ident.conf.sample \
175165
$(DESTDIR)$(datadir)/postgresql.conf.sample
176-
ifeq ($(enable_nls), yes)
177-
$(MAKE) -C po $@
178-
endif
179166

180167

181168
##########################################################################
@@ -190,9 +177,6 @@ ifeq ($(MAKE_DLL), true)
190177
endif
191178
endif
192179
for i in $(DIRS); do $(MAKE) -C $$i clean || exit; done
193-
ifeq ($(enable_nls), yes)
194-
$(MAKE) -C po $@
195-
endif
196180

197181
distclean: clean
198182
rm -f port/tas.s port/dynloader.c port/pg_sema.c port/pg_shmem.c
@@ -205,7 +189,6 @@ maintainer-clean: distclean
205189
$(srcdir)/parser/scan.c \
206190
$(srcdir)/parser/parse.h \
207191
$(srcdir)/utils/misc/guc-file.c
208-
$(MAKE) -C po maintainer-clean
209192

210193

211194
##########################################################################

‎src/backend/nls.mk

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
CATALOG_NAME := postgres
2+
AVAIL_LANGUAGES := cs de hu ru zh_CN zh_TW
3+
GETTEXT_FILES := + gettext-files
4+
GETTEXT_TRIGGERS:= elog:2 postmaster_error yyerror
5+
6+
gettext-files:
7+
find $(srcdir)/ -name '*.c' -print >$@
8+
9+
my-maintainer-clean:
10+
rm -f gettext-files
11+
12+
.PHONY: my-maintainer-clean
13+
maintainer-clean: my-maintainer-clean

‎src/backend/po/Makefile

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/backend/po/nls.mk

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/bin/pg_dump/cs.po renamed to ‎src/bin/pg_dump/po/cs.po

File renamed without changes.

‎src/bin/pg_dump/de.po renamed to ‎src/bin/pg_dump/po/de.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# German message translation file for pg_dump and friends
22
# Peter Eisentraut <peter_e@gmx.net>, 2001.
33
#
4-
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/de.po,v 1.6 2002/01/29 20:39:49 petere Exp $
4+
# $Header: /cvsroot/pgsql/src/bin/pg_dump/po/de.po,v 1.1 2002/08/21 20:42:25 petere Exp $
55
#
66
# Use these quotes: »%s«
77
#

‎src/bin/pg_dump/ru.po renamed to ‎src/bin/pg_dump/po/ru.po

File renamed without changes.

‎src/bin/pg_dump/sv.po renamed to ‎src/bin/pg_dump/po/sv.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Swedish message translation file for pg_dump
22
# Peter Eisentraut <peter_e@gmx.net>, 2001.
33
#
4-
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/sv.po,v 1.1 2001/12/13 22:06:33 petere Exp $
4+
# $Header: /cvsroot/pgsql/src/bin/pg_dump/po/sv.po,v 1.1 2002/08/21 20:42:26 petere Exp $
55
#
66
# Use these quotes: "%s"
77
#

‎src/bin/pg_dump/zh_CN.po renamed to ‎src/bin/pg_dump/po/zh_CN.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# simplified Chinese translation file for pg_dump and friends
22
# Weiping He <laser@zhengmai.com.cn>, 2001.
3-
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/zh_CN.po,v 1.5 2001/12/10 18:45:57 petere Exp $
3+
# $Header: /cvsroot/pgsql/src/bin/pg_dump/po/zh_CN.po,v 1.1 2002/08/21 20:42:26 petere Exp $
44
#
55
msgid ""
66
msgstr ""

‎src/bin/pg_dump/zh_TW.po renamed to ‎src/bin/pg_dump/po/zh_TW.po

File renamed without changes.

‎src/bin/psql/cs.po renamed to ‎src/bin/psql/po/cs.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Czech message translation file for psql
22
# Karel Zak <zakkr@zf.jcu.cz>, August 2001.
33
#
4-
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/cs.po,v 1.3 2002/06/20 20:29:42 momjian Exp $
4+
# $Header: /cvsroot/pgsql/src/bin/psql/po/cs.po,v 1.1 2002/08/21 20:42:26 petere Exp $
55
#
66
msgid ""
77
msgstr ""

‎src/bin/psql/de.po renamed to ‎src/bin/psql/po/de.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# German message translation file for psql
22
# Peter Eisentraut <peter_e@gmx.net>, 2001.
33
#
4-
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/de.po,v 1.6 2002/06/20 20:29:42 momjian Exp $
4+
# $Header: /cvsroot/pgsql/src/bin/psql/po/de.po,v 1.1 2002/08/21 20:42:26 petere Exp $
55
#
66
# Use these quotes: »%s«
77
#

‎src/bin/psql/fr.po renamed to ‎src/bin/psql/po/fr.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# French message translation file for psql
22
# Peter Eisentraut <peter_e@gmx.net>, 2001.
33
#
4-
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/fr.po,v 1.4 2002/06/20 20:29:42 momjian Exp $
4+
# $Header: /cvsroot/pgsql/src/bin/psql/po/fr.po,v 1.1 2002/08/21 20:42:26 petere Exp $
55
#
66
# Use these quotes: «%s»
77
#

‎src/bin/psql/ru.po renamed to ‎src/bin/psql/po/ru.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# PSQL Translated Messages in Russian Language (KOI8-R)
22
# Serguei A. Mokhov <stgunya@yahoo.com>, August-September 2001.
33
#
4-
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/ru.po,v 1.5 2002/06/20 20:29:42 momjian Exp $
4+
# $Header: /cvsroot/pgsql/src/bin/psql/po/Attic/ru.po,v 1.1 2002/08/21 20:42:26 petere Exp $
55
#
66
msgid ""
77
msgstr ""

‎src/bin/psql/sv.po renamed to ‎src/bin/psql/po/sv.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Peter Eisentraut <peter_e@gmx.net>, 2001.
33
# Dennis Björklund <db@zigo.dhs.org>, 2002.
44
#
5-
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/sv.po,v 1.4 2002/08/06 21:13:44 petere Exp $
5+
# $Header: /cvsroot/pgsql/src/bin/psql/po/sv.po,v 1.1 2002/08/21 20:42:26 petere Exp $
66
#
77
# Use these quotes: "%s"
88
#

‎src/bin/psql/zh_CN.po renamed to ‎src/bin/psql/po/zh_CN.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# simplified Chinese translation file for psql
22
# Weiping He <laser@zhengmai.com.cn>, 2001.
33
#
4-
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/zh_CN.po,v 1.4 2002/06/20 20:29:42 momjian Exp $
4+
# $Header: /cvsroot/pgsql/src/bin/psql/po/Attic/zh_CN.po,v 1.1 2002/08/21 20:42:27 petere Exp $
55
#
66
msgid ""
77
msgstr ""

‎src/bin/psql/zh_TW.po renamed to ‎src/bin/psql/po/zh_TW.po

File renamed without changes.

‎src/interfaces/libpq/cs.po renamed to ‎src/interfaces/libpq/po/cs.po

File renamed without changes.

‎src/interfaces/libpq/de.po renamed to ‎src/interfaces/libpq/po/de.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# German message translation file for libpq
22
# Peter Eisentraut <peter_e@gmx.net>, 2001.
33
#
4-
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/de.po,v 1.4 2001/11/29 18:59:28 petere Exp $
4+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/de.po,v 1.1 2002/08/21 20:42:27 petere Exp $
55
#
66
# Use these quotes: »%s«
77
#

‎src/interfaces/libpq/fr.po renamed to ‎src/interfaces/libpq/po/fr.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# French message translation file for libpq
22
# Peter Eisentraut <peter_e@gmx.net>, 2001.
33
#
4-
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/fr.po,v 1.2 2001/12/13 22:04:40 petere Exp $
4+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/fr.po,v 1.1 2002/08/21 20:42:27 petere Exp $
55
#
66
# Use these quotes: «%s»
77
#

‎src/interfaces/libpq/ru.po renamed to ‎src/interfaces/libpq/po/ru.po

File renamed without changes.

‎src/interfaces/libpq/sv.po renamed to ‎src/interfaces/libpq/po/sv.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Swedish message translation file for libpq
22
# Peter Eisentraut <peter_e@gmx.net>, 2001.
33
#
4-
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/sv.po,v 1.1 2001/12/13 22:05:57 petere Exp $
4+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/sv.po,v 1.1 2002/08/21 20:42:27 petere Exp $
55
#
66
# Use these quotes: "%s"
77
#

‎src/interfaces/libpq/zh_CN.po renamed to ‎src/interfaces/libpq/po/zh_CN.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# simplified Chinese translation file for libpq
22
# Weiping He <laser@zhengmai.com.cn>, 2001
33
#
4-
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/zh_CN.po,v 1.3 2001/11/29 18:59:28 petere Exp $
4+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.1 2002/08/21 20:42:27 petere Exp $
55
#
66
msgid ""
77
msgstr ""

‎src/interfaces/libpq/zh_TW.po renamed to ‎src/interfaces/libpq/po/zh_TW.po

File renamed without changes.

‎src/nls-global.mk

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Header: /cvsroot/pgsql/src/nls-global.mk,v 1.4 2001/11/29 18:59:28 petere Exp $
1+
# $Header: /cvsroot/pgsql/src/nls-global.mk,v 1.5 2002/08/21 20:42:24 petere Exp $
22

33
# Common rules for Native Language Support (NLS)
44
#
@@ -32,8 +32,8 @@ else
3232
LANGUAGES = $(AVAIL_LANGUAGES)
3333
endif
3434

35-
PO_FILES = $(addsuffix .po, $(LANGUAGES))
36-
MO_FILES = $(addsuffix .mo, $(LANGUAGES))
35+
PO_FILES = $(addprefix po/, $(addsuffix .po, $(LANGUAGES)))
36+
MO_FILES = $(addprefix po/, $(addsuffix .mo, $(LANGUAGES)))
3737

3838
ifdef XGETTEXT
3939
XGETTEXT += --foreign-user -ctranslator
@@ -42,17 +42,17 @@ endif
4242

4343
all-po: $(MO_FILES)
4444

45-
distprep: $(srcdir)/$(CATALOG_NAME).pot
45+
distprep: $(srcdir)/po/$(CATALOG_NAME).pot
4646

4747
%.mo: %.po
4848
$(MSGFMT) -o $@ $<
4949

5050
ifdef XGETTEXT
5151
ifeq ($(word 1,$(GETTEXT_FILES)),+)
52-
$(srcdir)/$(CATALOG_NAME).pot: $(word 2, $(GETTEXT_FILES))
52+
$(srcdir)/po/$(CATALOG_NAME).pot: $(word 2, $(GETTEXT_FILES))
5353
$(XGETTEXT) -D $(srcdir) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) -f $<
5454
else
55-
$(srcdir)/$(CATALOG_NAME).pot: $(GETTEXT_FILES)
55+
$(srcdir)/po/$(CATALOG_NAME).pot: $(GETTEXT_FILES)
5656
# Change to srcdir explicitly, don't rely on $^. That way we get
5757
# consistent #: file references in the po files.
5858
$(XGETTEXT) -D $(srcdir) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(GETTEXT_FILES)
@@ -65,7 +65,7 @@ endif # not XGETTEXT
6565

6666
install-po: all-po installdirs-po
6767
for lang in $(LANGUAGES); do \
68-
$(INSTALL_DATA) $$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(CATALOG_NAME).mo || exit 1; \
68+
$(INSTALL_DATA) po/$$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(CATALOG_NAME).mo || exit 1; \
6969
done
7070

7171
installdirs-po:
@@ -77,10 +77,10 @@ uninstall-po:
7777

7878
clean-po:
7979
rm -f $(MO_FILES)
80-
@rm -f $(addsuffix .po.old, $(AVAIL_LANGUAGES))
80+
@rm -f $(addsuffix .old, $(PO_FILES))
8181

8282
maintainer-clean-po: clean-po
83-
rm -f $(srcdir)/$(CATALOG_NAME).pot
83+
rm -f $(srcdir)/po/$(CATALOG_NAME).pot
8484

8585

8686
maintainer-check-po: $(PO_FILES)
@@ -89,20 +89,20 @@ maintainer-check-po: $(PO_FILES)
8989
done
9090

9191

92-
init-po: $(srcdir)/$(CATALOG_NAME).pot
92+
init-po: $(srcdir)/po/$(CATALOG_NAME).pot
9393

9494

95-
update-po: $(srcdir)/$(CATALOG_NAME).pot
95+
update-po: $(srcdir)/po/$(CATALOG_NAME).pot
9696
ifdef MSGMERGE
9797
@for lang in $(LANGUAGES); do \
9898
echo "merging $$lang:"; \
99-
if $(MSGMERGE) $(srcdir)/$$lang.po $< -o $$lang.po.new; \
99+
if $(MSGMERGE) $(srcdir)/po/$$lang.po $< -o po/$$lang.po.new; \
100100
then \
101-
mv $(srcdir)/$$lang.po $$lang.po.old; \
102-
mv $$lang.po.new $(srcdir)/$$lang.po; \
101+
mv $(srcdir)/po/$$lang.po po/$$lang.po.old; \
102+
mv po/$$lang.po.new $(srcdir)/po/$$lang.po; \
103103
else \
104104
echo "msgmerge for $$lang failed"; \
105-
rm -f $$lang.po.new; \
105+
rm -f po/$$lang.po.new; \
106106
fi; \
107107
done
108108
else
@@ -120,3 +120,4 @@ maintainer-check: maintainer-check-po
120120

121121
.PHONY: all-po install-po installdirs-po uninstall-po clean-po \
122122
maintainer-clean-po maintainer-check-po init-po update-po
123+
.SILENT: installdirs-po

0 commit comments

Comments
 (0)