[checkmk-commits] 4468 FIX mk_logwatch.exe: added missing executable for recently converted linux mk_logwatch

Module: check_mk Branch: master Commit: e9fc3f87c168b455e5b1bbca8ce1bd922c8c7756 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9fc3f87c168b4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 4 16:38:37 2017 +0200 4468 FIX mk_logwatch.exe: added missing executable for recently converted linux mk_logwatch Change-Id: I46790971e93bc299280d36e0d744ccdd19f0d9bc --- .werks/4468 | 10 ++++++++ agents/windows/frozen_binaries/Makefile | 41 ++++++++++++++++++++++++++++++++ agents/windows/plugins/mk_logwatch.exe | Bin 0 -> 4555413 bytes 3 files changed, 51 insertions(+) diff --git a/.werks/4468 b/.werks/4468 new file mode 100644 index 0000000..3c799a8 --- /dev/null +++ b/.werks/4468 @@ -0,0 +1,10 @@ +Title: mk_logwatch.exe: added missing executable for recently converted linux mk_logwatch +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1491316639 +Class: fix + + diff --git a/agents/windows/frozen_binaries/Makefile b/agents/windows/frozen_binaries/Makefile new file mode 100644 index 0000000..1cbbc32 --- /dev/null +++ b/agents/windows/frozen_binaries/Makefile @@ -0,0 +1,41 @@ +.PHONY: clean + +build: mk_logwatch.exe + +include pyinstaller-deps.make + +mk_logwatch.exe: src/python-$(PYTHON_VERSION).msi $(PYTHON_PACKAGES) src/vcredist_x86.exe $(PLUGINS_DIR)/mk_logwatch + mkdir $(BUILD_DIR) ; \ + cd $(BUILD_DIR) ; \ + cp -pr $(CURDIR)/src/* . ; \ + cd $(BUILD_DIR) ; cabextract vcredist_x86.exe + cd $(BUILD_DIR) ; cabextract vc_red.cab + cd $(BUILD_DIR) ; export WINEPREFIX=$(BUILD_DIR) ; \ + wine vcredist_x86.exe /qb ; \ + wine msiexec /qn /i python-$(PYTHON_VERSION).msi ; \ + mv msvcr90.dll*VC90_CRT_x86* drive_c/Python27/msvcr90.dll ; \ + mv msvcp90.dll*VC90_CRT_x86* drive_c/Python27/msvcp90.dll ; \ + mv msvcm90.dll*VC90_CRT_x86* drive_c/Python27/msvcm90.dll ; \ + mv manifest*VC90_CRT_x86* drive_c/Python27/Microsoft.VC90.CRT.manifest ; \ + cp -r pip drive_c ; \ + cd drive_c/pip ; \ + wine c:\\Python27\\python.exe -m pip install --no-index --find-links="c:\\pip" * ; \ + mkdir $(BUILD_DIR)/drive_c/compile ; \ + cp $(PLUGINS_DIR)/mk_logwatch $(BUILD_DIR)/drive_c/compile/mk_logwatch.py ; \ + cd $(BUILD_DIR)/drive_c/compile ; \ + wine c:\\Python27\\Scripts\\pyinstaller.exe \ + --clean \ + --onefile \ + --upx-dir="C:\\upx" \ + --log-level=INFO \ + mk_logwatch.py ; \ + if [ ! -e dist/mk_logwatch.exe ] ; \ + then \ + echo "ERROR: Failed to create venv_wine/drive_c/compile/dist/mk_logwatch.exe" ; \ + exit 1 ; \ + fi ; + cp $(BUILD_DIR)/drive_c/compile/dist/mk_logwatch.exe ../plugins + rm -rf $(BUILD_DIR) + +clean: + [ ! -d $(BUILD_DIR) ] || rm -rf $(BUILD_DIR) diff --git a/agents/windows/plugins/mk_logwatch.exe b/agents/windows/plugins/mk_logwatch.exe new file mode 100755 index 0000000..1f18d82 Binary files /dev/null and b/agents/windows/plugins/mk_logwatch.exe differ