4 Oct
2017
4 Oct
'17
10:33 a.m.
Module: check_mk
Branch: master
Commit: ce28e8eeaf36e38168cf5cc2850f2987430cb68b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce28e8eeaf36e3…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Oct 4 11:50:14 2017 +0200
Agents: Removed build steps from "make setversion"
The setversion target should only modify checked in source files to
update their version numbers. The creation/update of build results
should be independent of that.
We now execute the building of agent files now during "make dist"
of the main makefile.
Change-Id: Icd2cea0f0b0ceb1a388afe6ed96a14db34403893
---
Makefile | 1 +
agents/Makefile | 5 ++++-
agents/windows/Makefile | 5 ++---
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 2cdd4c1..e58da91 100644
--- a/Makefile
+++ b/Makefile
@@ -230,6 +230,7 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks
$(JAVASCRIPT_MI
@echo "Making $(DISTNAME)"
rm -rf $(DISTNAME)
mkdir -p $(DISTNAME)
+ $(MAKE) -C agents build
tar cf $(DISTNAME)/bin.tar $(TAROPTS) -C bin $$(cd bin ; ls)
tar rf $(DISTNAME)/bin.tar $(TAROPTS) -C agents/windows/msibuild msi-update
gzip $(DISTNAME)/bin.tar
diff --git a/agents/Makefile b/agents/Makefile
index dec3b0d..baad678 100644
--- a/agents/Makefile
+++ b/agents/Makefile
@@ -34,6 +34,7 @@ DEB_PACKAGE = check-mk-agent_$(VERSION)-1_all.deb
usage:
@echo "make waitmax -- compile waitmax.c"
+ @echo "make build -- create all files needed for \"make dist\" of
Check_MK"
@echo "make rpm -- create RPM package of Linux agent"
@echo "make deb -- create DEB package of Linux agent"
@echo "make packages -- create RPM and DEB package of Linux agent"
@@ -59,7 +60,9 @@ setversion:
if [ "$$agent" != windows -a "$$agent" != plugins -a
"$$agent" != hpux ] ; then \
sed -i 's/echo Version: [0-9.a-z-]*/'"echo Version:
$(NEW_VERSION)/g" $$agent; \
fi ; \
- done ; \
+ done
+
+build:
$(MAKE) packages
cd windows ; ./make-agent
diff --git a/agents/windows/Makefile b/agents/windows/Makefile
index 529d33c..9f9a18e 100644
--- a/agents/windows/Makefile
+++ b/agents/windows/Makefile
@@ -62,9 +62,8 @@ all: directories fix_linebreaks check_mk_agent.exe check_mk_agent-64.exe
install
.PHONY: directories inc_build_version fix_linebreaks
setversion:
- sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION
"'$(NEW_VERSION)'"/' installer*.nsi ; \
- sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" Makefile
; \
- $(MAKE) clean install_agent.exe install_agent-64.exe msi_installer
+ sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION
"'$(NEW_VERSION)'"/' installer*.nsi
+ sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/"
Makefile
# Converts all files which are targeted to a windows system to CRLF
fix_linebreaks: