[Chinese-commits] [manpages-zh] 25/31: Use opencc; drop totw.pl and perl dependency
Boyuan Yang
hosiet-guest at moszumanska.debian.org
Sat Dec 24 14:25:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
hosiet-guest pushed a commit to branch master
in repository manpages-zh.
commit 78209b47e70785142301a4e702d91b870ac492f0
Author: Boyuan Yang <073plan at gmail.com>
Date: Fri Dec 23 00:12:17 2016 +0800
Use opencc; drop totw.pl and perl dependency
---
ChangeLog | 1 +
README.md | 4 +---
configure.ac | 31 +++++++++++--------------------
src/man1/zh_CN/Makefile.am | 2 +-
src/man1/zh_TW/Makefile.am | 2 +-
src/man2/zh_CN/Makefile.am | 2 +-
src/man2/zh_TW/Makefile.am | 2 +-
src/man3/zh_CN/Makefile.am | 2 +-
src/man3/zh_TW/Makefile.am | 2 +-
src/man4/zh_CN/Makefile.am | 2 +-
src/man4/zh_TW/Makefile.am | 2 +-
src/man5/zh_CN/Makefile.am | 2 +-
src/man5/zh_TW/Makefile.am | 2 +-
src/man6/zh_CN/Makefile.am | 2 +-
src/man6/zh_TW/Makefile.am | 2 +-
src/man7/zh_CN/Makefile.am | 2 +-
src/man7/zh_TW/Makefile.am | 2 +-
src/man8/zh_CN/Makefile.am | 2 +-
src/man8/zh_TW/Makefile.am | 2 +-
src/mann/zh_CN/Makefile.am | 11 ++---------
src/mann/zh_TW/Makefile.am | 11 ++---------
21 files changed, 33 insertions(+), 57 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 95e082b..d5fc1b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2016-12-23 Boyuan Yang <073plan at gmail.com>
* Remove support for non-UTF8 encoding.
+ * Replace totw.pl with opencc 1.x.
2016-12-22 Boyuan Yang <073plan at gmail.com>
diff --git a/README.md b/README.md
index 5c6cd97..1feb20e 100644
--- a/README.md
+++ b/README.md
@@ -30,10 +30,8 @@
构建依赖包括：
* autotools (autoconf, automake)
-* perl
* python3
-* zh-autoconvert
-* iconv
+* opencc 1.x
### 从 Linux 发行版安装
diff --git a/configure.ac b/configure.ac
index ea76a00..ff8603b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,11 @@ AS_IF([test "x${append_colophon}" = "xtrue"],
],
[])
+AC_CHECK_PROG([HAVE_OPENCC], [opencc], [yes], [no])
+AS_IF([test "x${HAVE_OPENCC}" = "xno"],
+ [AC_MSG_ERROR([you need to install opencc to build the package.])],
+ [])
+
AC_ARG_ENABLE([zhtw],
[AS_HELP_STRING([--disable-zhtw],
[do not generate manpages for zh_TW])],
@@ -38,22 +43,9 @@ AC_ARG_ENABLE([zhtw],
esac],
[zhtw=true]
)
-if test x$zhtw = xtrue; then
-AC_PATH_PROG([AUTOB5], [autob5])
-if test x$AUTOB5 = x; then
- AC_MSG_ERROR([cannot find autob5, you can install zh-autoconvert from http://ftp.debian.org/debian/pool/main/z/zh-autoconvert, or use --disable-zhtw])
-fi
-AC_PATH_PROG([ICONV], [iconv])
-if test x$ICONV = x; then
- AC_MSG_ERROR([cannot find iconv, you can use --disable-zhtw])
-fi
-AC_PATH_PROG([PERL], [perl])
-if test x$PERL = x; then
- AC_MSG_ERROR([cannot find perl, you can use --disable-zhtw])
-fi
-zh_TW=zh_TW
-AC_SUBST(zh_TW)
-fi
+AS_IF([test "x${zhtw}" = "xtrue"],
+ [zh_TW=zh_TW; AC_SUBST([zh_TW])],
+ [])
AC_ARG_ENABLE([zhcn],
[AS_HELP_STRING([--disable-zhcn],
@@ -65,10 +57,9 @@ AC_ARG_ENABLE([zhcn],
esac],
[zhcn=true]
)
-if test x$zhcn = xtrue; then
- zh_CN=zh_CN
- AC_SUBST(zh_CN)
-fi
+AS_IF([test "x${zhcn}" = "xtrue"],
+ [zh_CN=zh_CN; AC_SUBST([zh_CN])],
+ [])
AC_CONFIG_FILES([Makefile
DOCS/Makefile
diff --git a/src/man1/zh_CN/Makefile.am b/src/man1/zh_CN/Makefile.am
index 9219098..b1adc1a 100644
--- a/src/man1/zh_CN/Makefile.am
+++ b/src/man1/zh_CN/Makefile.am
@@ -11,7 +11,7 @@ endif
man_MANS = $(MANPAGES)
%.1: $(srcdir)/../%.1
- $(APPEND_COLOPHON) < $< > $@
+ $(APPEND_COLOPHON) < $< | opencc -c t2s.json > $@
clean-local:
rm -f $(man_MANS)
diff --git a/src/man1/zh_TW/Makefile.am b/src/man1/zh_TW/Makefile.am
index b33a936..19e2542 100644
--- a/src/man1/zh_TW/Makefile.am
+++ b/src/man1/zh_TW/Makefile.am
@@ -11,7 +11,7 @@ endif
man_MANS = $(MANPAGES)
%.1: $(srcdir)/../%.1
- $(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl | iconv -f big5 -t utf8 > $@
+ $(APPEND_COLOPHON) < $< | opencc -c s2t.json > $@
clean-local:
rm -f $(man_MANS)
diff --git a/src/man2/zh_CN/Makefile.am b/src/man2/zh_CN/Makefile.am
index 49986ed..b37499a 100644
--- a/src/man2/zh_CN/Makefile.am
+++ b/src/man2/zh_CN/Makefile.am
@@ -11,7 +11,7 @@ endif
man_MANS = $(MANPAGES)
%.2: $(srcdir)/../%.2
- $(APPEND_COLOPHON) < $< > $@
+ $(APPEND_COLOPHON) < $< | opencc -c t2s.json > $@
clean-local:
rm -f $(man_MANS)
diff --git a/src/man2/zh_TW/Makefile.am b/src/man2/zh_TW/Makefile.am
index 8b85560..bf6985d 100644
--- a/src/man2/zh_TW/Makefile.am
+++ b/src/man2/zh_TW/Makefile.am
@@ -11,7 +11,7 @@ endif
man_MANS = $(MANPAGES)
%.2: $(srcdir)/../%.2
- $(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl | iconv -f big5 -t utf8 > $@
+ $(APPEND_COLOPHON) < $< | opencc -c s2t.json > $@
clean-local:
rm -f $(man_MANS)
diff --git a/src/man3/zh_CN/Makefile.am b/src/man3/zh_CN/Makefile.am
index ba961c9..e996472 100644
--- a/src/man3/zh_CN/Makefile.am
+++ b/src/man3/zh_CN/Makefile.am
@@ -11,7 +11,7 @@ endif
man_MANS = $(MANPAGES)
%.3: $(srcdir)/../%.3
- $(APPEND_COLOPHON) < $< > $@
+ $(APPEND_COLOPHON) < $< | opencc -c t2s.json > $@
clean-local:
rm -f $(man_MANS)
diff --git a/src/man3/zh_TW/Makefile.am b/src/man3/zh_TW/Makefile.am
index 99cdb8e..dc1335c 100644
--- a/src/man3/zh_TW/Makefile.am
+++ b/src/man3/zh_TW/Makefile.am
@@ -11,7 +11,7 @@ endif
man_MANS = $(MANPAGES)
%.3: $(srcdir)/../%.3
- $(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl | iconv -f big5 -t utf8 > $@
+ $(APPEND_COLOPHON) < $< | opencc -c s2t.json > $@
clean-local:
rm -f $(man_MANS)
diff --git a/src/man4/zh_CN/Makefile.am b/src/man4/zh_CN/Makefile.am
index c9a8be5..533c984 100644
--- a/src/man4/zh_CN/Makefile.am
+++ b/src/man4/zh_CN/Makefile.am
@@ -11,7 +11,7 @@ endif
man_MANS = $(MANPAGES)
%.4: $(srcdir)/../%.4
- $(APPEND_COLOPHON) < $< > $@
+ $(APPEND_COLOPHON) < $< | opencc -c t2s.json > $@
clean-local:
rm -f $(man_MANS)
diff --git a/src/man4/zh_TW/Makefile.am b/src/man4/zh_TW/Makefile.am
index 36edeca..504bea6 100644
--- a/src/man4/zh_TW/Makefile.am
+++ b/src/man4/zh_TW/Makefile.am
@@ -11,7 +11,7 @@ endif
man_MANS = $(MANPAGES)
%.4: $(srcdir)/../%.4
- $(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl | iconv -f big5 -t utf8 > $@
+ $(APPEND_COLOPHON) < $< | opencc -c s2t.json > $@
clean-local:
rm -f $(man_MANS)
diff --git a/src/man5/zh_CN/Makefile.am b/src/man5/zh_CN/Makefile.am
index b18ef82..d110342 100644
--- a/src/man5/zh_CN/Makefile.am
+++ b/src/man5/zh_CN/Makefile.am
@@ -11,7 +11,7 @@ endif
man_MANS = $(MANPAGES)
%.5: $(srcdir)/../%.5
- $(APPEND_COLOPHON) < $< > $@
+ $(APPEND_COLOPHON) < $< | opencc -c t2s.json > $@
clean-local:
rm -f $(man_MANS)
diff --git a/src/man5/zh_TW/Makefile.am b/src/man5/zh_TW/Makefile.am
index bb9b691..ecbea1d 100644
--- a/src/man5/zh_TW/Makefile.am
+++ b/src/man5/zh_TW/Makefile.am
@@ -11,7 +11,7 @@ endif
man_MANS = $(MANPAGES)
%.5: $(srcdir)/../%.5
- $(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl | iconv -f big5 -t utf8 > $@
+ $(APPEND_COLOPHON) < $< | opencc -c s2t.json > $@
clean-local:
rm -f $(man_MANS)
diff --git a/src/man6/zh_CN/Makefile.am b/src/man6/zh_CN/Makefile.am
index 82eacf4..7c2bf02 100644
--- a/src/man6/zh_CN/Makefile.am
+++ b/src/man6/zh_CN/Makefile.am
@@ -11,7 +11,7 @@ endif
man_MANS = $(MANPAGES)
%.6: $(srcdir)/../%.6
- $(APPEND_COLOPHON) < $< > $@
+ $(APPEND_COLOPHON) < $< | opencc -c t2s.json > $@
clean-local:
rm -f $(man_MANS)
diff --git a/src/man6/zh_TW/Makefile.am b/src/man6/zh_TW/Makefile.am
index 9f8c693..c3d9987 100644
--- a/src/man6/zh_TW/Makefile.am
+++ b/src/man6/zh_TW/Makefile.am
@@ -11,7 +11,7 @@ endif
man_MANS = $(MANPAGES)
%.6: $(srcdir)/../%.6
- $(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl | iconv -f big5 -t utf8 > $@
+ $(APPEND_COLOPHON) < $< | opencc -c s2t.json > $@
clean-local:
rm -f $(man_MANS)
diff --git a/src/man7/zh_CN/Makefile.am b/src/man7/zh_CN/Makefile.am
index 5b74050..8d730c0 100644
--- a/src/man7/zh_CN/Makefile.am
+++ b/src/man7/zh_CN/Makefile.am
@@ -11,7 +11,7 @@ endif
man_MANS = $(MANPAGES)
%.7: $(srcdir)/../%.7
- $(APPEND_COLOPHON) < $< > $@
+ $(APPEND_COLOPHON) < $< | opencc -c t2s.json > $@
clean-local:
rm -f $(man_MANS)
diff --git a/src/man7/zh_TW/Makefile.am b/src/man7/zh_TW/Makefile.am
index 7abdad9..0aa1b2e 100644
--- a/src/man7/zh_TW/Makefile.am
+++ b/src/man7/zh_TW/Makefile.am
@@ -11,7 +11,7 @@ endif
man_MANS = $(MANPAGES)
%.7: $(srcdir)/../%.7
- $(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl | iconv -f big5 -t utf8 > $@
+ $(APPEND_COLOPHON) < $< | opencc -c s2t.json > $@
clean-local:
rm -f $(man_MANS)
diff --git a/src/man8/zh_CN/Makefile.am b/src/man8/zh_CN/Makefile.am
index fa669ce..2aaa122 100644
--- a/src/man8/zh_CN/Makefile.am
+++ b/src/man8/zh_CN/Makefile.am
@@ -11,7 +11,7 @@ endif
man_MANS = $(MANPAGES)
%.8: $(srcdir)/../%.8
- $(APPEND_COLOPHON) < $< > $@
+ $(APPEND_COLOPHON) < $< | opencc -c t2s.json > $@
clean-local:
rm -f $(man_MANS)
diff --git a/src/man8/zh_TW/Makefile.am b/src/man8/zh_TW/Makefile.am
index b5c0bec..f9339db 100644
--- a/src/man8/zh_TW/Makefile.am
+++ b/src/man8/zh_TW/Makefile.am
@@ -11,7 +11,7 @@ endif
man_MANS = $(MANPAGES)
%.8: $(srcdir)/../%.8
- $(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl | iconv -f big5 -t utf8 > $@
+ $(APPEND_COLOPHON) < $< | opencc -c s2t.json > $@
clean-local:
rm -f $(man_MANS)
diff --git a/src/mann/zh_CN/Makefile.am b/src/mann/zh_CN/Makefile.am
index 87eb43e..9b08bf2 100644
--- a/src/mann/zh_CN/Makefile.am
+++ b/src/mann/zh_CN/Makefile.am
@@ -10,17 +10,10 @@ endif
man_MANS = $(MANPAGES)
-if UTF8
%tcl: $(srcdir)/../%tcl
- $(APPEND_COLOPHON) < $< > $@
+ $(APPEND_COLOPHON) < $< | opencc -c t2s.json > $@
%tk: $(srcdir)/../%tk
- $(APPEND_COLOPHON) < $< > $@
-else !UTF8
-%tcl: $(srcdir)/../%tcl
- $(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk -o $@
-%tk: $(srcdir)/../%tk
- $(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk -o $@
-endif
+ $(APPEND_COLOPHON) < $< | opencc -c t2s.json > $@
clean-local:
rm -f $(man_MANS)
diff --git a/src/mann/zh_TW/Makefile.am b/src/mann/zh_TW/Makefile.am
index e74c958..cec097f 100644
--- a/src/mann/zh_TW/Makefile.am
+++ b/src/mann/zh_TW/Makefile.am
@@ -10,17 +10,10 @@ endif
man_MANS = $(MANPAGES)
-if UTF8
%tcl: $(srcdir)/../%tcl
- $(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl | iconv -f big5 -t utf8 > $@
+ $(APPEND_COLOPHON) < $< | opencc -c s2t.json > $@
%tk: $(srcdir)/../%tk
- $(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl | iconv -f big5 -t utf8 > $@
-else
-%tcl: $(srcdir)/../%tcl
- $(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl > $@
-%tk: $(srcdir)/../%tk
- $(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl > $@
-endif
+ $(APPEND_COLOPHON) < $< | opencc -c s2t.json > $@
clean-local:
rm -f $(man_MANS)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/manpages-zh.git
More information about the Chinese-commits
mailing list