proxmox-mirrors/pve-docs
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-docs synced 2025-10-04 05:48:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

asciidoc-pve.conf: use extra asciidoc configuration file

Browse Source 
We can define PVE related attributes here (will replace attributes.txt).
Install all asciidoc-pve config files to /usr/share/pve-doc-generator/asciidoc
This commit is contained in:
Dietmar Maurer 2016-11-07 08:19:04 +01:00
parent 73799de4d0
commit de7022fbe9
4 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -153,8 +153,10 @@ ${GEN_DEB} ${DOC_DEB} ${MEDIAWIKI_DEB}: index.html ${INDEX_INCLUDES} ${WIKI_IMPO
mkdir -p build/usr/bin mkdir -p build/usr/bin
install -m 0644 ${GEN_DEB_SOURCES} build/usr/share/${GEN_PACKAGE} install -m 0644 ${GEN_DEB_SOURCES} build/usr/share/${GEN_PACKAGE}
install -m 0755 ${GEN_SCRIPTS} build/usr/share/${GEN_PACKAGE} install -m 0755 ${GEN_SCRIPTS} build/usr/share/${GEN_PACKAGE}
# install asciidoc-pve
install -m 0755 asciidoc-pve build/usr/bin/ install -m 0755 asciidoc-pve build/usr/bin/
install -D -m 0644 asciidoc/mediawiki.conf build/etc/asciidoc/mediawiki.conf install -D -m 0644 asciidoc/mediawiki.conf build/usr/share/${GEN_PACKAGE}/asciidoc/mediawiki.conf
install -m 0644 asciidoc/asciidoc-pve.conf build/usr/share/${GEN_PACKAGE}/asciidoc/
# install files for pvedocs package # install files for pvedocs package
mkdir -p build/usr/share/${DOC_PACKAGE} mkdir -p build/usr/share/${DOC_PACKAGE}
mkdir -p build/usr/share/doc/${DOC_PACKAGE} mkdir -p build/usr/share/doc/${DOC_PACKAGE}

19
asciidoc-pve.in
View File

@ -28,8 +28,8 @@ my $tmpprefix = ".asciidoc-pve-tmp_";
my $adoc_source_dir = "/usr/share/pve-doc-generator"; my $adoc_source_dir = "/usr/share/pve-doc-generator";
# inside pve-docs source dir? # inside pve-docs source dir?
if (-f "attributes.txt" && -f "pve-admin-guide.adoc") { if (-f "asciidoc-pve.in" && -f "pve-admin-guide.adoc") {
$adoc_source_dir = "." $adoc_source_dir = getcwd();
} }
my $prepared_files = {}; my $prepared_files = {};
@ -341,7 +341,9 @@ sub compile_asciidoc {
# section like footnotes, so we cannot use a2x. # section like footnotes, so we cannot use a2x.
# We use xmlto instead. # We use xmlto instead.
my $cmd = ['asciidoc', '-dmanpage', '-bdocbook', '-a', 'docinfo1']; my $cmd = ['asciidoc', '-dmanpage', '-bdocbook',
'-f', "$adoc_source_dir/asciidoc/asciidoc-pve.conf",
'-a', 'docinfo1'];
foreach my $key (keys %$attributes) { foreach my $key (keys %$attributes) {
my $value = $attributes->{$key}; my $value = $attributes->{$key};
@ -383,17 +385,14 @@ sub compile_asciidoc {
$attributes->{icons} = undef; $attributes->{icons} = undef;
$attributes->{'data-uri'} = undef; $attributes->{'data-uri'} = undef;
my $cmd = ['asciidoc']; my $cmd = ['asciidoc',
'-f', "$adoc_source_dir/asciidoc/asciidoc-pve.conf",
];
if (($env eq 'wiki') || if (($env eq 'wiki') ||
(($env eq 'manvolnum') && ($man_target eq 'wiki'))) { (($env eq 'manvolnum') && ($man_target eq 'wiki'))) {
if (-f "./asciidoc/mediawiki.conf") { push @$cmd, '-b', "$adoc_source_dir/asciidoc/mediawiki";
my $cwd = getcwd();
push @$cmd, '-b', "$cwd/asciidoc/mediawiki";
} else {
push @$cmd, '-b', "mediawiki";
}
} }
foreach my $key (keys %$attributes) { foreach my $key (keys %$attributes) {

17
asciidoc/asciidoc-pve.conf Normal file
View File

@ -0,0 +1,17 @@
[attributes]
proxmoxGmbh=Proxmox Server Solutions Gmbh
copyright=Proxmox Server Solutions Gmbh
pve=Proxmox VE
website=http://www.proxmox.com/
forum-url=https://forum.proxmox.com/
forum=https://forum.proxmox.com/[Proxmox VE Community Forum]
webwiki-url=https://pve.proxmox.com/wiki/
webwiki=https://pve.proxmox.com/wiki/[Proxmox VE Wiki]
manmanual=Proxmox VE Documentation
max-width=55em
ifndef::docinfo1[]
author=Proxmox Server Solutions Gmbh
email=support@proxmox.com
endif::docinfo1[]

1
debian/pve-doc-generator.install vendored
View File

@ -1,3 +1,2 @@
/etc/asciidoc/mediawiki.conf
/usr/bin/asciidoc-pve /usr/bin/asciidoc-pve
/usr/share/pve-doc-generator /usr/share/pve-doc-generator