4 Apr
2019
4 Apr
'19
9:20 a.m.
Module: check_mk
Branch: master
Commit: cc964f1a43519f6bf2d44f31383cbc031f031744
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc964f1a43519f…
Author: Sergey Kipnis <sk(a)mathias-kettner.de>
Date: Thu Apr 4 14:10:30 2019 +0200
[CMK-1850] - build agent for windows fix
- msi-update legacy is executable
- msi-update-legacy is used to build legacy windows agent
- msi-update-legacy is added to the tar
Change-Id: Iad9c66a360891ad4fb5ef63c6e5324070549c3d5
---
Makefile | 1 +
agents/windows/msibuild/Makefile | 10 +++++++---
agents/windows/msibuild/msi-update-legacy | 0
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 78e1695..d8c9296 100644
--- a/Makefile
+++ b/Makefile
@@ -188,6 +188,7 @@ $(DISTNAME).tar.gz: .venv
omd/packages/mk-livestatus/mk-livestatus-$(VERSION).ta
$(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
+ tar rf $(DISTNAME)/bin.tar $(TAROPTS) -C agents/windows/msibuild msi-update-legacy
gzip $(DISTNAME)/bin.tar
$(PIPENV) run python -m compileall cmk ; \
tar czf $(DISTNAME)/lib.tar.gz $(TAROPTS) \
diff --git a/agents/windows/msibuild/Makefile b/agents/windows/msibuild/Makefile
index e336a5a..6f53313 100755
--- a/agents/windows/msibuild/Makefile
+++ b/agents/windows/msibuild/Makefile
@@ -32,6 +32,7 @@ all: exchange_msi_files
clean:
rm -rf $(MSITOOLS)
+ rm -f check_mk_agent.msi
rm -rf work sources
rm -f .gsf-save-*
@@ -47,7 +48,10 @@ msibuild:
rm msibuild msiinfo
ln -s $(MSITOOLS)/msibuild $(MSITOOLS)/msiinfo .
-# with new agent we do not need to update vanilla container
-# nothing to do, but target left for the future changes and
-# for updating msibuild
+# we have to use legacy msi-update
exchange_msi_files: msibuild
+ mkdir -p work sources
+ cp ../check_mk_agent.exe ../check_mk_agent-64.exe ../check_mk.example.ini sources
+ LD_LIBRARY_PATH=$$(pwd)/msitools-0.94/libmsi/.libs \
+ ./msi-update-legacy -v vanilla_container.msi sources $(BUILD_VERSION)
$(CHECK_MK_VERSION)
+ rm -rf work sources
diff --git a/agents/windows/msibuild/msi-update-legacy
b/agents/windows/msibuild/msi-update-legacy
old mode 100644
new mode 100755