build: Simplify metadata.json string extraction

Use the new JSONPath based extractor instead of marking translatable strings in metadata.json.
jg1uaa · May 11, 2015 · 0b45bb4 · 0b45bb4
1 parent 0a27a85
commit 0b45bb4
Show file tree

Hide file tree

Showing 38 changed files with 186 additions and 184 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-SUBDIRS = marisa-glib libkkc data tools tests po
+SUBDIRS = marisa-glib libkkc tools data tests po
 DISTCHECK_CONFIGURE_FLAGS = --enable-docs
 ACLOCAL_AMFLAGS = -I m4
 

diff --git a/data/rules/act/Makefile.am b/data/rules/act/Makefile.am
@@ -8,24 +8,16 @@ files =						\
 	keymap/latin.json			\
 	keymap/wide-latin.json			\
 	rom-kana/default.json			\
-	$(NULL)
-metadata_in =					\
-	metadata.json.in			\
+	metadata.json				\
 	$(NULL)
 
 nobase_rules_DATA =				\
 	$(files)				\
-	$(metadata_in:.in=)			\
 	$(NULL)
 
 EXTRA_DIST =					\
 	$(files)				\
-	$(metadata_in)				\
-	$(NULL)
-
-CLEANFILES =					\
-	metadata.json				\
 	$(NULL)
 
--include $(top_srcdir)/data/rules/rule.mk
+include $(top_srcdir)/data/rules/rule.mk
 -include $(top_srcdir)/git.mk
diff --git a/data/rules/act/metadata.json b/data/rules/act/metadata.json
@@ -0,0 +1,5 @@
+{
+    "name": "ACT",
+    "description": "Extended romaji input method based on AZIK for Dvorak keyboard layout, developed by Kiyoshi Kimura <http://hp.vector.co.jp/authors/VA002116/azik/azikindx.htm#act>",
+    "priority": 10
+}
diff --git a/data/rules/act/metadata.json.in b/data/rules/act/metadata.json.in
diff --git a/data/rules/azik-jp106/Makefile.am b/data/rules/azik-jp106/Makefile.am
@@ -8,24 +8,16 @@ files =						\
 	keymap/latin.json			\
 	keymap/wide-latin.json			\
 	rom-kana/default.json			\
-	$(NULL)
-metadata_in =					\
-	metadata.json.in			\
+	metadata.json				\
 	$(NULL)
 
 nobase_rules_DATA =				\
 	$(files)				\
-	$(metadata_in:.in=)			\
 	$(NULL)
 
 EXTRA_DIST =					\
 	$(files)				\
-	$(metadata_in)				\
-	$(NULL)
-
-CLEANFILES =					\
-	metadata.json				\
 	$(NULL)
 
--include $(top_srcdir)/data/rules/rule.mk
+include $(top_srcdir)/data/rules/rule.mk
 -include $(top_srcdir)/git.mk
diff --git a/data/rules/azik-jp106/metadata.json b/data/rules/azik-jp106/metadata.json
@@ -0,0 +1,5 @@
+{
+    "name": "AZIK (Japanese 106 keyboard)",
+    "description": "Extended romaji input method developed by Kiyoshi Kimura <http://hp.vector.co.jp/authors/VA002116/azik/azikindx.htm>",
+    "priority": 10
+}
diff --git a/data/rules/azik-jp106/metadata.json.in b/data/rules/azik-jp106/metadata.json.in
diff --git a/data/rules/azik/Makefile.am b/data/rules/azik/Makefile.am
@@ -8,24 +8,16 @@ files =						\
 	keymap/latin.json			\
 	keymap/wide-latin.json			\
 	rom-kana/default.json			\
-	$(NULL)
-metadata_in =					\
-	metadata.json.in			\
+	metadata.json				\
 	$(NULL)
 
 nobase_rules_DATA =				\
 	$(files)				\
-	$(metadata_in:.in=)			\
 	$(NULL)
 
 EXTRA_DIST =					\
 	$(files)				\
-	$(metadata_in)				\
-	$(NULL)
-
-CLEANFILES =					\
-	metadata.json				\
 	$(NULL)
 
--include $(top_srcdir)/data/rules/rule.mk
+include $(top_srcdir)/data/rules/rule.mk
 -include $(top_srcdir)/git.mk
diff --git a/data/rules/azik/metadata.json b/data/rules/azik/metadata.json
@@ -0,0 +1,5 @@
+{
+    "name": "AZIK",
+    "description": "Extended romaji input method developed by Kiyoshi Kimura <http://hp.vector.co.jp/authors/VA002116/azik/azikindx.htm>",
+    "priority": 10
+}
diff --git a/data/rules/azik/metadata.json.in b/data/rules/azik/metadata.json.in
diff --git a/data/rules/default/Makefile.am b/data/rules/default/Makefile.am
@@ -9,24 +9,16 @@ files =						\
 	keymap/wide-latin.json			\
 	keymap/direct.json			\
 	rom-kana/default.json			\
-	$(NULL)
-metadata_in =					\
-	metadata.json.in			\
+	metadata.json				\
 	$(NULL)
 
 nobase_rules_DATA =				\
 	$(files)				\
-	$(metadata_in:.in=)			\
 	$(NULL)
 
 EXTRA_DIST =					\
 	$(files)				\
-	$(metadata_in)				\
-	$(NULL)
-
-CLEANFILES =					\
-	metadata.json				\
 	$(NULL)
 
--include $(top_srcdir)/data/rules/rule.mk
+include $(top_srcdir)/data/rules/rule.mk
 -include $(top_srcdir)/git.mk
diff --git a/data/rules/default/metadata.json b/data/rules/default/metadata.json
@@ -0,0 +1,5 @@
+{
+    "name": "Default",
+    "description": "Default typing rule",
+    "priority": 99
+}
diff --git a/data/rules/default/metadata.json.in b/data/rules/default/metadata.json.in
diff --git a/data/rules/kana/Makefile.am b/data/rules/kana/Makefile.am
@@ -9,24 +9,16 @@ files =						\
 	keymap/wide-latin.json			\
 	keymap/direct.json			\
 	rom-kana/default.json			\
-	$(NULL)
-metadata_in =					\
-	metadata.json.in			\
+	metadata.json				\
 	$(NULL)
 
 nobase_rules_DATA =				\
 	$(files)				\
-	$(metadata_in:.in=)			\
 	$(NULL)
 
 EXTRA_DIST =					\
 	$(files)				\
-	$(metadata_in)				\
-	$(NULL)
-
-CLEANFILES =					\
-	metadata.json				\
 	$(NULL)
 
--include $(top_srcdir)/data/rules/rule.mk
+include $(top_srcdir)/data/rules/rule.mk
 -include $(top_srcdir)/git.mk
diff --git a/data/rules/kana/metadata.json b/data/rules/kana/metadata.json
@@ -0,0 +1,6 @@
+{
+    "name": "Kana",
+    "description": "Direct Kana typing",
+    "filter": "kana",
+    "priority": 99
+}
diff --git a/data/rules/kana/metadata.json.in b/data/rules/kana/metadata.json.in
diff --git a/data/rules/kzik/Makefile.am b/data/rules/kzik/Makefile.am
@@ -8,24 +8,16 @@ files =						\
 	keymap/latin.json			\
 	keymap/wide-latin.json			\
 	rom-kana/default.json			\
-	$(NULL)
-metadata_in =					\
-	metadata.json.in			\
+	metadata.json				\
 	$(NULL)
 
 nobase_rules_DATA =				\
 	$(files)				\
-	$(metadata_in:.in=)			\
 	$(NULL)
 
 EXTRA_DIST =					\
 	$(files)				\
-	$(metadata_in)				\
-	$(NULL)
-
-CLEANFILES =					\
-	metadata.json				\
 	$(NULL)
 
--include $(top_srcdir)/data/rules/rule.mk
+include $(top_srcdir)/data/rules/rule.mk
 -include $(top_srcdir)/git.mk
diff --git a/data/rules/kzik/metadata.json b/data/rules/kzik/metadata.json
@@ -0,0 +1,5 @@
+{
+    "name": "KZIK",
+    "description": "Extended romaji input method based on AZIK, developed by OHASHI Hideya <http://ohac.sytes.net/pukiwiki.php?kzik>",
+    "priority": 10
+}
diff --git a/data/rules/kzik/metadata.json.in b/data/rules/kzik/metadata.json.in
diff --git a/data/rules/nicola/Makefile.am b/data/rules/nicola/Makefile.am
@@ -9,24 +9,16 @@ files =						\
 	keymap/wide-latin.json			\
 	keymap/direct.json			\
 	rom-kana/default.json			\
-	$(NULL)
-metadata_in =					\
-	metadata.json.in			\
+	metadata.json				\
 	$(NULL)
 
 nobase_rules_DATA =				\
 	$(files)				\
-	$(metadata_in:.in=)			\
 	$(NULL)
 
 EXTRA_DIST =					\
 	$(files)				\
-	$(metadata_in)				\
-	$(NULL)
-
-CLEANFILES =					\
-	metadata.json				\
 	$(NULL)
 
--include $(top_srcdir)/data/rules/rule.mk
+include $(top_srcdir)/data/rules/rule.mk
 -include $(top_srcdir)/git.mk
diff --git a/data/rules/nicola/metadata.json b/data/rules/nicola/metadata.json
@@ -0,0 +1,6 @@
+{
+    "name": "NICOLA",
+    "description": "Input method using thumb shift keyboard developed by the NICOLA (NIhongo-nyuuryoku COnsortium LAyout) project <http://nicola.sunicom.co.jp/index.html>",
+    "filter": "nicola",
+    "priority": 10
+}
diff --git a/data/rules/nicola/metadata.json.in b/data/rules/nicola/metadata.json.in
diff --git a/data/rules/rule.mk b/data/rules/rule.mk
@@ -1,9 +1,12 @@
-.SUFFIXES: .json .json.in
+SUFFIXES = .json .pot
 
-edit = sed -e 's!\(^ *"[^"]*": *\)_(\("[^"]*"\))!\1\2!g'
-.json.in.json:
+.json.pot:
 	$(AM_V_GEN) rm -f $@ $@.tmp; \
 	srcdir=''; \
 	  test -f ./$< || srcdir=$(srcdir)/; \
-	  $(edit) $${srcdir}$< >$@.tmp; \
-	mv $@.tmp $@
+	  $(top_builddir)/tools/gen-metadata-pot $${srcdir}$< \
+            '$$.name' '$$.description' >$@.tmp && mv $@.tmp $@
+
+metadata.pot: metadata.json $(top_srcdir)/tools/gen-metadata-pot.c
+
+EXTRA_DIST += metadata.pot
diff --git a/data/rules/tcode/Makefile.am b/data/rules/tcode/Makefile.am
@@ -7,24 +7,16 @@ files =						\
 	keymap/latin.json			\
 	keymap/wide-latin.json			\
 	rom-kana/default.json			\
-	$(NULL)
-metadata_in =					\
-	metadata.json.in			\
+	metadata.json				\
 	$(NULL)
 
 nobase_rules_DATA =				\
 	$(files)				\
-	$(metadata_in:.in=)			\
 	$(NULL)
 
 EXTRA_DIST =					\
 	$(files)				\
-	$(metadata_in)				\
-	$(NULL)
-
-CLEANFILES =					\
-	metadata.json				\
 	$(NULL)
 
--include $(top_srcdir)/data/rules/rule.mk
+include $(top_srcdir)/data/rules/rule.mk
 -include $(top_srcdir)/git.mk
diff --git a/data/rules/tcode/metadata.json b/data/rules/tcode/metadata.json
@@ -0,0 +1,5 @@
+{
+    "name": "T-Code",
+    "description": "Japanese direct input method developed by the T-Code project <http://openlab.jp/tcode/>",
+    "priority": 10
+}
diff --git a/data/rules/tcode/metadata.json.in b/data/rules/tcode/metadata.json.in
diff --git a/data/rules/trycode/Makefile.am b/data/rules/trycode/Makefile.am
@@ -7,24 +7,16 @@ files =						\
 	keymap/latin.json			\
 	keymap/wide-latin.json			\
 	rom-kana/default.json			\
-	$(NULL)
-metadata_in =					\
-	metadata.json.in			\
+	metadata.json				\
 	$(NULL)
 
 nobase_rules_DATA =				\
 	$(files)				\
-	$(metadata_in:.in=)			\
 	$(NULL)
 
 EXTRA_DIST =					\
 	$(files)				\
-	$(metadata_in)				\
-	$(NULL)
-
-CLEANFILES =					\
-	metadata.json				\
 	$(NULL)
 
--include $(top_srcdir)/data/rules/rule.mk
+include $(top_srcdir)/data/rules/rule.mk
 -include $(top_srcdir)/git.mk
diff --git a/data/rules/trycode/metadata.json b/data/rules/trycode/metadata.json
@@ -0,0 +1,5 @@
+{
+    "name": "TRY-CODE",
+    "description": "Japanese direct input method based on T-Code, developed by Naoto Takahashi <http://www.m17n.org/ntakahas/npx/aggressive/aggressive4.en.html>",
+    "priority": 10
+}
diff --git a/data/rules/trycode/metadata.json.in b/data/rules/trycode/metadata.json.in