28 Sep
2012
28 Sep
'12
8:34 a.m.
Module: check_mk
Branch: master
Commit: 02b1f77c2da72de015c8f84af1d9bad22304a699
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02b1f77c2da72d…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Sep 28 10:34:39 2012 +0200
Added mkeventd to regular builds
---
.gitignore | 1 +
Makefile | 15 ++++++++++++---
agents/windows/check_mk_agent.exe | Bin 105472 -> 105472 bytes
agents/windows/crash.exe | Bin 20024 -> 20024 bytes
agents/windows/install_agent.exe | Bin 126264 -> 127802 bytes
agents/windows/nowin.exe | Bin 22511 -> 22511 bytes
mkeventd/bin/mkeventd | 2 +-
7 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 94e5851..77041d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
check_mk-*.spec
check_mk-*.tar.gz
mk-livestatus-*.tar.gz
+mkeventd-*.tar.gz
rpm.buildroot/
rpm.topdir/
*.rpm
diff --git a/Makefile b/Makefile
index ca14915..2dab40c 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ help:
@echo "make headers --> create/update fileheades"
@echo "make healspaces --> remove trailing spaces in code"
-dist: mk-livestatus
+dist: mk-livestatus mk-eventd
@echo
"--------------------------------------------------------------------------"
@echo -n "Checking permissions... with find -not -perm -444..." && [
-z "$$(find -not -perm -444)" ] && echo OK
@echo "Making $(DISTNAME)"
@@ -87,6 +87,11 @@ dist: mk-livestatus
@echo " FINISHED. "
@echo
"=============================================================================="
+mk-eventd:
+ tar -c $(TAROPTS) --exclude=.f12 \
+ --transform 's,^mkeventd,mkeventd-$(VERSION),' \
+ -zf mkeventd-$(VERSION).tar.gz mkeventd
+
mk-livestatus:
if [ ! -e livestatus/configure ] ; then \
cd livestatus && aclocal && autoheader && automake -a
&& autoconf ; \
@@ -113,7 +118,7 @@ version:
setversion:
sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" Makefile ;
\
for agent in agents/* ; do \
- if [ "$$agent" != agents/windows -a "$$agent" != agents/plugins
] ; then \
+ if [ "$$agent" != agents/windows -a "$$agent" != agents/plugins
-a "$$agent" != agents/hpux ] ; then \
sed -i 's/echo Version: [0-9.a-z]*/'"echo Version:
$(NEW_VERSION)/g" $$agent; \
fi ; \
done ; \
@@ -121,6 +126,7 @@ setversion:
sed -i 's/#define CHECK_MK_VERSION .*/#define CHECK_MK_VERSION
"'$(NEW_VERSION)'"/' agents/windows/check_mk_agent.cc ; \
sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION
"'$(NEW_VERSION)'"/' agents/windows/installer.nsi ; \
sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus],
['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/'
livestatus/configure.ac ; \
+ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/'
mkeventd/bin/mkeventd ; \
sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/'
scripts/setup.sh ; \
echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files ; \
cd agents/windows ; rm *.exe ; make ; cd ../.. ; \
@@ -181,7 +187,10 @@ deb-agent: $(NAME)-agent-$(VERSION)-1.noarch.rpm
$(NAME)-agent-logwatch-$(VERSIO
clean:
- rm -rf dist.tmp rpm.topdir *.rpm *.deb *.exe mk-livestatus-*.tar.gz $(NAME)-*.tar.gz *~
counters autochecks precompiled cache
+ rm -rf dist.tmp rpm.topdir *.rpm *.deb *.exe \
+ mkeventd-*.tar.gz mk-livestatus-*.tar.gz \
+ $(NAME)-*.tar.gz *~ counters autochecks \
+ precompiled cache
find -name "*~" | xargs rm -f
mrproper:
diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe
index c8f316e..a1831b2 100755
Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe
differ
diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe
index 41b3874..d301ec9 100755
Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ
diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe
index 421a0b4..0eeee29 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe
differ
diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe
index f345677..22f202b 100755
Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ
diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd
index 74486e6..373c198 100755
--- a/mkeventd/bin/mkeventd
+++ b/mkeventd/bin/mkeventd
@@ -6,7 +6,7 @@ import socket, os, time, sys, getopt, signal, thread, pprint, re, \
from pwd import getpwnam
from grp import getgrnam
-VERSION="1.0.0rc2"
+VERSION="1.2.1i2"
# .--Declarations--------------------------------------------------------.
# | ____ _ _ _ |