From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 7BC0E655F3 for ; Tue, 3 Nov 2020 15:28:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7076A2D598 for ; Tue, 3 Nov 2020 15:28:48 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id B4CA62D590 for ; Tue, 3 Nov 2020 15:28:47 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7DCE145F9B for ; Tue, 3 Nov 2020 15:28:47 +0100 (CET) From: Fabian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 3 Nov 2020 15:28:42 +0100 Message-Id: <20201103142842.17346-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201103142842.17346-1-f.ebner@proxmox.com> References: <20201103142842.17346-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.030 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [conf.py, proxmox.com] Subject: [pbs-devel] [PATCH v3 proxmox-backup 2/2] include prune simulator in build X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Nov 2020 14:28:48 -0000 Signed-off-by: Fabian Ebner --- 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