null+****@clear*****
null+****@clear*****
2011年 5月 18日 (水) 12:18:17 JST
Kouhei Sutou 2011-05-18 03:18:17 +0000 (Wed, 18 May 2011)
New Revision: e71cf97c79a3bb3d44f13debbd2966b2f611f41e
Log:
[doc] move doc/ja/ to doc/lcoale/ja/.
Added files:
build/makefiles/locale.mk
doc/locale/Makefile.am
Copied files:
build/makefiles/gettext-files.mk
(from build/makefiles/gettext.mk)
Modified files:
.gitignore
build/makefiles/gettext.mk
build/makefiles/sphinx-build.mk
build/makefiles/sphinx.mk
configure.ac
doc/Makefile.am
Renamed files:
doc/locale/ja/Makefile.am
(from doc/ja/Makefile.am)
Modified: .gitignore (+13 -13)
===================================================================
--- .gitignore 2011-05-18 02:43:17 +0000 (908482f)
+++ .gitignore 2011-05-18 03:18:17 +0000 (5925549)
@@ -38,22 +38,22 @@ Makefile.in
version.sh
/examples/kv
/examples/index
-/doc/*/doctrees/
-/doc/*/html/
-/doc/*/dirhtml/
-/doc/*/htmlhelp/
-/doc/*/json/
-/doc/*/latex/
-/doc/*/qthelp/
-/doc/*/rdoc/
-/doc/*/man/
-/doc/*/pickle/
-/doc/*/textile/
-/doc/*/pdf/
+/doc/locale/*/doctrees/
+/doc/locale/*/html/
+/doc/locale/*/dirhtml/
+/doc/locale/*/htmlhelp/
+/doc/locale/*/json/
+/doc/locale/*/latex/
+/doc/locale/*/qthelp/
+/doc/locale/*/rdoc/
+/doc/locale/*/man/
+/doc/locale/*/pickle/
+/doc/locale/*/textile/
+/doc/locale/*/pdf/
+/doc/locale/*/LC_MESSAGES/*.mo
/doc/pot/
/doc/commands_not_implemented/
/doc/sphinx/
-/doc/locale/*/LC_MESSAGES/*.mo
/lib/icudump
/coverage
/coverage.info
Copied: build/makefiles/gettext-files.mk (+25 -9) 56%
===================================================================
--- build/makefiles/gettext.mk 2011-05-18 02:43:17 +0000 (f6376c2)
+++ build/makefiles/gettext-files.mk 2011-05-18 03:18:17 +0000 (4a29d63)
@@ -1,11 +1,3 @@
-.PHONY: update
-
-all: update
-
-.SUFFIXES: .po .mo
-.po.mo:
- msgfmt -o $@ $<
-
NULL =
# (cd ../../doc; echo "po_files = \\"; find pot -type f -name '*.pot' | sort | sed -e 's,^pot/,\t,g' -e 's,pot$,po \\,'; echo -n "\t\$(NULL)")
@@ -59,4 +51,28 @@ mo_files = \
type.mo \
$(NULL)
-update: $(mo_files)
+# (cd ../../doc; echo "mo_files_relative_from_locale_dir = \\"; find pot -type f -name '*.pot' | sort | sed -e 's,^pot/,\tLC_MESSAGES/,g' -e 's,pot$,mo \\,'; echo -n "\t\$(NULL)")
+mo_files_relative_from_locale_dir = \
+ LC_MESSAGES/characteristic.mo \
+ LC_MESSAGES/command_version.mo \
+ LC_MESSAGES/commands.mo \
+ LC_MESSAGES/commands_not_implemented.mo \
+ LC_MESSAGES/developer.mo \
+ LC_MESSAGES/execfile.mo \
+ LC_MESSAGES/expr.mo \
+ LC_MESSAGES/functions.mo \
+ LC_MESSAGES/grnslap.mo \
+ LC_MESSAGES/grntest.mo \
+ LC_MESSAGES/http.mo \
+ LC_MESSAGES/index.mo \
+ LC_MESSAGES/install.mo \
+ LC_MESSAGES/limitations.mo \
+ LC_MESSAGES/news.mo \
+ LC_MESSAGES/process.mo \
+ LC_MESSAGES/pseudo_column.mo \
+ LC_MESSAGES/reference.mo \
+ LC_MESSAGES/spec.mo \
+ LC_MESSAGES/troubleshooting.mo \
+ LC_MESSAGES/tutorial.mo \
+ LC_MESSAGES/type.mo \
+ $(NULL)
Modified: build/makefiles/gettext.mk (+5 -53)
===================================================================
--- build/makefiles/gettext.mk 2011-05-18 02:43:17 +0000 (f6376c2)
+++ build/makefiles/gettext.mk 2011-05-18 03:18:17 +0000 (2333531)
@@ -1,3 +1,5 @@
+include $(abs_top_srcdir)/build/makefiles/gettext-files.mk
+
.PHONY: update
all: update
@@ -6,57 +8,7 @@ all: update
.po.mo:
msgfmt -o $@ $<
-NULL =
-
-# (cd ../../doc; echo "po_files = \\"; find pot -type f -name '*.pot' | sort | sed -e 's,^pot/,\t,g' -e 's,pot$,po \\,'; echo -n "\t\$(NULL)")
-po_files = \
- characteristic.po \
- command_version.po \
- commands.po \
- commands_not_implemented.po \
- developer.po \
- execfile.po \
- expr.po \
- functions.po \
- grnslap.po \
- grntest.po \
- http.po \
- index.po \
- install.po \
- limitations.po \
- news.po \
- process.po \
- pseudo_column.po \
- reference.po \
- spec.po \
- troubleshooting.po \
- tutorial.po \
- type.po
-
-# (cd ../../doc; echo "mo_files = \\"; find pot -type f -name '*.pot' | sort | sed -e 's,^pot/,\t,g' -e 's,pot$,mo \\,'; echo -n "\t\$(NULL)")
-mo_files = \
- characteristic.mo \
- command_version.mo \
- commands.mo \
- commands_not_implemented.mo \
- developer.mo \
- execfile.mo \
- expr.mo \
- functions.mo \
- grnslap.mo \
- grntest.mo \
- http.mo \
- index.mo \
- install.mo \
- limitations.mo \
- news.mo \
- process.mo \
- pseudo_column.mo \
- reference.mo \
- spec.mo \
- troubleshooting.mo \
- tutorial.mo \
- type.mo \
- $(NULL)
-
update: $(mo_files)
+
+html: update
+pdf: update
Added: build/makefiles/locale.mk (+1 -0) 100644
===================================================================
--- /dev/null
+++ build/makefiles/locale.mk 2011-05-18 03:18:17 +0000 (30faab4)
@@ -0,0 +1 @@
+LOCALES = en ja
Modified: build/makefiles/sphinx-build.mk (+0 -2)
===================================================================
--- build/makefiles/sphinx-build.mk 2011-05-18 02:43:17 +0000 (e409c5c)
+++ build/makefiles/sphinx-build.mk 2011-05-18 03:18:17 +0000 (1f82989)
@@ -1,5 +1,3 @@
-LOCALES = en ja
-
# You can set these variables from the command line.
DOCTREES_BASE = doctrees
Modified: build/makefiles/sphinx.mk (+15 -8)
===================================================================
--- build/makefiles/sphinx.mk 2011-05-18 02:43:17 +0000 (1e635c9)
+++ build/makefiles/sphinx.mk 2011-05-18 03:18:17 +0000 (860e0f2)
@@ -1,4 +1,10 @@
+include $(abs_top_srcdir)/build/makefiles/locale.mk
include $(abs_top_srcdir)/build/makefiles/sphinx-build.mk
+include $(abs_top_srcdir)/build/makefiles/gettext-files.mk
+
+document_source_files = \
+ $(source_fiele) \
+ $(mo_files_relative_from_locale_dir)
.PHONY: help clean man html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
@@ -40,7 +46,7 @@ clean-local: clean-doctree
man: sphinx-ensure-updated man/groonga.1
-man/groonga.1: $(source_files)
+man/groonga.1: $(document_source_files)
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/man \
@@ -48,9 +54,10 @@ man/groonga.1: $(source_files)
$(ALLSPHINXOPTS) \
man
-html: sphinx-ensure-updated html/index.html
+html: generate-html
+generate-html: sphinx-ensure-updated html/index.html
-html/index.html: $(source_files)
+html/index.html: $(document_source_files)
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/html \
@@ -60,7 +67,7 @@ html/index.html: $(source_files)
dirhtml: sphinx-ensure-updated dirhtml/index.html
-dirhtml/index.html: $(source_files)
+dirhtml/index.html: $(document_source_files)
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/dirhtml \
@@ -70,7 +77,7 @@ dirhtml/index.html: $(source_files)
pickle: sphinx-ensure-updated pickle/index.fpickle
-pickle/index.fpickle: $(source_files)
+pickle/index.fpickle: $(document_source_files)
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/pickle \
@@ -80,7 +87,7 @@ pickle/index.fpickle: $(source_files)
json: sphinx-ensure-updated json/index.fjson
-json/index.fjson: $(source_files)
+json/index.fjson: $(document_source_files)
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/json \
@@ -90,7 +97,7 @@ json/index.fjson: $(source_files)
htmlhelp: sphinx-ensure-updated htmlhelp/index.html
-htmlhelp/index.html: $(source_files)
+htmlhelp/index.html: $(document_source_files)
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/htmlhelp \
@@ -150,7 +157,7 @@ changes: sphinx-ensure-updated
linkcheck: sphinx-ensure-updated linkcheck/output.txt
-linkcheck/output.txt: $(source_files)
+linkcheck/output.txt: $(document_source_files)
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
-d $(DOCTREES_BASE)/linkcheck \
Modified: configure.ac (+2 -1)
===================================================================
--- configure.ac 2011-05-18 02:43:17 +0000 (996f5a2)
+++ configure.ac 2011-05-18 03:18:17 +0000 (9dd1281)
@@ -135,7 +135,8 @@ AC_CONFIG_FILES([Makefile
data/init.d/redhat/sysconfig/Makefile
tools/Makefile
doc/Makefile
- doc/ja/Makefile
+ doc/locale/Makefile
+ doc/locale/ja/Makefile
doc/locale/ja/LC_MESSAGES/Makefile
test/Makefile
test/unit/Makefile
Modified: doc/Makefile.am (+2 -1)
===================================================================
--- doc/Makefile.am 2011-05-18 02:43:17 +0000 (3b65f88)
+++ doc/Makefile.am 2011-05-18 03:18:17 +0000 (771bd73)
@@ -1,4 +1,5 @@
-SUBDIRS = ja
+SUBDIRS = \
+ locale
docdir = $(pkgdatadir)/doc
Added: doc/locale/Makefile.am (+4 -0) 100644
===================================================================
--- /dev/null
+++ doc/locale/Makefile.am 2011-05-18 03:18:17 +0000 (3486a19)
@@ -0,0 +1,4 @@
+include $(abs_top_srcdir)/build/makefiles/locale.mk
+
+# SUBDIRS = $(LOCALES)
+SUBDIRS = ja
Renamed: doc/locale/ja/Makefile.am (+2 -0) 74%
===================================================================
--- doc/ja/Makefile.am 2011-05-18 02:43:17 +0000 (7b22898)
+++ doc/locale/ja/Makefile.am 2011-05-18 03:18:17 +0000 (d4e57e1)
@@ -1,3 +1,5 @@
+SUBDIRS = LC_MESSAGES
+
DOC_LANGUAGE = ja
include $(top_srcdir)/build/makefiles/sphinx.mk