[checkmk-commits] Check_MK Git: check_mk: Disabled build of windows msi agent

Module: check_mk Branch: master Commit: c23c1f5cd1f8a28077f877dab5f0b925ee24a7ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c23c1f5cd1f8a2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 11 13:44:57 2014 +0200 Disabled build of windows msi agent --- Makefile | 1 - agents/windows/Makefile | 3 ++- agents/windows/install_agent-64.exe | Bin 159343 -> 159342 bytes agents/windows/msibuild/Makefile | 4 ++++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bc280b2..87b5435 100644 --- a/Makefile +++ b/Makefile @@ -179,7 +179,6 @@ setversion: echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files ; \ cd agents/windows ; rm check_mk_agent.exe check_mk_agent-64.exe ; make ; cd ../.. ; \ cp agents/windows/install_agent.exe check-mk-agent-$(NEW_VERSION).exe - cp agents/windows/check_mk_agent.msi check-mk-agent-$(NEW_VERSION).msi headers: doc/helpers/headrify diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 7d8ad84..b51a8c7 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -36,7 +36,7 @@ else CXX = mingw32-g++ endif -all: install_agent.exe install_agent-64.exe msi_installer +all: install_agent.exe install_agent-64.exe .PHONY: inc_build_version @@ -115,6 +115,7 @@ nowin.exe: nowin.cc clean: rm -f *.o *~ svn-*.tmp *.rc *.res + cd msibuild ; make clean mrproper: clean rm -f *.exe diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index e92a003..b4fa522 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/msibuild/Makefile b/agents/windows/msibuild/Makefile index 04ca65c..4322a1a 100755 --- a/agents/windows/msibuild/Makefile +++ b/agents/windows/msibuild/Makefile @@ -30,6 +30,10 @@ CHECK_MK_VERSION = TESTVERSION all: exchange_msi_files +clean: + rm -rf $(MSITOOLS) + rm check_mk_agent.msi + rm -rf work sources msibuild: tar -Jxf $(MSITOOLS_FILE) set -e ; for p in patches/*.dif ; do \