From de501581d9d8a5b466ed4b14c3d44dda117b4159 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sun, 1 Apr 2012 20:04:30 +0200 Subject: [PATCH] Removed autogenerated file (config.h.in) Updated version output for icinga component loader Updated project file --- config.h.in | 62 ------------------------------------ icinga/icingaapplication.cpp | 11 +++++-- icinga2.sln | 10 ------ 3 files changed, 8 insertions(+), 75 deletions(-) delete mode 100644 config.h.in diff --git a/config.h.in b/config.h.in deleted file mode 100644 index 423fcf8f0..000000000 --- a/config.h.in +++ /dev/null @@ -1,62 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION diff --git a/icinga/icingaapplication.cpp b/icinga/icingaapplication.cpp index a3716a32d..f9a9ffac2 100644 --- a/icinga/icingaapplication.cpp +++ b/icinga/icingaapplication.cpp @@ -2,9 +2,7 @@ #include #include "i2-icinga.h" -#ifdef _WIN32 -# define ICINGA_VERSION "N/A" -#else /* _WIN32 */ +#ifndef _WIN32 # include "icinga-version.h" # define ICINGA_VERSION GIT_MESSAGE #endif /* _WIN32 */ @@ -21,12 +19,19 @@ IcingaApplication::IcingaApplication(void) int IcingaApplication::Main(const vector& args) { +#ifdef _WIN32 + cout << "Icinga component loader" << endl; +#else /* _WIN32 */ + cout << "Icinga component loader (version: " << ICINGA_VERSION << ")" << endl; +#endif /* _WIN32 */ + GetConfigHive()->OnObjectCreated.bind(bind_weak(&IcingaApplication::ConfigObjectCreatedHandler, shared_from_this())); GetConfigHive()->OnObjectRemoved.bind(bind_weak(&IcingaApplication::ConfigObjectRemovedHandler, shared_from_this())); ConfigObject::RefType fileComponentConfig = new_object(); fileComponentConfig->SetName("configfilecomponent"); fileComponentConfig->SetType("component"); + fileComponentConfig->SetProperty("path", "libconfigfilecomponent.la"); fileComponentConfig->SetProperty("filename", "icinga.conf"); GetConfigHive()->AddObject(fileComponentConfig); diff --git a/icinga2.sln b/icinga2.sln index d21756d1e..cfe447411 100644 --- a/icinga2.sln +++ b/icinga2.sln @@ -3,12 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "base\base.vcxproj", "{9C92DA90-FD53-43A9-A244-90F2E8AF9677}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniapp", "miniapp\miniapp.vcxproj", "{7CEA8AB1-3327-4644-9D38-B639A8F3341E}" - ProjectSection(ProjectDependencies) = postProject - {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677} - {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8} = {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsonrpc", "jsonrpc\jsonrpc.vcxproj", "{8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}" ProjectSection(ProjectDependencies) = postProject {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677} @@ -49,10 +43,6 @@ Global {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|Win32.Build.0 = Debug|Win32 {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|Win32.ActiveCfg = Release|Win32 {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|Win32.Build.0 = Release|Win32 - {7CEA8AB1-3327-4644-9D38-B639A8F3341E}.Debug|Win32.ActiveCfg = Debug|Win32 - {7CEA8AB1-3327-4644-9D38-B639A8F3341E}.Debug|Win32.Build.0 = Debug|Win32 - {7CEA8AB1-3327-4644-9D38-B639A8F3341E}.Release|Win32.ActiveCfg = Release|Win32 - {7CEA8AB1-3327-4644-9D38-B639A8F3341E}.Release|Win32.Build.0 = Release|Win32 {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Debug|Win32.ActiveCfg = Debug|Win32 {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Debug|Win32.Build.0 = Debug|Win32 {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Release|Win32.ActiveCfg = Release|Win32 -- 2.40.0