summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore5
-rw-r--r--Makefile75
-rw-r--r--deps.mk25
-rw-r--r--doc/cracha.en.0.adoc5
-rwxr-xr-xmkdeps.sh32
-rw-r--r--po/cracha/cracha.pot9
-rw-r--r--po/cracha/de.po9
-rw-r--r--po/cracha/eo.po9
-rw-r--r--po/cracha/es.po9
-rw-r--r--po/cracha/fr.po9
-rw-r--r--po/cracha/po4a.cfg3
-rw-r--r--po/cracha/pt.po9
-rw-r--r--po/doc/de.po22
-rw-r--r--po/doc/doc.pot21
-rw-r--r--po/doc/eo.po22
-rw-r--r--po/doc/es.po22
-rw-r--r--po/doc/fr.po22
-rw-r--r--po/doc/note.txt5
-rw-r--r--po/doc/po4a.cfg5
-rw-r--r--po/doc/pt.po22
-rw-r--r--src/cracha.go3
21 files changed, 310 insertions, 33 deletions
diff --git a/.gitignore b/.gitignore
index 83a2521..3c4a921 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
-/src/version.go
+/doc/*
+!/doc/*.en.*.adoc
+/po/*/*.mo
+/src/meta.go
/*.bin
/*.db*
/src/*.a
diff --git a/Makefile b/Makefile
index 8cf4232..b3b4d30 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@ DATE = 1970-01-01
VERSION = 0.1.0
NAME = cracha
NAME_UC = $(NAME)
-LANGUAGES = en
## Installation prefix. Defaults to "/usr".
PREFIX = /usr
BINDIR = $(PREFIX)/bin
@@ -20,45 +19,58 @@ DESTDIR =
LDLIBS = --static -lscrypt-kdf -lsqlite3 -lm
GOCFLAGS = -I $(GOLIBDIR)
GOLDFLAGS = -L $(GOLIBDIR)
+N = `nproc`
.SUFFIXES:
-.SUFFIXES: .go .a .bin .bin-check
+.SUFFIXES: .go .a .bin .bin-check .adoc .po .mo
.go.a:
go tool compile -I $(@D) $(GOCFLAGS) -o $@ -p $(*F) \
`find $< $$(if [ $(*F) != main ]; then \
- echo src/$(NAME).go src/version.go; fi) | uniq`
+ echo src/$(NAME).go src/meta.go; fi) | uniq`
.a.bin:
go tool link -L $(@D) $(GOLDFLAGS) -o $@ --extldflags '$(LDLIBS)' $<
+.adoc:
+ asciidoctor -b manpage -o $@ $<
+
+.po.mo:
+ msgfmt -cfv -o $@ $<
+
all:
include deps.mk
-libs.a = $(libs.go:.go=.a)
-mains.a = $(mains.go:.go=.a)
-mains.bin = $(mains.go:.go=.bin)
-functional-tests/lib.a = $(functional-tests/lib.go:.go=.a)
-fuzz-targets/lib.a = $(fuzz-targets/lib.go:.go=.a)
-benchmarks/lib.a = $(benchmarks/lib.go:.go=.a)
+libs.a = $(libs.go:.go=.a)
+mains.a = $(mains.go:.go=.a)
+mains.bin = $(mains.go:.go=.bin)
+functional/lib.a = $(functional/lib.go:.go=.a)
+fuzz/lib.a = $(fuzz/lib.go:.go=.a)
+benchmarks/lib.a = $(benchmarks/lib.go:.go=.a)
+manpages.N.adoc = $(manpages.en.N.adoc) $(manpages.XX.N.adoc)
+manpages.N = $(manpages.N.adoc:.adoc=)
+sources.mo = $(sources.po:.po=.mo)
sources = \
src/$(NAME).go \
- src/version.go \
+ src/meta.go \
src/main.go \
derived-assets = \
- src/version.go \
+ src/meta.go \
$(libs.a) \
$(mains.a) \
$(mains.bin) \
$(NAME).bin \
+ $(manpages.XX.N.adoc) \
+ $(manpages.N) \
+ $(sources.mo) \
side-assets = \
$(NAME).db* \
@@ -74,19 +86,24 @@ all: $(derived-assets)
$(libs.a): Makefile deps.mk
-$(libs.a): src/$(NAME).go src/version.go
+$(libs.a): src/$(NAME).go src/meta.go
-$(fuzz-targets/lib.a):
+$(fuzz/lib.a):
go tool compile $(GOCFLAGS) -o $@ -p $(NAME) -d=libfuzzer \
- $*.go src/$(NAME).go src/version.go
+ $*.go src/$(NAME).go src/meta.go
-src/version.go: Makefile
- echo 'package $(NAME); const Version = "$(VERSION)"' > $@
+src/meta.go: Makefile
+ echo 'package $(NAME)' > $@
+ echo 'const Version = "$(VERSION)"' >> $@
+ echo 'const Name = "$(NAME)"' >> $@
+ echo 'const LOCALEDIR = "$(LOCALEDIR)"' >> $@
$(NAME).bin: src/main.bin
ln -fs src/main.bin $@
+$(manpages.XX.N.adoc): po/doc/po4a.cfg
+ po4a --no-update --translate-only $@ po/doc/po4a.cfg
.PRECIOUS: tests/queries.sql
@@ -95,7 +112,7 @@ tests/queries.sql: tests/main.bin ALWAYS
tests.bin-check = \
tests/main.bin-check \
- $(functional-tests/main.go:.go=.bin-check) \
+ $(functional/main.go:.go=.bin-check) \
$(tests.bin-check):
$(EXEC)$*.bin
@@ -125,12 +142,12 @@ check: check-unit check-integration
FUZZSEC=1
-fuzz-targets/main.bin-check = $(fuzz-targets/main.go:.go=.bin-check)
-$(fuzz-targets/main.bin-check):
- $(EXEC)$*.bin --test.fuzztime=$(FUZZSEC)s \
+fuzz/main.bin-check = $(fuzz/main.go:.go=.bin-check)
+$(fuzz/main.bin-check):
+ $(EXEC)$*.bin --test.fuzztime=$(FUZZSEC)s --test.parallel=$N \
--test.fuzz='.*' --test.fuzzcachedir=tests/fuzz/corpus
-fuzz: $(fuzz-targets/main.bin-check)
+fuzz: $(fuzz/main.bin-check)
@@ -144,6 +161,17 @@ bench: $(benchmarks/main.bin-check)
+i18n-doc:
+ po4a po/doc/po4a.cfg
+
+i18n-code:
+ gotext src/$(NAME).go > po/$(NAME)/$(NAME).pot
+ po4a po/$(NAME)/po4a.cfg
+
+i18n: i18n-doc i18n-code
+
+
+
## Remove *all* derived artifacts produced during the build.
## A dedicated test asserts that this is always true.
clean:
@@ -161,6 +189,8 @@ install: all
cp $(NAME).bin '$(DESTDIR)$(BINDIR)'/$(NAME)
cp src/$(NAME).a '$(DESTDIR)$(GOLIBDIR)'
cp $(sources) '$(DESTDIR)$(SRCDIR)'
+ instool '$(DESTDIR)$(MANDIR)' install man $(manpages.N)
+ instool '$(DESTDIR)$(LOCALEDIR)' install mo $(sources.mo)
## Uninstalls from $(DESTDIR)$(PREFIX). This is a perfect mirror
## of the "install" target, and removes *all* that was installed.
@@ -171,6 +201,9 @@ uninstall:
'$(DESTDIR)$(GOLIBDIR)'/$(NAME).a \
'$(DESTDIR)$(SRCDIR)' \
+ instool '$(DESTDIR)$(MANDIR)' uninstall man $(manpages.N)
+ instool '$(DESTDIR)$(LOCALEDIR)' uninstall mo $(sources.mo)
+
ALWAYS:
diff --git a/deps.mk b/deps.mk
index 02e3841..c2cd309 100644
--- a/deps.mk
+++ b/deps.mk
@@ -12,16 +12,33 @@ mains.go = \
tests/fuzz/api/main.go \
tests/main.go \
-functional-tests/lib.go = \
+manpages.en.N.adoc = \
+ doc/cracha.en.0.adoc \
+
+manpages.XX.N.adoc = \
+ doc/cracha.de.0.adoc \
+ doc/cracha.eo.0.adoc \
+ doc/cracha.es.0.adoc \
+ doc/cracha.fr.0.adoc \
+ doc/cracha.pt.0.adoc \
+
+sources.po = \
+ po/cracha/de.po \
+ po/cracha/eo.po \
+ po/cracha/es.po \
+ po/cracha/fr.po \
+ po/cracha/pt.po \
+
+functional/lib.go = \
tests/functional/register-twice/cracha.go \
-functional-tests/main.go = \
+functional/main.go = \
tests/functional/register-twice/main.go \
-fuzz-targets/lib.go = \
+fuzz/lib.go = \
tests/fuzz/api/cracha.go \
-fuzz-targets/main.go = \
+fuzz/main.go = \
tests/fuzz/api/main.go \
benchmarks/lib.go = \
diff --git a/doc/cracha.en.0.adoc b/doc/cracha.en.0.adoc
new file mode 100644
index 0000000..2ef2502
--- /dev/null
+++ b/doc/cracha.en.0.adoc
@@ -0,0 +1,5 @@
+= cracha(0)
+
+== NAME
+
+cracha - .
diff --git a/mkdeps.sh b/mkdeps.sh
index e8da8a4..ae6fffc 100755
--- a/mkdeps.sh
+++ b/mkdeps.sh
@@ -5,21 +5,41 @@ export LANG=POSIX.UTF-8
libs() {
- find src tests -name '*.go' | grep -v '/main\.go$' |
- grep -v '/version\.go$'
+ find src tests -name '*.go' |
+ grep -Ev '/(main|meta)\.go$' |
+ grep -Ev '/_cgo_(import|gotypes)\.go$' |
+ grep -Ev '\.cgo1\.go$'
}
mains() {
find src tests -name '*.go' | grep '/main\.go$'
}
+docs() {
+ find doc/*.en.*.adoc
+}
+
+xdocs() {
+ for l in `find po/doc/*.po | xargs -I% basename % .po`; do
+ docs | sed 's|/\(.*\)\.en\.\(.*\)$|/\1.'"$l"'.\2|'
+ done
+}
+
+pos() {
+ find po/ -name '*.po' | grep -Ev '^po/(doc|tests)/'
+}
+
+
libs | varlist 'libs.go'
mains | varlist 'mains.go'
+docs | varlist 'manpages.en.N.adoc'
+xdocs | varlist 'manpages.XX.N.adoc'
+pos | varlist 'sources.po'
-find tests/functional/*/*.go -not -name main.go | varlist 'functional-tests/lib.go'
-find tests/functional/*/main.go | varlist 'functional-tests/main.go'
-find tests/fuzz/*/*.go -not -name main.go | varlist 'fuzz-targets/lib.go'
-find tests/fuzz/*/main.go | varlist 'fuzz-targets/main.go'
+find tests/functional/*/*.go -not -name main.go | varlist 'functional/lib.go'
+find tests/functional/*/main.go | varlist 'functional/main.go'
+find tests/fuzz/*/*.go -not -name main.go | varlist 'fuzz/lib.go'
+find tests/fuzz/*/main.go | varlist 'fuzz/main.go'
find tests/benchmarks/*/*.go -not -name main.go | varlist 'benchmarks/lib.go'
find tests/benchmarks/*/main.go | varlist 'benchmarks/main.go'
diff --git a/po/cracha/cracha.pot b/po/cracha/cracha.pot
new file mode 100644
index 0000000..b1472e9
--- /dev/null
+++ b/po/cracha/cracha.pot
@@ -0,0 +1,9 @@
+msgid ""
+msgstr ""
+"Language: \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#: src/cracha.go:40
+msgid "cracha: password confirmation mismatch"
+msgstr ""
+
diff --git a/po/cracha/de.po b/po/cracha/de.po
new file mode 100644
index 0000000..6f8be5d
--- /dev/null
+++ b/po/cracha/de.po
@@ -0,0 +1,9 @@
+msgid ""
+msgstr ""
+"Language: de\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/cracha.go:40
+msgid "cracha: password confirmation mismatch"
+msgstr ""
diff --git a/po/cracha/eo.po b/po/cracha/eo.po
new file mode 100644
index 0000000..200201e
--- /dev/null
+++ b/po/cracha/eo.po
@@ -0,0 +1,9 @@
+msgid ""
+msgstr ""
+"Language: eo\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/cracha.go:40
+msgid "cracha: password confirmation mismatch"
+msgstr ""
diff --git a/po/cracha/es.po b/po/cracha/es.po
new file mode 100644
index 0000000..d612031
--- /dev/null
+++ b/po/cracha/es.po
@@ -0,0 +1,9 @@
+msgid ""
+msgstr ""
+"Language: es\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/cracha.go:40
+msgid "cracha: password confirmation mismatch"
+msgstr ""
diff --git a/po/cracha/fr.po b/po/cracha/fr.po
new file mode 100644
index 0000000..e784379
--- /dev/null
+++ b/po/cracha/fr.po
@@ -0,0 +1,9 @@
+msgid ""
+msgstr ""
+"Language: fr\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: src/cracha.go:40
+msgid "cracha: password confirmation mismatch"
+msgstr ""
diff --git a/po/cracha/po4a.cfg b/po/cracha/po4a.cfg
new file mode 100644
index 0000000..11da940
--- /dev/null
+++ b/po/cracha/po4a.cfg
@@ -0,0 +1,3 @@
+[options] --keep 0 --master-charset UTF-8 --localized-charset UTF-8 --addendum-charset UTF-8
+
+[po_directory] po/cracha
diff --git a/po/cracha/pt.po b/po/cracha/pt.po
new file mode 100644
index 0000000..8794373
--- /dev/null
+++ b/po/cracha/pt.po
@@ -0,0 +1,9 @@
+msgid ""
+msgstr ""
+"Language: pt\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/cracha.go:40
+msgid "cracha: password confirmation mismatch"
+msgstr ""
diff --git a/po/doc/de.po b/po/doc/de.po
new file mode 100644
index 0000000..2090ff3
--- /dev/null
+++ b/po/doc/de.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Language: de\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Title =
+#: doc/cracha.en.0.adoc:1
+#, no-wrap
+msgid "cracha(0)"
+msgstr ""
+
+#. type: Title ==
+#: doc/cracha.en.0.adoc:3
+#, no-wrap
+msgid "NAME"
+msgstr ""
+
+#. type: Plain text
+#: doc/cracha.en.0.adoc:5
+msgid "cracha - ."
+msgstr ""
diff --git a/po/doc/doc.pot b/po/doc/doc.pot
new file mode 100644
index 0000000..e52e07d
--- /dev/null
+++ b/po/doc/doc.pot
@@ -0,0 +1,21 @@
+msgid ""
+msgstr ""
+"Language: \n"
+"Content-Type: text/plain; charset=UTF-8\n"
+
+#. type: Title =
+#: doc/cracha.en.0.adoc:1
+#, no-wrap
+msgid "cracha(0)"
+msgstr ""
+
+#. type: Title ==
+#: doc/cracha.en.0.adoc:3
+#, no-wrap
+msgid "NAME"
+msgstr ""
+
+#. type: Plain text
+#: doc/cracha.en.0.adoc:5
+msgid "cracha - ."
+msgstr ""
diff --git a/po/doc/eo.po b/po/doc/eo.po
new file mode 100644
index 0000000..75cbe09
--- /dev/null
+++ b/po/doc/eo.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Language: eo\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Title =
+#: doc/cracha.en.0.adoc:1
+#, no-wrap
+msgid "cracha(0)"
+msgstr ""
+
+#. type: Title ==
+#: doc/cracha.en.0.adoc:3
+#, no-wrap
+msgid "NAME"
+msgstr ""
+
+#. type: Plain text
+#: doc/cracha.en.0.adoc:5
+msgid "cracha - ."
+msgstr ""
diff --git a/po/doc/es.po b/po/doc/es.po
new file mode 100644
index 0000000..1782f01
--- /dev/null
+++ b/po/doc/es.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Language: es\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Title =
+#: doc/cracha.en.0.adoc:1
+#, no-wrap
+msgid "cracha(0)"
+msgstr ""
+
+#. type: Title ==
+#: doc/cracha.en.0.adoc:3
+#, no-wrap
+msgid "NAME"
+msgstr ""
+
+#. type: Plain text
+#: doc/cracha.en.0.adoc:5
+msgid "cracha - ."
+msgstr ""
diff --git a/po/doc/fr.po b/po/doc/fr.po
new file mode 100644
index 0000000..2b8428c
--- /dev/null
+++ b/po/doc/fr.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Language: fr\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. type: Title =
+#: doc/cracha.en.0.adoc:1
+#, no-wrap
+msgid "cracha(0)"
+msgstr ""
+
+#. type: Title ==
+#: doc/cracha.en.0.adoc:3
+#, no-wrap
+msgid "NAME"
+msgstr ""
+
+#. type: Plain text
+#: doc/cracha.en.0.adoc:5
+msgid "cracha - ."
+msgstr ""
diff --git a/po/doc/note.txt b/po/doc/note.txt
new file mode 100644
index 0000000..45279a4
--- /dev/null
+++ b/po/doc/note.txt
@@ -0,0 +1,5 @@
+PO4A-HEADER: mode=eof
+
+
+
+// Generated from po4a(1).
diff --git a/po/doc/po4a.cfg b/po/doc/po4a.cfg
new file mode 100644
index 0000000..52b8449
--- /dev/null
+++ b/po/doc/po4a.cfg
@@ -0,0 +1,5 @@
+[options] --keep 0 --master-charset UTF-8 --localized-charset UTF-8 --addendum-charset UTF-8
+
+[po_directory] po/doc
+
+[type: asciidoc] doc/cracha.en.0.adoc $lang:doc/cracha.$lang.0.adoc
diff --git a/po/doc/pt.po b/po/doc/pt.po
new file mode 100644
index 0000000..aacee92
--- /dev/null
+++ b/po/doc/pt.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Language: pt\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Title =
+#: doc/cracha.en.0.adoc:1
+#, no-wrap
+msgid "cracha(0)"
+msgstr ""
+
+#. type: Title ==
+#: doc/cracha.en.0.adoc:3
+#, no-wrap
+msgid "NAME"
+msgstr ""
+
+#. type: Plain text
+#: doc/cracha.en.0.adoc:5
+msgid "cracha - ."
+msgstr ""
diff --git a/src/cracha.go b/src/cracha.go
index ae0a866..5ab61f4 100644
--- a/src/cracha.go
+++ b/src/cracha.go
@@ -16,6 +16,7 @@ import (
"uuid"
"scrypt"
g "gobang"
+ gt "gotext"
)
@@ -36,7 +37,7 @@ var (
SessionDuration = 7 * day
RegisterTimeout = 15 * time.Second
- ErrPassMismatch = errors.New("cracha: password confirmation mismatch")
+ ErrPassMismatch = gt.Error(gt.Gettext("cracha: password confirmation mismatch"))
ErrTooShort = errors.New("cracha: password too short")
ErrTimeout = errors.New("cracha: timeout when creating user")
ErrRegistered = errors.New("cracha: user already registered")
generated by cgit v1.2.3 (git 2.49.0) at 2025-07-05 19:54:07 +0000