osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/31718 )
Change subject: docs: change upload path for html docs
......................................................................
docs: change upload path for html docs
Upload it to pysim/master/html instead of latest/pysim.
Related: OS#5902
Change-Id: I0b338bd7d1fb2620d63e651eeb8e40c7d8e722e2
---
M docs/Makefile
1 file changed, 28 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/18/31718/1
diff --git a/docs/Makefile b/docs/Makefile
index 550d4e7..6effe53 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -14,6 +14,12 @@
UPLOAD_FILES = $(BUILDDIR)/latex/osmopysim-usermanual.pdf
CLEAN_FILES = $(UPLOAD_FILES)
+# Copy variables from Makefile.common.inc that are used in publish-html,
+# as Makefile.common.inc must be included after publish-html
+PUBLISH_REF ?= master
+PUBLISH_TEMPDIR = _publish_tmpdir
+SSH_COMMAND = ssh -o
'UserKnownHostsFile=$(OSMO_GSM_MANUALS_DIR)/build/known_hosts' -p 48
+
# Put it first so that "make" without argument is like "make help".
.PHONY: help
help:
@@ -23,7 +29,16 @@
@/bin/true
publish-html: html
- rsync -avz -e "ssh -o
'UserKnownHostsFile=$(OSMO_GSM_MANUALS_DIR)/build/known_hosts' -p 48"
$(BUILDDIR)/html/ [email protected]:web-files/latest/pysim/
+ rm -rf "$(PUBLISH_TEMPDIR)"
+ mkdir -p "$(PUBLISH_TEMPDIR)/pysim/$(PUBLISH_REF)"
+ cp -r "$(BUILDDIR)"/html "$(PUBLISH_TEMPDIR)/pysim/$(PUBLISH_REF)"
+ cd "$(PUBLISH_TEMPDIR)" && \
+ rsync \
+ -avzR \
+ -e "$(SSH_COMMAND)" \
+ "pysim" \
+ [email protected]:web-files/
+ rm -rf "$(PUBLISH_TEMPDIR)"
# put this before the catch-all below
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/31718
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I0b338bd7d1fb2620d63e651eeb8e40c7d8e722e2
Gerrit-Change-Number: 31718
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
Gerrit-MessageType: newchange
