[Piuparts-commits] [piuparts] 03/05: Makefile: split build and install targets between master and slave
Holger Levsen
holger at layer-acht.org
Sun Aug 6 16:21:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch develop
in repository piuparts.
commit 06e676dc40eb1ea2134d5b2ef41908ec03d7f7d1
Author: Andreas Beckmann <anbe at debian.org>
Date: Sun Aug 6 04:06:29 2017 +0200
Makefile: split build and install targets between master and slave
Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
Makefile | 46 +++++++++++++++++++++++++++++---------------
debian/changelog | 1 +
update-piuparts-master-setup | 6 +++---
update-piuparts-slave-setup | 6 +++---
4 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/Makefile b/Makefile
index 0ecc983..e4ed906 100644
--- a/Makefile
+++ b/Makefile
@@ -46,11 +46,16 @@ python-syntax-check:
@set -e -x; $(foreach py,$(python_scripts),python -m py_compile $(py);)
$(RM) $(python_scripts:=c)
-build: build-stamp
+build: build-stamp build-master-stamp
+build-slave: build-stamp
+build-master: build-stamp build-master-stamp
build-stamp: $(SCRIPTS_GENERATED) $(DOCS_GENERATED) Makefile
$(MAKE) -C instances
$(MAKE) python-syntax-check
+ touch $@
+
+build-master-stamp:
(cd debiman-piuparts-distill && go build)
touch $@
@@ -77,6 +82,7 @@ piuparts_slave_stop.8: piuparts_slave_stop.8.txt
piuparts.1.html: piuparts.1.txt
a2x --copy -f xhtml piuparts.1.txt
+
install-doc: build-stamp
install -d $(DESTDIR)$(docdir)/
install -m 0644 README.txt README.html README_server.txt README_server.html docbook-xsl.css $(DESTDIR)$(docdir)/
@@ -108,20 +114,20 @@ install-conf-4-running-from-git: build-stamp
install -d $(DESTDIR)$(sharedir)/piuparts/master
install -m 0755 update-piuparts-master-setup $(DESTDIR)$(sharedir)/piuparts/master/
-install: build-stamp
- install -d $(DESTDIR)$(sbindir)
- install -m 0755 piuparts $(DESTDIR)$(sbindir)/
- install -m 0755 debiman-piuparts-distill/debiman-piuparts-distill $(DESTDIR)$(sbindir)/
-
- install -d $(DESTDIR)$(sharedir)/piuparts
- install -m 0755 piuparts-slave piuparts-master piuparts-master-backend piuparts-report piuparts-analyze $(DESTDIR)$(sharedir)/piuparts/
-
+install-common: build-stamp
install -d $(DESTDIR)$(site27)/piupartslib
install -m 0644 piupartslib/*.py $(DESTDIR)$(site27)/piupartslib/
install -d $(DESTDIR)$(sharedir)/piuparts/lib
install -m 0644 lib/*.sh $(DESTDIR)$(sharedir)/piuparts/lib/
+install-master: build-master-stamp install-common
+ install -d $(DESTDIR)$(sbindir)/
+ install -m 0755 debiman-piuparts-distill/debiman-piuparts-distill $(DESTDIR)$(sbindir)/
+
+ install -d $(DESTDIR)$(sharedir)/piuparts
+ install -m 0755 piuparts-master piuparts-master-backend piuparts-report piuparts-analyze $(DESTDIR)$(sharedir)/piuparts/
+
# do not install the templates (*.in, *.py)
install -d $(DESTDIR)$(sharedir)/piuparts/master
install -m 0755 $(filter-out %.in %.py,$(wildcard master-bin/*)) $(DESTDIR)$(sharedir)/piuparts/master/
@@ -129,10 +135,6 @@ install: build-stamp
install -d $(DESTDIR)$(sharedir)/piuparts/known_problems
install -m 0644 known_problems/*.conf $(DESTDIR)$(sharedir)/piuparts/known_problems/
- # do not install the templates (*.in, *.py)
- install -d $(DESTDIR)$(sharedir)/piuparts/slave
- install -m 0755 $(filter-out %.in %.py,$(wildcard slave-bin/*)) $(DESTDIR)$(sharedir)/piuparts/slave/
-
install -d $(DESTDIR)$(htdocsdir)
install -m 0644 htdocs/*.* $(DESTDIR)$(htdocsdir)/
@@ -142,14 +144,27 @@ install: build-stamp
install -d $(DESTDIR)$(htdocsdir)/templates/mail
install -m 0644 bug-templates/*.mail $(DESTDIR)$(htdocsdir)/templates/mail/
+ #install -d $(DESTDIR)$(etcdir)/piuparts/known_problems
+ #install -m 0644 known_problems/*.conf $(DESTDIR)$(etcdir)/piuparts/known_problems/
+
+install-slave: install-common
+ install -d $(DESTDIR)$(sbindir)
+ install -m 0755 piuparts $(DESTDIR)$(sbindir)/
+
+ install -d $(DESTDIR)$(sharedir)/piuparts
+ install -m 0755 piuparts-slave $(DESTDIR)$(sharedir)/piuparts/
+
+ # do not install the templates (*.in, *.py)
+ install -d $(DESTDIR)$(sharedir)/piuparts/slave
+ install -m 0755 $(filter-out %.in %.py,$(wildcard slave-bin/*)) $(DESTDIR)$(sharedir)/piuparts/slave/
+
install -d $(DESTDIR)$(etcdir)/piuparts
@set -e -x ; \
for d in $$(ls custom-scripts) ; do \
install -d $(DESTDIR)$(etcdir)/piuparts/$$d ; \
install -m 0755 custom-scripts/$$d/* $(DESTDIR)$(etcdir)/piuparts/$$d/ ; done
- #install -d $(DESTDIR)$(etcdir)/piuparts/known_problems
- #install -m 0644 known_problems/*.conf $(DESTDIR)$(etcdir)/piuparts/known_problems/
+install: install-master install-slave
check:
@@ -157,6 +172,7 @@ check:
clean:
rm -f build-stamp
+ rm -f build-master-stamp
rm -f $(DOCS_GENERATED)
rm -f piuparts.1.xml README.xml README_server.xml docbook-xsl.css piuparts.html
rm -f *.pyc piupartslib/*.pyc master-bin/*.pyc slave-bin/*.pyc tests/*.pyc
diff --git a/debian/changelog b/debian/changelog
index c02d2ba..f8efcd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ piuparts (0.79) UNRELEASED; urgency=medium
* master-bin/detect_network_issues:
- Detect appstream metadata errors.
* slave_run: Ensure screen is run with SHELL=/bin/bash.
+ * Makefile: Split build and install targets between master and slave.
-- Holger Levsen <holger at debian.org> Mon, 31 Jul 2017 13:35:18 -0400
diff --git a/update-piuparts-master-setup b/update-piuparts-master-setup
index 869fbd0..b1a455d 100755
--- a/update-piuparts-master-setup
+++ b/update-piuparts-master-setup
@@ -68,11 +68,11 @@ fi
#
make clean
make prefix=$PIUPARTS_PREFIX \
- build build-doc
-make prefix=$PIUPARTS_PREFIX \
+ build-master build-doc
+make prefix=$PIUPARTS_PREFIX \
docdir=$PIUPARTS_HTDOCS/doc \
htdocsdir=$PIUPARTS_HTDOCS \
- install install-doc install-conf-4-running-from-git
+ install-master install-doc install-conf-4-running-from-git
make clean
#
diff --git a/update-piuparts-slave-setup b/update-piuparts-slave-setup
index ae2e68c..0b72dbf 100755
--- a/update-piuparts-slave-setup
+++ b/update-piuparts-slave-setup
@@ -68,11 +68,11 @@ fi
#
make clean
make prefix=$PIUPARTS_PREFIX \
- build build-doc
-make prefix=$PIUPARTS_PREFIX \
+ build-slave build-doc
+make prefix=$PIUPARTS_PREFIX \
docdir=$PIUPARTS_HTDOCS/doc \
htdocsdir=$PIUPARTS_HTDOCS \
- install install-doc install-conf-4-running-from-git
+ install-slave install-doc install-conf-4-running-from-git
make clean
#
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git
More information about the Piuparts-commits
mailing list