diff --git a/components/Makefile.am b/components/Makefile.am index 6dfa65b92..c34fc2e0a 100644 --- a/components/Makefile.am +++ b/components/Makefile.am @@ -5,7 +5,6 @@ SUBDIRS = \ checker \ compat \ compatido \ - convenience \ delegation \ demo \ replication diff --git a/components/checker/checker.vcxproj b/components/checker/checker.vcxproj index fdc549e9e..c4814f8ee 100644 --- a/components/checker/checker.vcxproj +++ b/components/checker/checker.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {38CE81CC-2660-4EF0-A936-4A337591DA3E} @@ -21,31 +29,66 @@ true MultiByte + + DynamicLibrary + true + MultiByte + DynamicLibrary false true MultiByte + + DynamicLibrary + false + true + MultiByte + + + + + + + true - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + true + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + false + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -61,6 +104,20 @@ base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;CHECKER_EXPORTS;%(PreprocessorDefinitions) + false + true + + + Windows + true + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + Level3 @@ -79,6 +136,24 @@ base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;CHECKER_EXPORTS;%(PreprocessorDefinitions) + false + true + + + Windows + true + true + true + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + diff --git a/components/compat/compat.vcxproj b/components/compat/compat.vcxproj index ecdafb34f..29eb5ed55 100644 --- a/components/compat/compat.vcxproj +++ b/components/compat/compat.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA} @@ -21,31 +29,66 @@ true NotSet + + DynamicLibrary + true + NotSet + DynamicLibrary false true NotSet + + DynamicLibrary + false + true + NotSet + + + + + + + true $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -60,6 +103,19 @@ base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;COMPAT_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + Level3 @@ -77,6 +133,23 @@ base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;COMPAT_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + diff --git a/components/convenience/Makefile.am b/components/convenience/Makefile.am deleted file mode 100644 index 6d2f1260b..000000000 --- a/components/convenience/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -## Process this file with automake to produce Makefile.in - -pkglib_LTLIBRARIES = \ - convenience.la - -convenience_la_SOURCES = \ - conveniencecomponent.cpp \ - conveniencecomponent.h \ - i2-convenience.h - -convenience_la_CPPFLAGS = \ - $(BOOST_CPPFLAGS) \ - -I${top_srcdir}/lib/base \ - -I${top_srcdir}/lib/config \ - -I${top_srcdir}/lib/remoting \ - -I${top_srcdir}/lib/icinga - -convenience_la_LDFLAGS = \ - $(BOOST_LDFLAGS) \ - -module \ - -no-undefined \ - @RELEASE_INFO@ \ - @VERSION_INFO@ - -convenience_la_LIBADD = \ - $(BOOST_SIGNALS_LIB) \ - $(BOOST_THREAD_LIB) \ - ${top_builddir}/lib/base/libbase.la \ - ${top_builddir}/lib/config/libconfig.la \ - ${top_builddir}/lib/remoting/libremoting.la \ - ${top_builddir}/lib/icinga/libicinga.la diff --git a/components/convenience/convenience.vcxproj b/components/convenience/convenience.vcxproj deleted file mode 100644 index 39cd65bc6..000000000 --- a/components/convenience/convenience.vcxproj +++ /dev/null @@ -1,90 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D02A349B-BAF7-41FB-86FF-B05BA05FE578} - Win32Proj - convenience - - - - DynamicLibrary - true - MultiByte - - - DynamicLibrary - false - true - MultiByte - - - - - - - - - - - - - true - $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) - $(OutDir);$(LibraryPath) - - - false - $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) - $(OutDir);$(LibraryPath) - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;CONVENIENCE_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) - - - - - Level3 - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;CONVENIENCE_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) - - - - - - - - - - - - - \ No newline at end of file diff --git a/components/convenience/convenience.vcxproj.filters b/components/convenience/convenience.vcxproj.filters deleted file mode 100644 index 9a47a8313..000000000 --- a/components/convenience/convenience.vcxproj.filters +++ /dev/null @@ -1,30 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Quelldateien - - - - - Headerdateien - - - Headerdateien - - - \ No newline at end of file diff --git a/components/convenience/conveniencecomponent.cpp b/components/convenience/conveniencecomponent.cpp deleted file mode 100644 index e4caea210..000000000 --- a/components/convenience/conveniencecomponent.cpp +++ /dev/null @@ -1,164 +0,0 @@ -/****************************************************************************** - * Icinga 2 * - * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License * - * as published by the Free Software Foundation; either version 2 * - * of the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software Foundation * - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - ******************************************************************************/ - -#include "i2-convenience.h" - -using namespace icinga; - -/** - * Starts the component. - */ -void ConvenienceComponent::Start(void) -{ - ConfigItem::OnCommitted.connect(boost::bind(&ConvenienceComponent::ObjectCommittedHandler, this, _1)); - ConfigItem::OnRemoved.connect(boost::bind(&ConvenienceComponent::ObjectRemovedHandler, this, _1)); -} - -template -static void CopyServiceAttributes(const Host::Ptr& host, TDict serviceDesc, - const ConfigItemBuilder::Ptr& builder) -{ - /* TODO: we only need to copy macros if this is an inline definition, - * i.e. host->GetProperties() != service, however for now we just - * copy them anyway. */ - Value macros = serviceDesc->Get("macros"); - if (!macros.IsEmpty()) - builder->AddExpression("macros", OperatorPlus, macros); - - Value checkInterval = serviceDesc->Get("check_interval"); - if (!checkInterval.IsEmpty()) - builder->AddExpression("check_interval", OperatorSet, checkInterval); - - Value retryInterval = serviceDesc->Get("retry_interval"); - if (!retryInterval.IsEmpty()) - builder->AddExpression("retry_interval", OperatorSet, retryInterval); - - Value sgroups = serviceDesc->Get("servicegroups"); - if (!sgroups.IsEmpty()) - builder->AddExpression("servicegroups", OperatorPlus, sgroups); - - Value checkers = serviceDesc->Get("checkers"); - if (!checkers.IsEmpty()) - builder->AddExpression("checkers", OperatorSet, checkers); - - Value dependencies = serviceDesc->Get("dependencies"); - if (!dependencies.IsEmpty()) - builder->AddExpression("dependencies", OperatorPlus, - Service::ResolveDependencies(host, dependencies)); - - Value hostchecks = serviceDesc->Get("hostchecks"); - if (!hostchecks.IsEmpty()) - builder->AddExpression("dependencies", OperatorPlus, - Service::ResolveDependencies(host, hostchecks)); -} - -void ConvenienceComponent::ObjectCommittedHandler(const ConfigItem::Ptr& item) -{ - if (item->GetType() != "Host") - return; - - /* ignore abstract host objects */ - if (!Host::Exists(item->GetName())) - return; - - Host::Ptr host = Host::GetByName(item->GetName()); - - Dictionary::Ptr oldServices = host->Get("convenience_services"); - - Dictionary::Ptr newServices; - newServices = boost::make_shared(); - - Dictionary::Ptr serviceDescs = host->Get("services"); - - if (serviceDescs) { - String svcname; - Value svcdesc; - BOOST_FOREACH(tie(svcname, svcdesc), serviceDescs) { - stringstream namebuf; - namebuf << item->GetName() << "-" << svcname; - String name = namebuf.str(); - - ConfigItemBuilder::Ptr builder = boost::make_shared(item->GetDebugInfo()); - builder->SetType("Service"); - builder->SetName(name); - builder->AddExpression("host_name", OperatorSet, item->GetName()); - builder->AddExpression("alias", OperatorSet, svcname); - - CopyServiceAttributes(host, host, builder); - - if (svcdesc.IsScalar()) { - builder->AddParent(svcdesc); - } else if (svcdesc.IsObjectType()) { - Dictionary::Ptr service = svcdesc; - - String parent = service->Get("service"); - if (parent.IsEmpty()) - parent = svcname; - - builder->AddParent(parent); - - CopyServiceAttributes(host, service, builder); - } else { - throw_exception(invalid_argument("Service description must be either a string or a dictionary.")); - } - - ConfigItem::Ptr serviceItem = builder->Compile(); - serviceItem->Commit(); - - newServices->Set(name, serviceItem); - } - } - - if (oldServices) { - ConfigItem::Ptr service; - BOOST_FOREACH(tie(tuples::ignore, service), oldServices) { - if (!service) - continue; - - if (!newServices->Contains(service->GetName())) - service->Unregister(); - } - } - - host->Set("convenience_services", newServices); -} - -void ConvenienceComponent::ObjectRemovedHandler(const ConfigItem::Ptr& item) -{ - if (item->GetType() != "Host") - return; - - DynamicObject::Ptr host = item->GetDynamicObject(); - - if (!host) - return; - - Dictionary::Ptr services = host->Get("convenience_services"); - - if (!services) - return; - - ConfigItem::Ptr service; - BOOST_FOREACH(tie(tuples::ignore, service), services) { - service->Unregister(); - } -} - -EXPORT_COMPONENT(convenience, ConvenienceComponent); - diff --git a/components/convenience/conveniencecomponent.h b/components/convenience/conveniencecomponent.h deleted file mode 100644 index e1d7db788..000000000 --- a/components/convenience/conveniencecomponent.h +++ /dev/null @@ -1,41 +0,0 @@ -/****************************************************************************** - * Icinga 2 * - * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License * - * as published by the Free Software Foundation; either version 2 * - * of the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software Foundation * - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - ******************************************************************************/ - -#ifndef CONVENIENCECOMPONENT_H -#define CONVENIENCECOMPONENT_H - -namespace icinga -{ - -/** - * @ingroup convenience - */ -class ConvenienceComponent : public IComponent -{ -public: - virtual void Start(void); - -private: - void ObjectCommittedHandler(const ConfigItem::Ptr& item); - void ObjectRemovedHandler(const ConfigItem::Ptr& item); -}; - -} - -#endif /* CONVENIENCECOMPONENT_H */ diff --git a/components/convenience/i2-convenience.h b/components/convenience/i2-convenience.h deleted file mode 100644 index a2a9ef47e..000000000 --- a/components/convenience/i2-convenience.h +++ /dev/null @@ -1,38 +0,0 @@ -/****************************************************************************** - * Icinga 2 * - * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License * - * as published by the Free Software Foundation; either version 2 * - * of the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software Foundation * - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - ******************************************************************************/ - -#ifndef I2CONVENIENCE_H -#define I2CONVENIENCE_H - -/** - * @defgroup convenience Convenience component - * - * The convenience component takes service definitions from host objects - * and creates service objects. Technically this isn't strictly necessary but - * makes defining services a lot easier for users. - */ - -#include -#include -#include -#include - -#include "conveniencecomponent.h" - -#endif /* I2CONVENIENCE_H */ diff --git a/components/delegation/delegation.vcxproj b/components/delegation/delegation.vcxproj index 3d0ee725a..e3c0a9b8b 100644 --- a/components/delegation/delegation.vcxproj +++ b/components/delegation/delegation.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {17C93245-8C20-4316-9573-1AE41D918C10} @@ -21,31 +29,66 @@ true MultiByte + + DynamicLibrary + true + MultiByte + DynamicLibrary false true MultiByte + + DynamicLibrary + false + true + MultiByte + + + + + + + true $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -61,6 +104,20 @@ base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DELEGATION_EXPORTS;%(PreprocessorDefinitions) + false + true + + + Windows + true + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + Level3 @@ -79,6 +136,24 @@ base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;DELEGATION_EXPORTS;%(PreprocessorDefinitions) + false + true + + + Windows + true + true + true + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + diff --git a/components/demo/demo.vcxproj b/components/demo/demo.vcxproj index 3bc557941..c48033fff 100644 --- a/components/demo/demo.vcxproj +++ b/components/demo/demo.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {2E6C1133-730F-4875-A72C-B455B1DD4C5C} @@ -21,31 +29,66 @@ true MultiByte + + DynamicLibrary + true + MultiByte + DynamicLibrary false true MultiByte + + DynamicLibrary + false + true + MultiByte + + + + + + + true $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -61,6 +104,20 @@ base.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DEMO_EXPORTS;%(PreprocessorDefinitions) + Level3 + false + true + + + Windows + true + base.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + MaxSpeed @@ -79,6 +136,24 @@ base.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;DEMO_EXPORTS;%(PreprocessorDefinitions) + Level3 + false + true + + + Windows + true + true + true + base.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + diff --git a/components/replication/replication.vcxproj b/components/replication/replication.vcxproj index 7f021b74d..172455e48 100644 --- a/components/replication/replication.vcxproj +++ b/components/replication/replication.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C} @@ -21,31 +29,66 @@ true MultiByte + + DynamicLibrary + true + MultiByte + DynamicLibrary false true MultiByte + + DynamicLibrary + false + true + MultiByte + + + + + + + true $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -60,6 +103,19 @@ base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;CIBSYNC_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + Level3 @@ -77,6 +133,23 @@ base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;CIBSYNC_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + base.lib;config.lib;remoting.lib;icinga.lib;%(AdditionalDependencies) + + @@ -87,4 +160,4 @@ - + \ No newline at end of file diff --git a/configure.ac b/configure.ac index 97f5032cc..9ee93bc63 100644 --- a/configure.ac +++ b/configure.ac @@ -71,7 +71,6 @@ components/Makefile components/checker/Makefile components/compat/Makefile components/compatido/Makefile -components/convenience/Makefile components/delegation/Makefile components/demo/Makefile components/replication/Makefile diff --git a/debian/.gitignore b/debian/.gitignore deleted file mode 100644 index de4288929..000000000 --- a/debian/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -files -icinga2.postinst.debhelper -icinga2.postrm.debhelper -icinga2 diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 2308b0574..000000000 --- a/debian/changelog +++ /dev/null @@ -1,6 +0,0 @@ -icinga2 (2.0) precise; urgency=low - - * Initial version - - -- Gunnar Beutner Thu, 10 May 2012 10:57:22 +0200 - diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7f8f011eb..000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/debian/control b/debian/control deleted file mode 100644 index 33d81caed..000000000 --- a/debian/control +++ /dev/null @@ -1,13 +0,0 @@ -Source: icinga2 -Section: net -Priority: optional -Maintainer: Gunnar Beutner -Build-Depends: debhelper (>= 7), automake, autotools-dev, libltdl3-dev, libssl-dev, libboost-all-dev -Homepage: http://www.icinga.org/ - -Package: icinga2 -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: network monitoring application - Icinga 2 is a general-purpose network monitoring application. - diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 49baf5017..000000000 --- a/debian/copyright +++ /dev/null @@ -1,130 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: Icinga 2 -Upstream-Contact: Icinga Development Team -Source: http://www.icinga.org/ - -Files: * -Copyright: Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) -License: GPL-2+ with OpenSSL exception -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -In addition, as a special exception, the copyright holders give -permission to link the code of portions of this program with the -OpenSSL library under certain conditions as described in each -individual source file, and distribute linked combinations including -the two. - -You must obey the GNU General Public License in all respects for all -of the code used other than OpenSSL. If you modify file(s) with this -exception, you may extend this exception to your version of the -file(s), but you are not obligated to do so. If you do not wish to do -so, delete this exception statement from your version. If you delete -this exception statement from all source files in the program, then -also delete it here. - -Comment: On Debian systems, the complete text of the GNU General - Public License version 2 can be found in - `/usr/share/common-licenses/GPL-2'. - -Files: third-party/ltdl/* -Copyright: Copyright (C) 1998, 1999, 2000, 2004, 2005, 2006, - 2007, 2008, 2011 Free Software Foundation, Inc. - Written by Thomas Tanner, 1998 -License: LGPL-2+ -GNU Libltdl is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -As a special exception to the GNU Lesser General Public License, -if you distribute this file as part of a program or library that -is built using GNU Libtool, you may include this file under the -same distribution terms that you use for the rest of that program. - -GNU Libltdl is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with GNU Libltdl; see the file COPYING.LIB. If not, a -copy can be downloaded from http://www.gnu.org/licenses/lgpl.html, -or obtained by writing to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -Comment: On Debian systems, the complete text of the GNU Lesser - General Public License can be found in - `/usr/share/common-licenses/LGPL-2'. - -Files: third-party/cJSON/* -Copyright: Copyright (c) 2009 Dave Gamble -License: permissive -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - -Files: third-party/mmatch/* -Copyright: Copyright (C) 1990 Jarkko Oikarinen -License: GPL-1+ -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 1, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -Comment: On Debian systems, the complete text of the GNU General - Public License can be found in - `/usr/share/common-licenses/GPL-1'. - -Files: third-party/popen-noshell/* -Copyright: Copyright (c) 2009 Ivan Zahariev (famzah) -License: LGPL-3 -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation; under version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License -along with this program. If not, see . - -Comment: On Debian systems, the complete text of the GNU Lesser - General Public License can be found in - `/usr/share/common-licenses/LGPL-3'. diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index a2c0dbe5c..000000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,2 +0,0 @@ -[git-buildpackage] -prebuild = NOCONFIGURE=1 ./autogen.sh diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 68e1e8c27..000000000 --- a/debian/rules +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/make -f -#export DH_VERBOSE=1 - -%: - dh $@ - diff --git a/icinga-app/Makefile.am b/icinga-app/Makefile.am index 3f7e5a68c..9495c6d35 100644 --- a/icinga-app/Makefile.am +++ b/icinga-app/Makefile.am @@ -34,10 +34,8 @@ icinga2_LDADD = \ -dlopen ${top_builddir}/components/checker/checker.la \ -dlopen ${top_builddir}/components/replication/replication.la \ -dlopen ${top_builddir}/components/compat/compat.la \ - -dlopen ${top_builddir}/components/convenience/convenience.la \ -dlopen ${top_builddir}/components/delegation/delegation.la \ -dlopen ${top_builddir}/components/demo/demo.la icinga2_DEPENDENCIES = \ - ${top_builddir}/components/replication/replication.la \ - ${top_builddir}/components/convenience/convenience.la + ${top_builddir}/components/replication/replication.la diff --git a/icinga-app/icinga-app.vcxproj b/icinga-app/icinga-app.vcxproj index 70b28dcc4..772543824 100644 --- a/icinga-app/icinga-app.vcxproj +++ b/icinga-app/icinga-app.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -25,31 +33,66 @@ true MultiByte + + Application + true + MultiByte + Application false true MultiByte + + Application + false + true + MultiByte + + + + + + + true $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ false $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\icinga;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ @@ -65,6 +108,20 @@ base.lib;config.lib;icinga.lib;%(AdditionalDependencies) + + + Disabled + WIN32;I2_ICINGALAUNCHER_BUILD;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + Level3 + false + true + + + Console + true + base.lib;config.lib;icinga.lib;%(AdditionalDependencies) + + MaxSpeed @@ -84,6 +141,25 @@ base.lib;config.lib;icinga.lib;%(AdditionalDependencies) + + + MaxSpeed + true + true + WIN32;I2_ICINGALAUNCHER_BUILD;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + Speed + Level3 + false + true + + + Console + true + true + true + base.lib;config.lib;icinga.lib;%(AdditionalDependencies) + + diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp index 2efdc6ba0..a35e9dd52 100644 --- a/icinga-app/icinga.cpp +++ b/icinga-app/icinga.cpp @@ -62,8 +62,9 @@ int main(int argc, char **argv) return EXIT_FAILURE; } - String componentDirectory = Utility::DirName(Application::GetExePath(argv[0])) + "/../lib/icinga2"; - Component::AddSearchDir(componentDirectory); + String exeDirectory = Utility::DirName(Application::GetExePath(argv[0])); + Component::AddSearchDir(exeDirectory + "/../lib/icinga2"); + Component::AddSearchDir(exeDirectory + "/../lib64/icinga2"); DynamicObject::BeginTx(); diff --git a/icinga2.sln b/icinga2.sln index b3d98dd31..a6435bc95 100644 --- a/icinga2.sln +++ b/icinga2.sln @@ -7,7 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icinga-app", "icinga-app\ic {2E6C1133-730F-4875-A72C-B455B1DD4C5C} = {2E6C1133-730F-4875-A72C-B455B1DD4C5C} {17C93245-8C20-4316-9573-1AE41D918C10} = {17C93245-8C20-4316-9573-1AE41D918C10} {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C} = {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C} - {D02A349B-BAF7-41FB-86FF-B05BA05FE578} = {D02A349B-BAF7-41FB-86FF-B05BA05FE578} {38CE81CC-2660-4EF0-A936-4A337591DA3E} = {38CE81CC-2660-4EF0-A936-4A337591DA3E} {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} EndProjectSection @@ -41,11 +40,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compat", "components\compat {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convenience", "components\convenience\convenience.vcxproj", "{D02A349B-BAF7-41FB-86FF-B05BA05FE578}" - ProjectSection(ProjectDependencies) = postProject - {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compatido", "components\compatido\compatido.vcxproj", "{7D0C062E-5199-4A5F-A31C-602275EBDF63}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components", "components", "{4A1773FD-DDED-4952-8700-C898E890554A}" @@ -81,65 +75,111 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|Win64 = Debug|Win64 Release|Win32 = Release|Win32 + Release|Win64 = Release|Win64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {BE412865-FEBA-4259-AD41-58950D1F5432}.Debug|Win32.ActiveCfg = Debug|Win32 {BE412865-FEBA-4259-AD41-58950D1F5432}.Debug|Win32.Build.0 = Debug|Win32 + {BE412865-FEBA-4259-AD41-58950D1F5432}.Debug|Win64.ActiveCfg = Debug|x64 + {BE412865-FEBA-4259-AD41-58950D1F5432}.Debug|Win64.Build.0 = Debug|x64 {BE412865-FEBA-4259-AD41-58950D1F5432}.Release|Win32.ActiveCfg = Release|Win32 {BE412865-FEBA-4259-AD41-58950D1F5432}.Release|Win32.Build.0 = Release|Win32 + {BE412865-FEBA-4259-AD41-58950D1F5432}.Release|Win64.ActiveCfg = Release|x64 + {BE412865-FEBA-4259-AD41-58950D1F5432}.Release|Win64.Build.0 = Release|x64 {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Debug|Win32.ActiveCfg = Debug|Win32 {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Debug|Win32.Build.0 = Debug|Win32 + {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Debug|Win64.ActiveCfg = Debug|x64 + {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Debug|Win64.Build.0 = Debug|x64 {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Release|Win32.ActiveCfg = Release|Win32 {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Release|Win32.Build.0 = Release|Win32 + {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Release|Win64.ActiveCfg = Release|x64 + {2E6C1133-730F-4875-A72C-B455B1DD4C5C}.Release|Win64.Build.0 = Release|x64 {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Debug|Win32.ActiveCfg = Debug|Win32 {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Debug|Win32.Build.0 = Debug|Win32 + {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Debug|Win64.ActiveCfg = Debug|x64 + {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Debug|Win64.Build.0 = Debug|x64 {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Release|Win32.ActiveCfg = Release|Win32 {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Release|Win32.Build.0 = Release|Win32 + {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Release|Win64.ActiveCfg = Release|x64 + {66BED474-C33F-48F9-90BA-BBCFEDC006B8}.Release|Win64.Build.0 = Release|x64 {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Debug|Win32.ActiveCfg = Debug|Win32 {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Debug|Win32.Build.0 = Debug|Win32 + {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Debug|Win64.ActiveCfg = Debug|x64 + {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Debug|Win64.Build.0 = Debug|x64 {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Release|Win32.ActiveCfg = Release|Win32 {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Release|Win32.Build.0 = Release|Win32 + {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Release|Win64.ActiveCfg = Release|x64 + {19CBCE06-3F5C-479A-BD75-E2AB6215D345}.Release|Win64.Build.0 = Release|x64 {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Debug|Win32.ActiveCfg = Debug|Win32 {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Debug|Win32.Build.0 = Debug|Win32 + {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Debug|Win64.ActiveCfg = Debug|x64 + {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Debug|Win64.Build.0 = Debug|x64 {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Release|Win32.ActiveCfg = Release|Win32 {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Release|Win32.Build.0 = Release|Win32 + {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Release|Win64.ActiveCfg = Release|x64 + {38CE81CC-2660-4EF0-A936-4A337591DA3E}.Release|Win64.Build.0 = Release|x64 {17C93245-8C20-4316-9573-1AE41D918C10}.Debug|Win32.ActiveCfg = Debug|Win32 {17C93245-8C20-4316-9573-1AE41D918C10}.Debug|Win32.Build.0 = Debug|Win32 + {17C93245-8C20-4316-9573-1AE41D918C10}.Debug|Win64.ActiveCfg = Debug|x64 + {17C93245-8C20-4316-9573-1AE41D918C10}.Debug|Win64.Build.0 = Debug|x64 {17C93245-8C20-4316-9573-1AE41D918C10}.Release|Win32.ActiveCfg = Release|Win32 {17C93245-8C20-4316-9573-1AE41D918C10}.Release|Win32.Build.0 = Release|Win32 + {17C93245-8C20-4316-9573-1AE41D918C10}.Release|Win64.ActiveCfg = Release|x64 + {17C93245-8C20-4316-9573-1AE41D918C10}.Release|Win64.Build.0 = Release|x64 {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Debug|Win32.ActiveCfg = Debug|Win32 {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Debug|Win32.Build.0 = Debug|Win32 + {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Debug|Win64.ActiveCfg = Debug|x64 + {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Debug|Win64.Build.0 = Debug|x64 {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Release|Win32.ActiveCfg = Release|Win32 {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Release|Win32.Build.0 = Release|Win32 + {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Release|Win64.ActiveCfg = Release|x64 + {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C}.Release|Win64.Build.0 = Release|x64 {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Debug|Win32.ActiveCfg = Debug|Win32 {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Debug|Win32.Build.0 = Debug|Win32 + {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Debug|Win64.ActiveCfg = Debug|x64 + {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Debug|Win64.Build.0 = Debug|x64 {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|Win32.ActiveCfg = Release|Win32 {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|Win32.Build.0 = Release|Win32 - {D02A349B-BAF7-41FB-86FF-B05BA05FE578}.Debug|Win32.ActiveCfg = Debug|Win32 - {D02A349B-BAF7-41FB-86FF-B05BA05FE578}.Debug|Win32.Build.0 = Debug|Win32 - {D02A349B-BAF7-41FB-86FF-B05BA05FE578}.Release|Win32.ActiveCfg = Release|Win32 - {D02A349B-BAF7-41FB-86FF-B05BA05FE578}.Release|Win32.Build.0 = Release|Win32 + {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|Win64.ActiveCfg = Release|x64 + {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}.Release|Win64.Build.0 = Release|x64 {7D0C062E-5199-4A5F-A31C-602275EBDF63}.Debug|Win32.ActiveCfg = Debug|Win32 {7D0C062E-5199-4A5F-A31C-602275EBDF63}.Debug|Win32.Build.0 = Debug|Win32 {7D0C062E-5199-4A5F-A31C-602275EBDF63}.Release|Win32.ActiveCfg = Release|Win32 {7D0C062E-5199-4A5F-A31C-602275EBDF63}.Release|Win32.Build.0 = Release|Win32 {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|Win32.ActiveCfg = Debug|Win32 {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|Win32.Build.0 = Debug|Win32 + {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|Win64.ActiveCfg = Debug|x64 + {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|Win64.Build.0 = Debug|x64 {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|Win32.ActiveCfg = Release|Win32 {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|Win32.Build.0 = Release|Win32 + {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|Win64.ActiveCfg = Release|x64 + {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|Win64.Build.0 = Release|x64 {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Debug|Win32.ActiveCfg = Debug|Win32 {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Debug|Win32.Build.0 = Debug|Win32 + {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Debug|Win64.ActiveCfg = Debug|x64 + {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Debug|Win64.Build.0 = Debug|x64 {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Release|Win32.ActiveCfg = Release|Win32 {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Release|Win32.Build.0 = Release|Win32 + {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Release|Win64.ActiveCfg = Release|x64 + {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}.Release|Win64.Build.0 = Release|x64 {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Debug|Win32.ActiveCfg = Debug|Win32 {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Debug|Win32.Build.0 = Debug|Win32 + {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Debug|Win64.ActiveCfg = Debug|x64 + {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Debug|Win64.Build.0 = Debug|x64 {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Release|Win32.ActiveCfg = Release|Win32 {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Release|Win32.Build.0 = Release|Win32 + {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Release|Win64.ActiveCfg = Release|x64 + {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}.Release|Win64.Build.0 = Release|x64 {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}.Debug|Win64.ActiveCfg = Debug|x64 + {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Debug|Win64.Build.0 = Debug|x64 {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Release|Win32.ActiveCfg = Release|Win32 {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Release|Win32.Build.0 = Release|Win32 + {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Release|Win64.ActiveCfg = Release|x64 + {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Release|Win64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -149,7 +189,6 @@ Global {17C93245-8C20-4316-9573-1AE41D918C10} = {4A1773FD-DDED-4952-8700-C898E890554A} {704DDD8E-9E6D-4C22-80BD-6DE10F3A5E1C} = {4A1773FD-DDED-4952-8700-C898E890554A} {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA} = {4A1773FD-DDED-4952-8700-C898E890554A} - {D02A349B-BAF7-41FB-86FF-B05BA05FE578} = {4A1773FD-DDED-4952-8700-C898E890554A} {2E6C1133-730F-4875-A72C-B455B1DD4C5C} = {4A1773FD-DDED-4952-8700-C898E890554A} {7D0C062E-5199-4A5F-A31C-602275EBDF63} = {4A1773FD-DDED-4952-8700-C898E890554A} {19CBCE06-3F5C-479A-BD75-E2AB6215D345} = {3BE47C55-D74A-46E6-8F8B-470B3FD29FB7} diff --git a/lib/base/base.vcxproj b/lib/base/base.vcxproj index 7a9b7b78c..155a1e963 100644 --- a/lib/base/base.vcxproj +++ b/lib/base/base.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -20,7 +28,9 @@ Create + Create Create + Create @@ -86,29 +96,62 @@ true MultiByte + + DynamicLibrary + true + MultiByte + false true MultiByte DynamicLibrary + + false + true + MultiByte + DynamicLibrary + + + + + + + $(SolutionDir)\third-party\mmatch;$(SolutionDir)\third-party\cJSON;$(IncludePath) - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)\third-party\mmatch;$(SolutionDir)\third-party\cJSON;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(SolutionDir)\third-party\mmatch;$(SolutionDir)\third-party\cJSON;$(IncludePath) - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)\third-party\mmatch;$(SolutionDir)\third-party\cJSON;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -129,6 +172,25 @@ ws2_32.lib;shlwapi.lib + + + Disabled + _WINDLL;I2_BASE_BUILD;_DEBUG;%(PreprocessorDefinitions) + Level3 + false + i2-base.h + Use + true + + + Windows + true + ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;libeay32MTd.lib;ssleay32MTd.lib;%(AdditionalDependencies) + + + ws2_32.lib;shlwapi.lib + + Use @@ -153,6 +215,30 @@ ws2_32.lib;shlwapi.lib + + + Use + MaxSpeed + true + true + _WINDLL;I2_BASE_BUILD;%(PreprocessorDefinitions) + Speed + Level3 + false + i2-base.h + true + + + Windows + true + true + true + ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;libeay32MT.lib;ssleay32MT.lib;%(AdditionalDependencies) + + + ws2_32.lib;shlwapi.lib + + diff --git a/lib/base/streamlogger.cpp b/lib/base/streamlogger.cpp index 758484a14..bd292878b 100644 --- a/lib/base/streamlogger.cpp +++ b/lib/base/streamlogger.cpp @@ -58,7 +58,7 @@ void StreamLogger::ProcessLogEntry(std::ostream& stream, const LogEntry& entry) time_t ts = entry.Timestamp; tm tmnow = *localtime(&ts); - strftime(timestamp, sizeof(timestamp), "%Y/%m/%d %H:%M:%S", &tmnow); + strftime(timestamp, sizeof(timestamp), "%a, %d %b %Y %T %z", &tmnow); stream << "[" << timestamp << "] " << Logger::SeverityToString(entry.Severity) << "/" << entry.Facility << ": " diff --git a/lib/config/config.vcxproj b/lib/config/config.vcxproj index 4822a6d9a..0986ab37a 100644 --- a/lib/config/config.vcxproj +++ b/lib/config/config.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -26,32 +34,46 @@ NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing Create + Create Create + Create config_lexer.cc + config_lexer.cc config_lexer.cc + config_lexer.cc win_flex "%(FullPath)" + win_flex "%(FullPath)" win_flex "%(FullPath)" + win_flex "%(FullPath)" Document win_bison -d "%(FullPath)" + win_bison -d "%(FullPath)" config_parser.cc config_parser.h + config_parser.cc config_parser.h win_bison -d "%(FullPath)" + win_bison -d "%(FullPath)" config_parser.cc config_parser.h + config_parser.cc config_parser.h Document @@ -66,29 +88,62 @@ true MultiByte + + DynamicLibrary + true + MultiByte + DynamicLibrary false true MultiByte + + DynamicLibrary + false + true + MultiByte + + + + + + + $(SolutionDir)\lib\base;$(IncludePath) - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)\lib\base;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(SolutionDir)\lib\base;$(IncludePath) - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)\lib\base;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -106,6 +161,22 @@ base.lib;%(AdditionalDependencies) + + + Use + Level3 + Disabled + _WINDLL;I2_CONFIG_BUILD;_DEBUG;%(PreprocessorDefinitions) + false + i2-config.h + true + + + Windows + true + base.lib;%(AdditionalDependencies) + + Level3 @@ -126,6 +197,26 @@ base.lib;%(AdditionalDependencies) + + + Level3 + Use + MaxSpeed + true + true + _WINDLL;I2_CONFIG_BUILD;%(PreprocessorDefinitions) + false + i2-config.h + true + + + Windows + true + true + true + base.lib;%(AdditionalDependencies) + + diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp index f4aff61f1..95fe7e0a3 100644 --- a/lib/icinga/host.cpp +++ b/lib/icinga/host.cpp @@ -23,9 +23,18 @@ using namespace icinga; REGISTER_CLASS(Host); +bool Host::m_InitializerDone = false; + Host::Host(const Dictionary::Ptr& properties) : DynamicObject(properties) { + if (!m_InitializerDone) { + ConfigItem::OnCommitted.connect(boost::bind(&Host::ObjectCommittedHandler, this, _1)); + ConfigItem::OnRemoved.connect(boost::bind(&Host::ObjectRemovedHandler, this, _1)); + + m_InitializerDone = true; + } + RegisterAttribute("alias", Attribute_Config); RegisterAttribute("hostgroups", Attribute_Config); } @@ -127,3 +136,134 @@ bool Host::IsUp(void) return true; } + +template +static void CopyServiceAttributes(const Host::Ptr& host, TDict serviceDesc, + const ConfigItemBuilder::Ptr& builder) +{ + /* TODO: we only need to copy macros if this is an inline definition, + * i.e. host->GetProperties() != service, however for now we just + * copy them anyway. */ + Value macros = serviceDesc->Get("macros"); + if (!macros.IsEmpty()) + builder->AddExpression("macros", OperatorPlus, macros); + + Value checkInterval = serviceDesc->Get("check_interval"); + if (!checkInterval.IsEmpty()) + builder->AddExpression("check_interval", OperatorSet, checkInterval); + + Value retryInterval = serviceDesc->Get("retry_interval"); + if (!retryInterval.IsEmpty()) + builder->AddExpression("retry_interval", OperatorSet, retryInterval); + + Value sgroups = serviceDesc->Get("servicegroups"); + if (!sgroups.IsEmpty()) + builder->AddExpression("servicegroups", OperatorPlus, sgroups); + + Value checkers = serviceDesc->Get("checkers"); + if (!checkers.IsEmpty()) + builder->AddExpression("checkers", OperatorSet, checkers); + + Value dependencies = serviceDesc->Get("dependencies"); + if (!dependencies.IsEmpty()) + builder->AddExpression("dependencies", OperatorPlus, + Service::ResolveDependencies(host, dependencies)); + + Value hostchecks = serviceDesc->Get("hostchecks"); + if (!hostchecks.IsEmpty()) + builder->AddExpression("dependencies", OperatorPlus, + Service::ResolveDependencies(host, hostchecks)); +} + +void Host::ObjectCommittedHandler(const ConfigItem::Ptr& item) +{ + if (item->GetType() != "Host") + return; + + /* ignore abstract host objects */ + if (!Host::Exists(item->GetName())) + return; + + Host::Ptr host = Host::GetByName(item->GetName()); + + Dictionary::Ptr oldServices = host->Get("convenience_services"); + + Dictionary::Ptr newServices; + newServices = boost::make_shared(); + + Dictionary::Ptr serviceDescs = host->Get("services"); + + if (serviceDescs) { + String svcname; + Value svcdesc; + BOOST_FOREACH(tie(svcname, svcdesc), serviceDescs) { + stringstream namebuf; + namebuf << item->GetName() << "-" << svcname; + String name = namebuf.str(); + + ConfigItemBuilder::Ptr builder = boost::make_shared(item->GetDebugInfo()); + builder->SetType("Service"); + builder->SetName(name); + builder->AddExpression("host_name", OperatorSet, item->GetName()); + builder->AddExpression("alias", OperatorSet, svcname); + + CopyServiceAttributes(host, host, builder); + + if (svcdesc.IsScalar()) { + builder->AddParent(svcdesc); + } else if (svcdesc.IsObjectType()) { + Dictionary::Ptr service = svcdesc; + + String parent = service->Get("service"); + if (parent.IsEmpty()) + parent = svcname; + + builder->AddParent(parent); + + CopyServiceAttributes(host, service, builder); + } else { + throw_exception(invalid_argument("Service description must be either a string or a dictionary.")); + } + + ConfigItem::Ptr serviceItem = builder->Compile(); + serviceItem->Commit(); + + newServices->Set(name, serviceItem); + } + } + + if (oldServices) { + ConfigItem::Ptr service; + BOOST_FOREACH(tie(tuples::ignore, service), oldServices) { + if (!service) + continue; + + if (!newServices->Contains(service->GetName())) + service->Unregister(); + } + } + + host->Set("convenience_services", newServices); +} + +void Host::ObjectRemovedHandler(const ConfigItem::Ptr& item) +{ + if (item->GetType() != "Host") + return; + + DynamicObject::Ptr host = item->GetDynamicObject(); + + if (!host) + return; + + Dictionary::Ptr services = host->Get("convenience_services"); + + if (!services) + return; + + ConfigItem::Ptr service; + BOOST_FOREACH(tie(tuples::ignore, service), services) { + service->Unregister(); + } +} + diff --git a/lib/icinga/host.h b/lib/icinga/host.h index 26d06bac0..48ef812b6 100644 --- a/lib/icinga/host.h +++ b/lib/icinga/host.h @@ -46,6 +46,12 @@ public: bool IsReachable(void); bool IsUp(void); + +private: + static bool m_InitializerDone; + + void ObjectCommittedHandler(const ConfigItem::Ptr& item); + void ObjectRemovedHandler(const ConfigItem::Ptr& item); }; } diff --git a/lib/icinga/icinga.vcxproj b/lib/icinga/icinga.vcxproj index 4843e3180..26cae9771 100644 --- a/lib/icinga/icinga.vcxproj +++ b/lib/icinga/icinga.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -16,7 +24,9 @@ Create + Create Create + Create @@ -51,31 +61,66 @@ true MultiByte + + DynamicLibrary + true + MultiByte + DynamicLibrary false true MultiByte + + DynamicLibrary + false + true + MultiByte + + + + + + + true $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\config;$(IncludePath) - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + true + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\config;$(IncludePath) - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + false + $(SolutionDir)\lib\base;$(SolutionDir)\lib\remoting;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -93,6 +138,22 @@ base.lib;remoting.lib;config.lib;%(AdditionalDependencies) + + + Use + Disabled + WIN32;I2_ICINGA_BUILD;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + Level3 + false + i2-icinga.h + true + + + Console + true + base.lib;remoting.lib;config.lib;%(AdditionalDependencies) + + Use @@ -114,6 +175,27 @@ base.lib;remoting.lib;config.lib;%(AdditionalDependencies) + + + Use + MaxSpeed + true + true + WIN32;I2_ICINGA_BUILD;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + Speed + Level3 + false + i2-icinga.h + true + + + Console + true + true + true + base.lib;remoting.lib;config.lib;%(AdditionalDependencies) + + diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp index a2764db65..f8969fa1a 100644 --- a/lib/icinga/icingaapplication.cpp +++ b/lib/icinga/icingaapplication.cpp @@ -41,14 +41,6 @@ IcingaApplication::IcingaApplication(const Dictionary::Ptr& serializedUpdate) replicationComponentConfig->SetLocal(true); replicationComponentConfig->Compile()->Commit(); replicationComponentConfig.reset(); - - /* load convenience config component */ - ConfigItemBuilder::Ptr convenienceComponentConfig = boost::make_shared(); - convenienceComponentConfig->SetType("Component"); - convenienceComponentConfig->SetName("convenience"); - convenienceComponentConfig->SetLocal(true); - convenienceComponentConfig->Compile()->Commit(); - convenienceComponentConfig.reset(); } /** @@ -163,7 +155,7 @@ int IcingaApplication::Main(const vector& args) DumpProgramState(); - Logger::Write(LogInformation, "icinga", "Icinga shutting down."); + Logger::Write(LogInformation, "icinga", "Icinga has shut down."); return EXIT_SUCCESS; } diff --git a/lib/remoting/remoting.vcxproj b/lib/remoting/remoting.vcxproj index be3cc84fb..10c03c96a 100644 --- a/lib/remoting/remoting.vcxproj +++ b/lib/remoting/remoting.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -25,7 +33,9 @@ Create + Create Create + Create @@ -44,29 +54,62 @@ true MultiByte + + DynamicLibrary + true + MultiByte + DynamicLibrary false true MultiByte + + DynamicLibrary + false + true + MultiByte + + + + + + + $(SolutionDir)\lib\base;$(SolutionDir)\lib\config;$(IncludePath) - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)\lib\base;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(SolutionDir)\lib\base;$(SolutionDir)\lib\config;$(IncludePath) - $(OutDir);$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + $(SolutionDir)\lib\base;$(SolutionDir)\lib\config;$(IncludePath) + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -88,6 +131,26 @@ + + + Use + Disabled + WIN32;I2_REMOTING_BUILD;_DEBUG;_LIB;%(PreprocessorDefinitions) + Level3 + false + i2-remoting.h + true + + + Windows + true + base.lib;config.lib;%(AdditionalDependencies) + + + + + + Use @@ -113,6 +176,31 @@ + + + Use + MaxSpeed + true + true + WIN32;I2_REMOTING_BUILD;NDEBUG;_LIB;%(PreprocessorDefinitions) + Speed + Level3 + false + i2-remoting.h + true + + + Windows + true + true + true + base.lib;config.lib;%(AdditionalDependencies) + + + + + + diff --git a/third-party/cJSON/cJSON.vcxproj b/third-party/cJSON/cJSON.vcxproj index fb1cad695..74bab4f7f 100644 --- a/third-party/cJSON/cJSON.vcxproj +++ b/third-party/cJSON/cJSON.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -27,23 +35,59 @@ true MultiByte + + StaticLibrary + true + MultiByte + StaticLibrary false true MultiByte + + StaticLibrary + false + true + MultiByte + + + + + + + - + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + Disabled @@ -57,6 +101,19 @@ true + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + Level3 + false + true + + + Windows + true + + MaxSpeed @@ -75,6 +132,24 @@ true + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + Speed + Level3 + false + true + + + Windows + true + true + true + + diff --git a/third-party/mmatch/mmatch.vcxproj b/third-party/mmatch/mmatch.vcxproj index c65e344f5..663994eb2 100644 --- a/third-party/mmatch/mmatch.vcxproj +++ b/third-party/mmatch/mmatch.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + @@ -27,23 +35,59 @@ true Unicode + + StaticLibrary + true + Unicode + StaticLibrary false true Unicode + + StaticLibrary + false + true + Unicode + + + + + + + - + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + Disabled @@ -57,6 +101,19 @@ true + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + Level3 + false + true + + + Windows + true + + MaxSpeed @@ -74,6 +131,23 @@ true + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + Level3 + false + true + + + Windows + true + true + true + +