From f8874763419ec8c3a1a4a01e29fa75eba4fdc0d2 Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Wed, 24 Aug 2016 21:35:22 +0800 Subject: [PATCH 1/7] Makefile: correct locale installation dir --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 43976c4..9d2b8c3 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ all: install: $(MKDIR) "$(DESTDIR)$(PREFIX)/share/danmaku2ass" $(INSTALL) -Dm0755 danmaku2ass.py "$(DESTDIR)$(PREFIX)/share/danmaku2ass/danmaku2ass.py" - $(CP) -R locale "$(DESTDIR)$(PREFIX)/share/danmaku2ass/" + $(CP) -R locale "$(DESTDIR)$(PREFIX)/share/" $(MKDIR) "$(DESTDIR)$(PREFIX)/bin" $(LN) -s "$(PREFIX)/share/danmaku2ass/danmaku2ass.py" "$(DESTDIR)$(PREFIX)/bin/danmaku2ass" From 3489fd58310f059732c74d1de342ede9b554eda5 Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Wed, 24 Aug 2016 21:35:58 +0800 Subject: [PATCH 2/7] locale: remove .mo --- locale/en/LC_MESSAGES/danmaku2ass.mo | Bin 2253 -> 0 bytes locale/ja/LC_MESSAGES/danmaku2ass.mo | Bin 2543 -> 0 bytes locale/zh_CN/LC_MESSAGES/danmaku2ass.mo | Bin 2189 -> 0 bytes locale/zh_TW/LC_MESSAGES/danmaku2ass.mo | Bin 2207 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 locale/en/LC_MESSAGES/danmaku2ass.mo delete mode 100644 locale/ja/LC_MESSAGES/danmaku2ass.mo delete mode 100644 locale/zh_CN/LC_MESSAGES/danmaku2ass.mo delete mode 100644 locale/zh_TW/LC_MESSAGES/danmaku2ass.mo diff --git a/locale/en/LC_MESSAGES/danmaku2ass.mo b/locale/en/LC_MESSAGES/danmaku2ass.mo deleted file mode 100644 index 17490beef7415f44db29187e8aa47520f08d651f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2253 zcmeH`zi%8x6vv0e{K!EF5TPI2^N1EH6Jx{#1 zvznPTHbNALDoO!D^pR5K4@f#hL=pagbQBa6X%Zp2G!%T_-kxnx6k3Xm?(Ju1?#!4j$Q!7~rP` zTi{EW```$;3|7H!iuIqs1DM}0_$&Ax=6`^P!MzAZ`;UXKf+xT+@H99KMj*w#0lp00 z0r6u$;z9ZS3?2l32VVo96zf9}L-XU{Utk4%102K0@XF4Bq_YlEoDN7jzXnO?T@azz z!-9`M{Mes(P(DvU(#eq&tuKS5vr}*#B%Rkm(s>&szk49*`~@VP55Qq?*DL+FBOsR8 zXCQt5GD!Jd1xe>uAnE$PSif1!?}60PcVLtU`R*L=VsZoqw>&;+r#NT>I|QRabs3Dk z#mjz>&Ii@51bZ7sgU%BT(n5o@QNE=0E!gX@eJ~n(`d~Oh5INhr;E!@E66;xMRK%v| z78=uRM)!I$aXeD7_*28fsxKs84*N@0K5SQ5Ei=L?op2p- z8yFqOD(Ui|2pKAy#$xkXdz^~n|L~t}&ea(ukH_NtG$4>_NV$g6$-r&x&m~0K^n|1I z*lhkvxv3=03W*~kbGpCr%V9gZBf0HAR#>CnJm2tHGg%k03I|_6RP&TIyR~LyH;aYg zaw9dUAS#n5G6-Xx=*ql~d8F2ozp&)9R^|rTu|*kX0s62ix#;N(RY&$kJuO$Lavnli z9%XS1_kVwn%7QvLX|}e(3k_eFyc3ILjiXx>zN4MfJqk~=JS=P1XId9(ZPspHsk3$} z0~Kxddmjm8_0Qh7x5S{lJXISqw#=6sNI4aOa+_=^SxfZi$sm#b5!=z9OU;_!*eFW9 zVDvRK(`$y_MQQq_tBIs1*0PD|cDuAFQ*E3#Z@Vh=&ShQe`MSzW3oYN9F)}}eUQIYz z^l$l}~k)D-AAZL&odUsX#oxo6qm&|LAW14YUDGzyJUM diff --git a/locale/ja/LC_MESSAGES/danmaku2ass.mo b/locale/ja/LC_MESSAGES/danmaku2ass.mo deleted file mode 100644 index 8f6018ba45768a6c519020b41e951276c34fc1ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2543 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 Q!SKxXY;b1g`(Y^i7fs{f#sB~S diff --git a/locale/zh_TW/LC_MESSAGES/danmaku2ass.mo b/locale/zh_TW/LC_MESSAGES/danmaku2ass.mo deleted file mode 100644 index ce7d6d132bbb32e962106eeb96263a9123539edb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2207 zcmaiz`)?Fg6vwYxU#s}QC-}NX8fnNtA3^H+h@}s@NNMRVlGqS4-MzaVnVs3p16$$` zqUbh((qddn0g+090+yDjp)M^X{=omBKM-S>ncc+TkN#xzdv<2aQjFZ}-OtRObI$#q zbMC#iv?|9iUch`Fv+6F!YQR508Y6cz_BeO|ycawHlHD2bCGaZP0J`8BaQQum0d5S~ z3EqeI7`PJb0mI;)VEqdC1m3R({1to=?>E4w!6gVr{wu(Tz*XRCa2;3;CP9k354<1z z5yX$pj=LKGg^Mv&^bC14y}j&~b;1{?v&ZW1J2)8NbC97y%J29ln?L9$!+ zfKLvRzE?r|z5!ec#z7A51mVI)L24=GNcEaZ}CU4r){{G~9jHn+1D+mJ0q z*SMbKX57$KRnbyB9)wINW=53<{?Er!RP_$_ZIMl_jKt%wyQ2w^AvHl-6T%X4Yr(&i zLQ*%Qw@BD=^r261Ij!5M zI@AaCG`WH*mqI8ePui*q^Tqp7Sx^T{7z=K&Lc@0o-mA*m4vub7_+H(z^fZO1w^CRZ zZEfz{+!AHc$os7(l1n##Y8_OXXLnI4X~}+4o&|^ zD+}?DSVe!fMOtF*{Xwa_4E;kiQ;H;{_k`h>u0__;@(#PcDH;uRi;QkqQiqvR64H7* zWlAwU%tKwBF{#-QrBf)i$d(B6`r5kJq}oQQu7TIR9$vd{Rc&K!ZD^BhT2jow@mFO_ zH^LnH4ZhyM0aRqv`OS1)L;c!@clvZIjRUqCMSmMkTFOSx!hBcX2eECTjz~xAO?h>z zYeUVr8Mr=DY#;+G3+b=HnOC$oc)U+GOkurcTS=+$rX49r3PWnu;(7wNCCnRp6)RM} zpB)OWk*OywzOheesdk|R_tcrm7EbLhjODzMFTBHhocTfLr<{BCD|dX56_1Y;Ca0XK zQRmoRXX3OoGt7JZH9CIVnS1H7vp46v6vwB%iM%`ZX)$;4R;%LIN8PD!?_?Eh>2Jo| z<8#j3Fmnbc+=CY@HTfT$i3@IS^v}7&xQ&ImS?BYUzPtaG-*y+vqARar@!TONe~Ni~ z#@*bYzXb&}Zd);f6?f`H;nZ+pd=hy=oWHy8UKl)9$mX4yyfZ!P2O(A2d`Vn3U(W65 zq;Ke6x`INvvqzkn13_}R*6?gA)lnO(H8VH|CwmU!Nah z-svyh+${4oFn3?pIe$3l+{lnOdEwTcR0_sMUhbUt!*Td~N6s_%U>1(oXNQWP47-Q+ aQ<2=GXT5JuE;=55vHdbQ)8F-@pzL3EALsi3 From bb1edde8a9503291b10dce9d444a30763f32067d Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Wed, 24 Aug 2016 21:36:16 +0800 Subject: [PATCH 3/7] gitignore: filter .mo files --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cd1f2c9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.mo From 7a9206d6070415520212fcdc8815d53b38e1a5f8 Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Wed, 24 Aug 2016 21:37:41 +0800 Subject: [PATCH 4/7] po: move locale to po --- locale/en/LC_MESSAGES/danmaku2ass.po => po/en.po | 0 locale/ja/LC_MESSAGES/danmaku2ass.po => po/ja.po | 0 locale/zh_CN/LC_MESSAGES/danmaku2ass.po => po/zh_CN.po | 0 locale/zh_TW/LC_MESSAGES/danmaku2ass.po => po/zh_TW.po | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename locale/en/LC_MESSAGES/danmaku2ass.po => po/en.po (100%) rename locale/ja/LC_MESSAGES/danmaku2ass.po => po/ja.po (100%) rename locale/zh_CN/LC_MESSAGES/danmaku2ass.po => po/zh_CN.po (100%) rename locale/zh_TW/LC_MESSAGES/danmaku2ass.po => po/zh_TW.po (100%) diff --git a/locale/en/LC_MESSAGES/danmaku2ass.po b/po/en.po similarity index 100% rename from locale/en/LC_MESSAGES/danmaku2ass.po rename to po/en.po diff --git a/locale/ja/LC_MESSAGES/danmaku2ass.po b/po/ja.po similarity index 100% rename from locale/ja/LC_MESSAGES/danmaku2ass.po rename to po/ja.po diff --git a/locale/zh_CN/LC_MESSAGES/danmaku2ass.po b/po/zh_CN.po similarity index 100% rename from locale/zh_CN/LC_MESSAGES/danmaku2ass.po rename to po/zh_CN.po diff --git a/locale/zh_TW/LC_MESSAGES/danmaku2ass.po b/po/zh_TW.po similarity index 100% rename from locale/zh_TW/LC_MESSAGES/danmaku2ass.po rename to po/zh_TW.po From ebf464d7a14245dde76d4890b9eef1985fbc7531 Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Wed, 24 Aug 2016 21:49:20 +0800 Subject: [PATCH 5/7] Makefile: generate .mo files --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9d2b8c3..a8a25cd 100644 --- a/Makefile +++ b/Makefile @@ -10,18 +10,26 @@ LN=ln MKDIR=mkdir -p PYTHON=python3 RM=rm -f -v +MSGFMT=msgfmt all: + for pofiles in en ja zh_CN zh_TW; do \ + $(MSGFMT) "po/$$pofiles.po" -o "po/$$pofiles.mo" ; \ + done install: $(MKDIR) "$(DESTDIR)$(PREFIX)/share/danmaku2ass" $(INSTALL) -Dm0755 danmaku2ass.py "$(DESTDIR)$(PREFIX)/share/danmaku2ass/danmaku2ass.py" - $(CP) -R locale "$(DESTDIR)$(PREFIX)/share/" + for locale in en ja zh_CN zh_TW; do \ + $(MKDIR) "$(DESTDIR)$(PREFIX)/share/locale/$$locale/LC_MESSAGES" ; \ + $(CP) "po/$$locale.mo" "$(DESTDIR)$(PREFIX)/share/locale/$$locale/LC_MESSAGES/danmaku2ass.mo" ; \ + done $(MKDIR) "$(DESTDIR)$(PREFIX)/bin" $(LN) -s "$(PREFIX)/share/danmaku2ass/danmaku2ass.py" "$(DESTDIR)$(PREFIX)/bin/danmaku2ass" clean: $(RM) -R __pycache__ + $(RM) po/*.mo uninstall: $(RM) -R "$(DESTDIR)$(PREFIX)/bin/danmaku2ass" "$(DESTDIR)$(PREFIX)/share/danmaku2ass" From f406629fa9f1b568d2bff15d6e325b94febe3c0d Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Wed, 24 Aug 2016 21:49:54 +0800 Subject: [PATCH 6/7] PKGBUILD: adapt to msgfmt --- PKGBUILD | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/PKGBUILD b/PKGBUILD index 42b034a..8328529 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -20,6 +20,11 @@ pkgver() { git log -1 --format="%cd" --date=short | tr -d - } +build() { + cd "$srcdir/danmaku2ass" + make +} + package() { cd "$srcdir/danmaku2ass" make install DESTDIR="$pkgdir" PREFIX=/usr From bf2080ee40a040d865ae543d0ef058c47cae788a Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Wed, 24 Aug 2016 21:51:17 +0800 Subject: [PATCH 7/7] README: update installation info --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index e0b6173..b5191f9 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,20 @@ First, you will have to get the XML or JSON file from Niconico/Acfun/Bilibili, m Then, execute `danmaku2ass`. You can see further instructions below. +Installing +---------- + +You may install `danmaku2ass` with the Makefile provided. + +```sh +make +make install +``` + +`PREFIX=` is accepted by `make install` for specifying installation prefix. + +A PKGBUILD is also provided. + Example usage -------------