From: Fabian Ebner <f.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH v3 proxmox-backup 2/2] include prune simulator in build
Date: Tue, 3 Nov 2020 15:28:42 +0100 [thread overview]
Message-ID: <20201103142842.17346-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20201103142842.17346-1-f.ebner@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
New in v3
Can be squashed into the previous patch. Thought that splitting it out might be
better for reviewability.
debian/proxmox-backup-docs.links | 1 +
docs/Makefile | 3 ++-
docs/conf.py | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/debian/proxmox-backup-docs.links b/debian/proxmox-backup-docs.links
index 6837733b..719dd555 100644
--- a/debian/proxmox-backup-docs.links
+++ b/debian/proxmox-backup-docs.links
@@ -1 +1,2 @@
/usr/share/doc/proxmox-backup/proxmox-backup.pdf /usr/share/doc/proxmox-backup/html/proxmox-backup.pdf
+/usr/share/javascript/extjs /usr/share/doc/proxmox-backup/html/prune-simulator/extjs
diff --git a/docs/Makefile b/docs/Makefile
index 471930c8..aa1be2c4 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -74,10 +74,11 @@ onlinehelpinfo:
@echo "Build finished. OnlineHelpInfo.js is in $(BUILDDIR)/scanrefs."
.PHONY: html
-html: ${GENERATED_SYNOPSIS} images/proxmox-logo.svg custom.css conf.py
+html: ${GENERATED_SYNOPSIS} images/proxmox-logo.svg custom.css conf.py $(addprefix prune-simulator/,documentation.html index.html prune-simulator.js)
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
cp images/proxmox-logo.svg $(BUILDDIR)/html/_static/
cp custom.css $(BUILDDIR)/html/_static/
+ cp -r prune-simulator $(BUILDDIR)/html/prune-simulator
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
diff --git a/docs/conf.py b/docs/conf.py
index 3c444699..92a9ecb3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -171,6 +171,7 @@ html_theme_options = {
'extra_nav_links': {
'Proxmox Homepage': 'https://proxmox.com',
'PDF': 'proxmox-backup.pdf',
+ 'Prune Simulator' : 'prune-simulator/index.html',
},
'sidebar_width': '320px',
--
2.20.1
prev parent reply other threads:[~2020-11-03 14:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 14:28 [pbs-devel] [PATCH v3 proxmox-backup 1/2] create prune simulator Fabian Ebner
2020-11-03 14:28 ` Fabian Ebner [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201103142842.17346-2-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal