Skip to content

Commit 2bf1ce6

Browse files
jnavilajnavila
committed
follow renaming of doc files to adoc
Upstream man-page files have been renamed with an ".adoc" extension, in order to convey the fact they are indeed in asciidoc. We need to adapt to this new naming scheme. Signed-off-by: Jean-Noël Avila <[email protected]>
1 parent c9d5df6 commit 2bf1ce6

File tree

5 files changed

+307
-304
lines changed

5 files changed

+307
-304
lines changed

‎.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
po4a.conf
22
po4a-stamp
33
Gemfile.lock
4-
**/*.txt
4+
**/*.adoc
55
*/*.1
66
*/*.7
77
*/*.html
88
*/*.xml
99
*/*.dep+
10-
!en/**/*.txt
10+
!en/**/*.adoc
1111
po/*.mo
1212
po4a/
1313
.weblate

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
EN_SOURCES = $(wildcard en/*.txt)
1+
EN_SOURCES = $(wildcard en/*.adoc)
22
LANGUAGE_PO = $(wildcard po/documentation.*.po)
33
ALL_LANGUAGES = $(subst po/documentation.,,$(subst .po,,$(LANGUAGE_PO)))
44

5-
L10N_BUILD_TARGETS = all man html install doc-l10n install-l10n install-txt
5+
L10N_BUILD_TARGETS = all man html install doc-l10n install-l10n install-adoc
66
L10N_CLEAN_TARGETS = clean mrproper
77
L10N_TARGETS = $(L10N_CLEAN_TARGETS) $(L10N_BUILD_TARGETS)
88

‎makefile.locale

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
vpath GIT-VERSION-FILE . ..
22

3-
MAN1_SOURCE = $(wildcard git-*.txt)
4-
MAN1_SOURCE += $(wildcard git.txt*)
3+
MAN1_SOURCE = $(wildcard git-*.adoc)
4+
MAN1_SOURCE += $(wildcard git.adoc*)
55

6-
MAN7_SOURCE = $(wildcard gitglossary.txt*)
6+
MAN7_SOURCE = $(wildcard gitglossary.adoc*)
77

88
MAN_FILTER = $(MAN1_SOURCE) $(MAN7_SOURCE)
9-
HTML_FILTER = $(patsubst %.txt,%.html,$(MAN_FILTER))
9+
HTML_FILTER = $(patsubst %.adoc,%.html,$(MAN_FILTER))
1010

1111

1212
ifeq ($(wildcard ../../build-docdep.perl),../../build-docdep.perl)
@@ -56,25 +56,25 @@ ASCIIDOC_EXTRA += -amanmanual='Git Manual' \
5656
ASCIIDOC_EXTRA += -alitdd='\--'
5757
ASCIIDOC_EXTRA += -acompat-mode -atabsize=8
5858

59-
$(HTML_FILTER): %.html: %.txt
59+
$(HTML_FILTER): %.html: %.adoc
6060
$(QUIET_ASCIIDOC)asciidoctor -b xhtml5 \
6161
$(ASCIIDOC_EXTRA) $<
6262

63-
MAN1_PAGES=$(patsubst %.txt,%.1,$(MAN1_SOURCE))
64-
MAN5_PAGES=$(patsubst %.txt,%.5,$(MAN5_SOURCE))
65-
MAN7_PAGES=$(patsubst %.txt,%.7,$(MAN7_SOURCE))
63+
MAN1_PAGES=$(patsubst %.adoc,%.1,$(MAN1_SOURCE))
64+
MAN5_PAGES=$(patsubst %.adoc,%.5,$(MAN5_SOURCE))
65+
MAN7_PAGES=$(patsubst %.adoc,%.7,$(MAN7_SOURCE))
6666

6767
MANPAGES=$(MAN1_PAGES) $(MAN5_PAGES) $(MAN7_PAGES)
6868

69-
$(MAN1_PAGES): %.1: %.txt
69+
$(MAN1_PAGES): %.1: %.adoc
7070
$(QUIET_ASCIIDOC)asciidoctor -b manpage -o $@ \
7171
$(ASCIIDOC_EXTRA) -amanvolnum=1 $<
7272

73-
$(MAN5_PAGES): %.5: %.txt
73+
$(MAN5_PAGES): %.5: %.adoc
7474
$(QUIET_ASCIIDOC)asciidoctor -b manpage -o $@ \
7575
$(ASCIIDOC_EXTRA) -amanvolnum=5 $<
7676

77-
$(MAN7_PAGES): %.7: %.txt
77+
$(MAN7_PAGES): %.7: %.adoc
7878
$(QUIET_ASCIIDOC)asciidoctor -b manpage -o $@ \
7979
$(ASCIIDOC_EXTRA) -amanvolnum=7 $<
8080

@@ -83,16 +83,19 @@ html: $(HTML_FILTER)
8383

8484
all doc-l10n: man html
8585

86-
install-txt:
86+
install-adoc:
8787
install -d -m 755 $(prefix)/$(lang)
88-
[ -z "$$(ls *.txt 2>/dev/null)" ] || install *.txt -m 644 $(prefix)/$(lang)
89-
[ -z "$$(ls *.html 2>/dev/null)" ] || install *.html -m 644 $(prefix)/$(lang)
88+
[ -n "$$(ls *.adoc 2>/dev/null)" ] && install *.adoc -m 644 $(prefix)/$(lang) || true
89+
[ -n "$$(ls *.html 2>/dev/null)" ] && install *.html -m 644 $(prefix)/$(lang) || true
90+
install -d -m 755 $(prefix)/$(lang)/includes
91+
[ -n "$$(ls includes/*.adoc 2>/dev/null)" ] && install includes/*.adoc -m 644 $(prefix)/$(lang)/includes || true
92+
[ -n "$$(ls includes/*.html 2>/dev/null)" ] && install includes/*.html -m 644 $(prefix)/$(lang)/includes || true
9093

9194
clean:
92-
rm -f *.1 *.5 *7 *.html
95+
rm -f *.1 *.5 *7 *.html .man .all .translated
9396

9497
endif
9598

9699

97100
mrproper: clean
98-
rm -f *.txt
101+
rm -f *.adoc

‎scripts/set-priorities

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -5,88 +5,88 @@ import sys
55
import re
66
from os.path import join, dirname
77

8-
SECTIONS = {310: ["en/gitglossary.txt"],
9-
300: ["en/git-init.txt",
10-
"en/git-clone.txt",
11-
"en/git-add.txt"],
12-
280: ["en/git-status.txt",
13-
"en/git-diff.txt",
14-
"en/diff-options.txt",
15-
"en/diff-format.txt",
16-
"en/git-commit.txt",
17-
"en/git-notes.txt",
18-
"en/git-restore.txt",
19-
"en/git-reset.txt",
20-
"en/git-rm.txt",
21-
"en/git-mv.txt"],
22-
260: ["en/git-branch.txt",
23-
"en/git-log.txt",
24-
"en/git-shortlog.txt",
25-
"en/git-describe.txt"],
26-
240: ["en/git-show.txt",
27-
"en/git-checkout.txt",
28-
"en/git-merge.txt",
29-
"en/git-mergetool.txt",
30-
"en/git-stash.txt",
31-
"en/git-tag.txt",
32-
"en/git-worktree.txt"],
33-
220: ["en/git-fetch.txt",
34-
"en/git-pull.txt",
35-
"en/git-push.txt",
36-
"en/git-remote.txt",
37-
"en/git-submodule.txt",
38-
"git-rebase.txt"],
39-
90: ["en/git-cvsexportcommit.txt",
40-
"en/git-cvsimport.txt",
41-
"en/git-cvsserver.txt",
42-
"en/git-unpack-file.txt",
43-
"en/git-unpack-objects.txt",
44-
"en/git-fast-export.txt",
45-
"en/git-fast-import.txt",
46-
"en/git-fetch-pack.txt",
47-
"en/git-filter-branch.txt",
48-
"en/git-update-server-info.txt",
49-
"en/git-sh-i18n.txt",
50-
"en/git-sh-i18n--envsubst.txt",
51-
"en/git-send-pack.txt",
52-
"en/git-remote-ext.txt",
53-
"en/git-remote-fd.txt",
54-
"en/git-receive-pack.txt",
55-
"en/git-send-pack.txt",
56-
"en/git-p4.txt",
57-
"en/git-symbolic-ref.txt",
58-
"en/git-merge-base.txt",
59-
"en/git-merge-file.txt",
60-
"en/git-merge-index.txt",
61-
"en/git-credential-cache--daemon.txt",
62-
"en/git-credential-cache.txt",
63-
"en/git-quiltimport.txt",
8+
SECTIONS = {310: ["en/gitglossary.adoc"],
9+
300: ["en/git-init.adoc",
10+
"en/git-clone.adoc",
11+
"en/git-add.adoc"],
12+
280: ["en/git-status.adoc",
13+
"en/git-diff.adoc",
14+
"en/diff-options.adoc",
15+
"en/diff-format.adoc",
16+
"en/git-commit.adoc",
17+
"en/git-notes.adoc",
18+
"en/git-restore.adoc",
19+
"en/git-reset.adoc",
20+
"en/git-rm.adoc",
21+
"en/git-mv.adoc"],
22+
260: ["en/git-branch.adoc",
23+
"en/git-log.adoc",
24+
"en/git-shortlog.adoc",
25+
"en/git-describe.adoc"],
26+
240: ["en/git-show.adoc",
27+
"en/git-checkout.adoc",
28+
"en/git-merge.adoc",
29+
"en/git-mergetool.adoc",
30+
"en/git-stash.adoc",
31+
"en/git-tag.adoc",
32+
"en/git-worktree.adoc"],
33+
220: ["en/git-fetch.adoc",
34+
"en/git-pull.adoc",
35+
"en/git-push.adoc",
36+
"en/git-remote.adoc",
37+
"en/git-submodule.adoc",
38+
"git-rebase.adoc"],
39+
90: ["en/git-cvsexportcommit.adoc",
40+
"en/git-cvsimport.adoc",
41+
"en/git-cvsserver.adoc",
42+
"en/git-unpack-file.adoc",
43+
"en/git-unpack-objects.adoc",
44+
"en/git-fast-export.adoc",
45+
"en/git-fast-import.adoc",
46+
"en/git-fetch-pack.adoc",
47+
"en/git-filter-branch.adoc",
48+
"en/git-update-server-info.adoc",
49+
"en/git-sh-i18n.adoc",
50+
"en/git-sh-i18n--envsubst.adoc",
51+
"en/git-send-pack.adoc",
52+
"en/git-remote-ext.adoc",
53+
"en/git-remote-fd.adoc",
54+
"en/git-receive-pack.adoc",
55+
"en/git-send-pack.adoc",
56+
"en/git-p4.adoc",
57+
"en/git-symbolic-ref.adoc",
58+
"en/git-merge-base.adoc",
59+
"en/git-merge-file.adoc",
60+
"en/git-merge-index.adoc",
61+
"en/git-credential-cache--daemon.adoc",
62+
"en/git-credential-cache.adoc",
63+
"en/git-quiltimport.adoc",
6464
],
65-
80: ["en/git-cat-file.txt",
66-
"en/git-check-ignore.txt",
67-
"en/git-checkout-index.txt",
68-
"en/git-commit-tree.txt",
69-
"en/git-count-objects.txt",
70-
"en/git-diff-index.txt",
71-
"en/git-diff-tree.txt",
72-
"en/git-for-each-ref.txt",
73-
"en/git-hash-object.txt",
74-
"en/git-ls-files.txt",
75-
"en/git-ls-tree.txt",
76-
"en/git-merge-base.txt",
77-
"en/git-pack-objects.txt",
78-
"en/git-pack-redundant.txt",
79-
"en/git-pack-refs.txt",
80-
"en/git-patch-id.txt",
81-
"en/git-read-tree.txt",
82-
"en/git-rev-list.txt",
83-
"en/git-rev-parse.txt",
84-
"en/git-show-ref.txt",
85-
"en/git-symbolic-ref.txt",
86-
"en/git-update-index.txt",
87-
"en/git-update-ref.txt",
88-
"en/git-verify-pack.txt",
89-
"en/git-write-tree.txt"
65+
80: ["en/git-cat-file.adoc",
66+
"en/git-check-ignore.adoc",
67+
"en/git-checkout-index.adoc",
68+
"en/git-commit-tree.adoc",
69+
"en/git-count-objects.adoc",
70+
"en/git-diff-index.adoc",
71+
"en/git-diff-tree.adoc",
72+
"en/git-for-each-ref.adoc",
73+
"en/git-hash-object.adoc",
74+
"en/git-ls-files.adoc",
75+
"en/git-ls-tree.adoc",
76+
"en/git-merge-base.adoc",
77+
"en/git-pack-objects.adoc",
78+
"en/git-pack-redundant.adoc",
79+
"en/git-pack-refs.adoc",
80+
"en/git-patch-id.adoc",
81+
"en/git-read-tree.adoc",
82+
"en/git-rev-list.adoc",
83+
"en/git-rev-parse.adoc",
84+
"en/git-show-ref.adoc",
85+
"en/git-symbolic-ref.adoc",
86+
"en/git-update-index.adoc",
87+
"en/git-update-ref.adoc",
88+
"en/git-verify-pack.adoc",
89+
"en/git-write-tree.adoc"
9090
]
9191
}
9292

0 commit comments

Comments
 (0)