[checkmk-commits] Check_MK Git: check_mk: updated windows agent makefile so that setting the version on executables doesen 't cause a rebuild

Module: check_mk Branch: master Commit: 7da5eb0d3283dd110a6747efc6807b7d201b91c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7da5eb0d3283dd… Author: Sebastian Herbord &lt;sh(a)mathias-kettner.de&gt; Date: Wed Oct 7 12:55:53 2015 +0200 updated windows agent makefile so that setting the version on executables doesen't cause a rebuild --- agents/windows/Makefile | 23 +++++++++++++++------- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 826368 -> 826368 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 826368 -> 826368 bytes agents/windows/check_mk_agent.exe | Bin 743424 -> 743424 bytes agents/windows/check_mk_agent.msi | Bin 1827328 -> 1827328 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 743424 -> 743424 bytes agents/windows/install_agent-64.exe | Bin 380170 -> 380165 bytes agents/windows/install_agent.exe | Bin 370671 -> 370666 bytes 9 files changed, 17 insertions(+), 8 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index b56fa35..a9e1eb8 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -38,7 +38,7 @@ else CXX = mingw32-g++ endif -all: directories fix_linebreaks install_agent.exe install_agent-64.exe msi_installer +all: directories fix_linebreaks check_mk_agent.exe check_mk_agent-64.exe install_agent.exe install_agent-64.exe msi_installer .PHONY: directories inc_build_version fix_linebreaks @@ -46,7 +46,7 @@ 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 ; \ rm check_mk_agent.exe check_mk_agent-64.exe check_mk_agent.msi ; \ - make + make install_agent.exe install_agent-64.exe msi_installer # Converts all files which are targeted to a windows system to CRLF fix_linebreaks: @@ -111,14 +111,23 @@ check_mk_agent-64.unversioned.exe: obj64/check_mk_agent.o obj64/SettingsCollecto # 4. Create final executable files by inserting actual version number. No # recompilation is thus needed during 'make version' # ----------------------------------------------------------------------------- -%.exe: %.unversioned.exe - ./bin_replace $(VERSION_DUMMY) "$(VERSION)" < $< > $@ - chmod 755 $@ + +check_mk_agent.exe.versioned: + ./bin_replace $(VERSION_DUMMY) "$(VERSION)" < check_mk_agent.unversioned.exe > check_mk_agent.exe + chmod 755 check_mk_agent.exe + +check_mk_agent-64.exe.versioned: + ./bin_replace $(VERSION_DUMMY) "$(VERSION)" < check_mk_agent-64.unversioned.exe > check_mk_agent-64.exe + chmod 755 check_mk_agent-64.exe + + +%.exe: %.unversioned.exe %.exe.versioned + # ----------------------------------------------------------------------------- # NSIS installer will be removed and replaced by multiarch MSI installer # ----------------------------------------------------------------------------- -install_agent.exe: check_mk_agent.exe crash.exe nowin.exe +install_agent.exe: check_mk_agent.exe.versioned crash.exe nowin.exe if ! which makensis; then \ echo "ERROR: makensis missing. Please install the nsis package." ; \ exit 1 ; \ @@ -126,7 +135,7 @@ install_agent.exe: check_mk_agent.exe crash.exe nowin.exe makensis installer.nsi chmod +x install_agent.exe -install_agent-64.exe: check_mk_agent-64.exe crash.exe nowin.exe +install_agent-64.exe: check_mk_agent-64.exe.versioned crash.exe nowin.exe if ! which makensis; then \ echo "ERROR: makensis missing. Please install the nsis package." ; \ exit 1 ; \ diff --git a/agents/windows/build_version b/agents/windows/build_version index 408b885..5873851 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -461 +467 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index d222258..f084614 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 4466414..beb4cbe 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 095da70..c807ed5 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 2c1cce5..42340c5 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index f1cb145..6c1907a 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 6f09190..988b428 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index ecd9a38..0040c28 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ