Windows build fix.

diff --git a/.gitignore b/.gitignore
index 81e9d0fac5ff9b00a25f2c34007cd007716937be..cff079849d770c04916f0ea9dcf59d86c74b5232 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ m4/ylwrap
 m4/test-driver
 icinga2-*.tar.gz
 icinga2.spec
+packages
\ No newline at end of file

diff --git a/components/checker/checker.vcxproj b/components/checker/checker.vcxproj
index 5f93d8de0791962b4fe0e12aa6436763e0f2bd2a..539e58e630caa0bb6d1c65179532c597bba1aa1f 100644 (file)
--- a/components/checker/checker.vcxproj
+++ b/components/checker/checker.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.props" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,23 +29,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -160,7 +165,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="checkercomponent.h" />
-    <ClInclude Include="i2-checker.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="checker-type.cpp" />
@@ -187,7 +191,22 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\packages\boost.1.54.0.1\build\native\boost.targets" Condition="Exists('..\..\packages\boost.1.54.0.1\build\native\boost.targets')" />
+    <Import Project="..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets" Condition="Exists('..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets')" />
+    <Import Project="..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets" Condition="Exists('..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets')" />
+    <Import Project="..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets" Condition="Exists('..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets')" />
+    <Import Project="..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets" Condition="Exists('..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets')" />
+    <Import Project="..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets" Condition="Exists('..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets')" />
+    <Import Project="..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
+    <Import Project="..\..\packages\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\..\packages\zlib.1.2.8.6\build\native\zlib.targets')" />
+    <Import Project="..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
+    <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.targets')" />
+    <Import Project="..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets" Condition="Exists('..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets')" />
+    <Import Project="..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets" Condition="Exists('..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file

diff --git a/components/checker/checker.vcxproj.filters b/components/checker/checker.vcxproj.filters
index d5458f8d8f9b42c0c7513f9930ee6727f4b07a59..571eb2d8b95e7d7d7c6b8efef57a9f155a733e88 100644 (file)
--- a/components/checker/checker.vcxproj.filters
+++ b/components/checker/checker.vcxproj.filters
@@ -11,9 +11,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="i2-checker.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
     <ClInclude Include="checkercomponent.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
@@ -31,4 +28,7 @@
       <Filter>Quelldateien</Filter>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/components/checker/packages.config b/components/checker/packages.config
new file mode 100644 (file)
index 0000000..63dced5
--- /dev/null
+++ b/components/checker/packages.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="boost" version="1.54.0.1" targetFramework="Native" />
+  <package id="boost_chrono" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_date_time" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_exception" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_program_options" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_system" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_thread" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_unit_test_framework" version="1.54.0.2" targetFramework="Native" />
+  <package id="openssl" version="1.0.1.24" targetFramework="Native" />
+  <package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
+  <package id="zlib" version="1.2.8.6" targetFramework="Native" />
+  <package id="zlib.redist" version="1.2.8.6" targetFramework="Native" />
+</packages>
\ No newline at end of file

diff --git a/components/cluster/cluster.vcxproj b/components/cluster/cluster.vcxproj
index 4b1da3c51b2ed9724647a922f8c54dedb45941b5..ee5bacb28613c6dc219187fae69402e0b120b023 100644 (file)
--- a/components/cluster/cluster.vcxproj
+++ b/components/cluster/cluster.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.props" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -20,12 +21,12 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="cluster-type.cpp" />
-    <ClCompile Include="clustercomponent.cpp" />
+    <ClCompile Include="clusterlistener.cpp" />
     <ClCompile Include="endpoint.cpp" />
     <ClCompile Include="jsonrpc.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="clustercomponent.h" />
+    <ClInclude Include="clusterlistener.h" />
     <ClInclude Include="endpoint.h" />
     <ClInclude Include="jsonrpc.h" />
   </ItemGroup>
@@ -50,6 +51,9 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{8732E0CD-E3D0-41F2-A538-94884543890F}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -60,23 +64,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -192,5 +200,17 @@
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\packages\boost.1.54.0.1\build\native\boost.targets" Condition="Exists('..\..\packages\boost.1.54.0.1\build\native\boost.targets')" />
+    <Import Project="..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets" Condition="Exists('..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets')" />
+    <Import Project="..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets" Condition="Exists('..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets')" />
+    <Import Project="..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets" Condition="Exists('..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets')" />
+    <Import Project="..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets" Condition="Exists('..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets')" />
+    <Import Project="..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets" Condition="Exists('..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets')" />
+    <Import Project="..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
+    <Import Project="..\..\packages\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\..\packages\zlib.1.2.8.6\build\native\zlib.targets')" />
+    <Import Project="..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
+    <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.targets')" />
+    <Import Project="..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets" Condition="Exists('..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets')" />
+    <Import Project="..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets" Condition="Exists('..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file

diff --git a/components/cluster/cluster.vcxproj.filters b/components/cluster/cluster.vcxproj.filters
index 1738de41b2d91cc29c68cf1a7d07ab3dc215edf9..fdb66804fe73d0e45eebb9ce61a82ca1a782cb55 100644 (file)
--- a/components/cluster/cluster.vcxproj.filters
+++ b/components/cluster/cluster.vcxproj.filters
@@ -9,9 +9,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="clustercomponent.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
     <ClCompile Include="endpoint.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
@@ -21,21 +18,27 @@
     <ClCompile Include="cluster-type.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="clusterlistener.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="clustercomponent.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
     <ClInclude Include="jsonrpc.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
     <ClInclude Include="endpoint.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
+    <ClInclude Include="clusterlistener.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="cluster-type.conf">
       <Filter>Quelldateien</Filter>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/components/cluster/packages.config b/components/cluster/packages.config
new file mode 100644 (file)
index 0000000..63dced5
--- /dev/null
+++ b/components/cluster/packages.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="boost" version="1.54.0.1" targetFramework="Native" />
+  <package id="boost_chrono" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_date_time" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_exception" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_program_options" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_system" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_thread" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_unit_test_framework" version="1.54.0.2" targetFramework="Native" />
+  <package id="openssl" version="1.0.1.24" targetFramework="Native" />
+  <package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
+  <package id="zlib" version="1.2.8.6" targetFramework="Native" />
+  <package id="zlib.redist" version="1.2.8.6" targetFramework="Native" />
+</packages>
\ No newline at end of file

diff --git a/components/compat/compat.vcxproj b/components/compat/compat.vcxproj
index c782d0275e1e32d4a3fcfde3ff9f06f3b32e9c99..10e3cd00005bdbb775f2af73520d624cbe5062d2 100644 (file)
--- a/components/compat/compat.vcxproj
+++ b/components/compat/compat.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.props" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,23 +29,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -157,12 +162,11 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="checkresultreader.cpp" />
     <ClCompile Include="compat-type.cpp" />
-    <ClCompile Include="compatcomponent.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="compatcomponent.h" />
-    <ClInclude Include="i2-compat.h" />
+    <ClCompile Include="compatlogger.cpp" />
+    <ClCompile Include="externalcommandlistener.cpp" />
+    <ClCompile Include="statusdatawriter.cpp" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="compat-type.conf">
@@ -185,7 +189,28 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="checkresultreader.h" />
+    <ClInclude Include="compatlogger.h" />
+    <ClInclude Include="externalcommandlistener.h" />
+    <ClInclude Include="statusdatawriter.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\packages\boost.1.54.0.1\build\native\boost.targets" Condition="Exists('..\..\packages\boost.1.54.0.1\build\native\boost.targets')" />
+    <Import Project="..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets" Condition="Exists('..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets')" />
+    <Import Project="..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets" Condition="Exists('..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets')" />
+    <Import Project="..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets" Condition="Exists('..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets')" />
+    <Import Project="..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets" Condition="Exists('..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets')" />
+    <Import Project="..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets" Condition="Exists('..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets')" />
+    <Import Project="..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
+    <Import Project="..\..\packages\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\..\packages\zlib.1.2.8.6\build\native\zlib.targets')" />
+    <Import Project="..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
+    <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.targets')" />
+    <Import Project="..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets" Condition="Exists('..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets')" />
+    <Import Project="..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets" Condition="Exists('..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file

diff --git a/components/compat/compat.vcxproj.filters b/components/compat/compat.vcxproj.filters
index bf36e4f8744b84b08e6dead62e4463e0a0a409ad..2f561cf1b13fb15bfa961e5b00ea7ee81d408b79 100644 (file)
--- a/components/compat/compat.vcxproj.filters
+++ b/components/compat/compat.vcxproj.filters
@@ -11,18 +11,19 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="compatcomponent.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="i2-compat.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="compatcomponent.cpp">
+    <ClCompile Include="compat-type.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="compat-type.cpp">
+    <ClCompile Include="checkresultreader.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="compatlogger.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="externalcommandlistener.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="statusdatawriter.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
   </ItemGroup>
@@ -31,4 +32,21 @@
       <Filter>Quelldateien</Filter>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="checkresultreader.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="compatlogger.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="externalcommandlistener.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="statusdatawriter.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/components/compat/compatlogger.cpp b/components/compat/compatlogger.cpp
index 396f20034b02325854c50d761f13a1eb367dd7c1..7ce65879ce0df16ecc4e02ce0c663d86cf00d0a5 100644 (file)
--- a/components/compat/compatlogger.cpp
+++ b/components/compat/compatlogger.cpp
@@ -57,7 +57,7 @@ void CompatLogger::Start(void)
        Service::OnFlappingChanged.connect(bind(&CompatLogger::FlappingHandler, this, _1, _2));
        Service::OnDowntimeTriggered.connect(boost::bind(&CompatLogger::TriggerDowntimeHandler, this, _1, _2));
        Service::OnDowntimeRemoved.connect(boost::bind(&CompatLogger::RemoveDowntimeHandler, this, _1, _2));
-       ExternalCommandProcessor::OnNewExternalCommand.connect(bind(&CompatLogger::ExternalCommandHandler, this, _2, _3));
+       ExternalCommandProcessor::OnNewExternalCommand.connect(boost::bind(&CompatLogger::ExternalCommandHandler, this, _2, _3));
 
        m_RotationTimer = boost::make_shared<Timer>();
        m_RotationTimer->OnTimerExpired.connect(boost::bind(&CompatLogger::RotationTimerHandler, this));

diff --git a/components/compat/packages.config b/components/compat/packages.config
new file mode 100644 (file)
index 0000000..63dced5
--- /dev/null
+++ b/components/compat/packages.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="boost" version="1.54.0.1" targetFramework="Native" />
+  <package id="boost_chrono" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_date_time" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_exception" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_program_options" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_system" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_thread" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_unit_test_framework" version="1.54.0.2" targetFramework="Native" />
+  <package id="openssl" version="1.0.1.24" targetFramework="Native" />
+  <package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
+  <package id="zlib" version="1.2.8.6" targetFramework="Native" />
+  <package id="zlib.redist" version="1.2.8.6" targetFramework="Native" />
+</packages>
\ No newline at end of file

diff --git a/components/db_ido_mysql/ido_mysql.vcxproj b/components/db_ido_mysql/db_ido_mysql.vcxproj
similarity index 79%
rename from components/db_ido_mysql/ido_mysql.vcxproj
rename to components/db_ido_mysql/db_ido_mysql.vcxproj
index fcf55e5d2b5097ee2b70cf765854eb28bdeb3e48..7630e0157ac283f69856659aee6e4bcce21dd798 100644 (file)
--- a/components/db_ido_mysql/ido_mysql.vcxproj
+++ b/components/db_ido_mysql/db_ido_mysql.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.props" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,7 +20,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{2E6C1133-730F-4875-A72C-B455B1DD4C5C}</ProjectGuid>
+    <ProjectGuid>{273A9D62-F556-4B5E-B235-B608106CB028}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>demo</RootNamespace>
   </PropertyGroup>
@@ -28,23 +29,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -159,15 +164,14 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="democomponent.h" />
-    <ClInclude Include="i2-demo.h" />
+    <ClInclude Include="idomysqlconnection.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="demo-type.cpp" />
-    <ClCompile Include="democomponent.cpp" />
+    <ClCompile Include="db_ido_mysql-type.cpp" />
+    <ClCompile Include="idomysqlconnection.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="demo-type.conf">
+    <CustomBuild Include="db_ido_mysql-type.conf">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Preparing config fragment for embedding</Message>
@@ -187,7 +191,22 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\packages\boost.1.54.0.1\build\native\boost.targets" Condition="Exists('..\..\packages\boost.1.54.0.1\build\native\boost.targets')" />
+    <Import Project="..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets" Condition="Exists('..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets')" />
+    <Import Project="..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets" Condition="Exists('..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets')" />
+    <Import Project="..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets" Condition="Exists('..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets')" />
+    <Import Project="..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets" Condition="Exists('..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets')" />
+    <Import Project="..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets" Condition="Exists('..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets')" />
+    <Import Project="..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
+    <Import Project="..\..\packages\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\..\packages\zlib.1.2.8.6\build\native\zlib.targets')" />
+    <Import Project="..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
+    <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.targets')" />
+    <Import Project="..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets" Condition="Exists('..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets')" />
+    <Import Project="..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets" Condition="Exists('..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file

diff --git a/components/db_ido_mysql/ido_mysql.vcxproj.filters b/components/db_ido_mysql/db_ido_mysql.vcxproj.filters
similarity index 73%
rename from components/db_ido_mysql/ido_mysql.vcxproj.filters
rename to components/db_ido_mysql/db_ido_mysql.vcxproj.filters
index 922435a5279187f400ac03cec35982b2c482fbd1..3619115b191b54e3178f5efb6f6cbd3cf4ac8ef8 100644 (file)
--- a/components/db_ido_mysql/ido_mysql.vcxproj.filters
+++ b/components/db_ido_mysql/db_ido_mysql.vcxproj.filters
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClInclude Include="democomponent.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="i2-demo.h">
+    <ClInclude Include="idomysqlconnection.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
   </ItemGroup>
@@ -17,15 +14,18 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="democomponent.cpp">
+    <ClCompile Include="idomysqlconnection.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="demo-type.cpp">
+    <ClCompile Include="db_ido_mysql-type.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="demo-type.conf">
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="db_ido_mysql-type.conf">
       <Filter>Quelldateien</Filter>
     </CustomBuild>
   </ItemGroup>

diff --git a/components/db_ido_mysql/packages.config b/components/db_ido_mysql/packages.config
new file mode 100644 (file)
index 0000000..63dced5
--- /dev/null
+++ b/components/db_ido_mysql/packages.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="boost" version="1.54.0.1" targetFramework="Native" />
+  <package id="boost_chrono" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_date_time" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_exception" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_program_options" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_system" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_thread" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_unit_test_framework" version="1.54.0.2" targetFramework="Native" />
+  <package id="openssl" version="1.0.1.24" targetFramework="Native" />
+  <package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
+  <package id="zlib" version="1.2.8.6" targetFramework="Native" />
+  <package id="zlib.redist" version="1.2.8.6" targetFramework="Native" />
+</packages>
\ No newline at end of file

diff --git a/components/demo/demo.vcxproj b/components/demo/demo.vcxproj
index 167f0ccd7fe4ac1001f2115684e24958186f25c8..6aca3d0fe90d79618edd6d2935811038503a4b70 100644 (file)
--- a/components/demo/demo.vcxproj
+++ b/components/demo/demo.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.props" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,23 +29,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -158,13 +163,9 @@
       <AdditionalDependencies>base.lib;config.lib;icinga.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="democomponent.h" />
-    <ClInclude Include="i2-demo.h" />
-  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="demo-type.cpp" />
-    <ClCompile Include="democomponent.cpp" />
+    <ClCompile Include="demo.cpp" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="demo-type.conf">
@@ -187,7 +188,25 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="demo.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\packages\boost.1.54.0.1\build\native\boost.targets" Condition="Exists('..\..\packages\boost.1.54.0.1\build\native\boost.targets')" />
+    <Import Project="..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets" Condition="Exists('..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets')" />
+    <Import Project="..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets" Condition="Exists('..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets')" />
+    <Import Project="..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets" Condition="Exists('..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets')" />
+    <Import Project="..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets" Condition="Exists('..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets')" />
+    <Import Project="..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets" Condition="Exists('..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets')" />
+    <Import Project="..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
+    <Import Project="..\..\packages\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\..\packages\zlib.1.2.8.6\build\native\zlib.targets')" />
+    <Import Project="..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
+    <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.targets')" />
+    <Import Project="..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets" Condition="Exists('..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets')" />
+    <Import Project="..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets" Condition="Exists('..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file

diff --git a/components/demo/demo.vcxproj.filters b/components/demo/demo.vcxproj.filters
index 922435a5279187f400ac03cec35982b2c482fbd1..f7e1bf626800b977a09e762492db4e6f3e723db3 100644 (file)
--- a/components/demo/demo.vcxproj.filters
+++ b/components/demo/demo.vcxproj.filters
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="democomponent.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="i2-demo.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-  </ItemGroup>
   <ItemGroup>
     <Filter Include="Headerdateien">
       <UniqueIdentifier>{11a495bf-a705-4766-b3d3-9b5db266a6ef}</UniqueIdentifier>
@@ -17,10 +9,10 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="democomponent.cpp">
+    <ClCompile Include="demo-type.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="demo-type.cpp">
+    <ClCompile Include="demo.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
   </ItemGroup>
@@ -29,4 +21,12 @@
       <Filter>Quelldateien</Filter>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="demo.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/components/demo/packages.config b/components/demo/packages.config
new file mode 100644 (file)
index 0000000..63dced5
--- /dev/null
+++ b/components/demo/packages.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="boost" version="1.54.0.1" targetFramework="Native" />
+  <package id="boost_chrono" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_date_time" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_exception" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_program_options" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_system" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_thread" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_unit_test_framework" version="1.54.0.2" targetFramework="Native" />
+  <package id="openssl" version="1.0.1.24" targetFramework="Native" />
+  <package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
+  <package id="zlib" version="1.2.8.6" targetFramework="Native" />
+  <package id="zlib.redist" version="1.2.8.6" targetFramework="Native" />
+</packages>
\ No newline at end of file

diff --git a/components/livestatus/livestatus.vcxproj b/components/livestatus/livestatus.vcxproj
index fcb009c30a4937478fc8102dcbcc09d424d4fcd7..2cf7c1afd4494674ac17ff8e1a596278647aef4e 100644 (file)
--- a/components/livestatus/livestatus.vcxproj
+++ b/components/livestatus/livestatus.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.props" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -21,6 +22,7 @@
   <ItemGroup>
     <ClInclude Include="aggregator.h" />
     <ClInclude Include="countaggregator.h" />
+    <ClInclude Include="listener.h" />
     <ClInclude Include="sumaggregator.h" />
     <ClInclude Include="avgaggregator.h" />
     <ClInclude Include="minaggregator.h" />
@@ -40,8 +42,6 @@
     <ClInclude Include="filter.h" />
     <ClInclude Include="hostgroupstable.h" />
     <ClInclude Include="hoststable.h" />
-    <ClInclude Include="i2-livestatus.h" />
-    <ClInclude Include="component.h" />
     <ClInclude Include="negatefilter.h" />
     <ClInclude Include="orfilter.h" />
     <ClInclude Include="query.h" />
@@ -62,7 +62,6 @@
     <ClCompile Include="combinerfilter.cpp" />
     <ClCompile Include="commandstable.cpp" />
     <ClCompile Include="commentstable.cpp" />
-    <ClCompile Include="component.cpp" />
     <ClCompile Include="contactgroupstable.cpp" />
     <ClCompile Include="contactstable.cpp" />
     <ClCompile Include="downtimestable.cpp" />
@@ -71,6 +70,7 @@
     <ClCompile Include="hoststable.cpp" />
     <ClCompile Include="invavgaggregator.cpp" />
     <ClCompile Include="invsumaggregator.cpp" />
+    <ClCompile Include="listener.cpp" />
     <ClCompile Include="livestatus-type.cpp" />
     <ClCompile Include="maxaggregator.cpp" />
     <ClCompile Include="minaggregator.cpp" />
@@ -107,6 +107,9 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{950E8743-BB34-4F8A-99EC-C87E8FC0EB3F}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -117,23 +120,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -249,5 +256,17 @@
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\packages\boost.1.54.0.1\build\native\boost.targets" Condition="Exists('..\..\packages\boost.1.54.0.1\build\native\boost.targets')" />
+    <Import Project="..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets" Condition="Exists('..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets')" />
+    <Import Project="..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets" Condition="Exists('..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets')" />
+    <Import Project="..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets" Condition="Exists('..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets')" />
+    <Import Project="..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets" Condition="Exists('..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets')" />
+    <Import Project="..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets" Condition="Exists('..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets')" />
+    <Import Project="..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
+    <Import Project="..\..\packages\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\..\packages\zlib.1.2.8.6\build\native\zlib.targets')" />
+    <Import Project="..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
+    <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.targets')" />
+    <Import Project="..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets" Condition="Exists('..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets')" />
+    <Import Project="..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets" Condition="Exists('..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file

diff --git a/components/livestatus/livestatus.vcxproj.filters b/components/livestatus/livestatus.vcxproj.filters
index 1ba8ddafc43fab023262a2517052ed16b01e368f..13389a512962aed3e5e12065f684935e709db7c9 100644 (file)
--- a/components/livestatus/livestatus.vcxproj.filters
+++ b/components/livestatus/livestatus.vcxproj.filters
@@ -9,12 +9,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="i2-livestatus.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="component.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
     <ClInclude Include="query.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
@@ -108,11 +102,11 @@
     <ClInclude Include="servicegroupsstable.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
+    <ClInclude Include="listener.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="component.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
     <ClCompile Include="query.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
@@ -206,10 +200,16 @@
     <ClCompile Include="sumaggregator.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="listener.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="livestatus-type.conf">
       <Filter>Quelldateien</Filter>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/components/livestatus/packages.config b/components/livestatus/packages.config
new file mode 100644 (file)
index 0000000..63dced5
--- /dev/null
+++ b/components/livestatus/packages.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="boost" version="1.54.0.1" targetFramework="Native" />
+  <package id="boost_chrono" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_date_time" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_exception" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_program_options" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_system" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_thread" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_unit_test_framework" version="1.54.0.2" targetFramework="Native" />
+  <package id="openssl" version="1.0.1.24" targetFramework="Native" />
+  <package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
+  <package id="zlib" version="1.2.8.6" targetFramework="Native" />
+  <package id="zlib.redist" version="1.2.8.6" targetFramework="Native" />
+</packages>
\ No newline at end of file

diff --git a/components/notification/notification.vcxproj b/components/notification/notification.vcxproj
index d21f7cbab7bef411a8c65f383c44afb2cf17573e..3afe8878449a42f09b8738b610b7d274046d8a0c 100644 (file)
--- a/components/notification/notification.vcxproj
+++ b/components/notification/notification.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.props" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,23 +29,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -160,7 +165,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="notificationcomponent.h" />
-    <ClInclude Include="i2-notification.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="notification-type.cpp" />
@@ -187,7 +191,22 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\packages\boost.1.54.0.1\build\native\boost.targets" Condition="Exists('..\..\packages\boost.1.54.0.1\build\native\boost.targets')" />
+    <Import Project="..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets" Condition="Exists('..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets')" />
+    <Import Project="..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets" Condition="Exists('..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets')" />
+    <Import Project="..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets" Condition="Exists('..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets')" />
+    <Import Project="..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets" Condition="Exists('..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets')" />
+    <Import Project="..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets" Condition="Exists('..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets')" />
+    <Import Project="..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
+    <Import Project="..\..\packages\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\..\packages\zlib.1.2.8.6\build\native\zlib.targets')" />
+    <Import Project="..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
+    <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.targets')" />
+    <Import Project="..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets" Condition="Exists('..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets')" />
+    <Import Project="..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets" Condition="Exists('..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file

diff --git a/components/notification/notification.vcxproj.filters b/components/notification/notification.vcxproj.filters
index 2106ca98c280cc7a4044c7c846e1e17da63ace79..1ffc78356f4a5c0ed3c17de5ce59946ebae6d689 100644 (file)
--- a/components/notification/notification.vcxproj.filters
+++ b/components/notification/notification.vcxproj.filters
@@ -4,9 +4,6 @@
     <ClInclude Include="notificationcomponent.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="i2-notification.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Headerdateien">
@@ -29,4 +26,7 @@
       <Filter>Quelldateien</Filter>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/components/notification/packages.config b/components/notification/packages.config
new file mode 100644 (file)
index 0000000..63dced5
--- /dev/null
+++ b/components/notification/packages.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="boost" version="1.54.0.1" targetFramework="Native" />
+  <package id="boost_chrono" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_date_time" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_exception" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_program_options" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_system" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_thread" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_unit_test_framework" version="1.54.0.2" targetFramework="Native" />
+  <package id="openssl" version="1.0.1.24" targetFramework="Native" />
+  <package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
+  <package id="zlib" version="1.2.8.6" targetFramework="Native" />
+  <package id="zlib.redist" version="1.2.8.6" targetFramework="Native" />
+</packages>
\ No newline at end of file

diff --git a/icinga-app/icinga-app.vcxproj b/icinga-app/icinga-app.vcxproj
index dd72983a0299ed8c33354cbd1886ac02e25804c5..9bc1ab8cc4383bb4d8cb6f8be7f0460a3423cb5e 100644 (file)
--- a/icinga-app/icinga-app.vcxproj
+++ b/icinga-app/icinga-app.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\openssl.1.0.1.24\build\native\openssl.props" Condition="Exists('..\packages\openssl.1.0.1.24\build\native\openssl.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -21,6 +22,9 @@
   <ItemGroup>
     <ClCompile Include="icinga.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{BE412865-FEBA-4259-AD41-58950D1F5432}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -32,23 +36,27 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -166,5 +174,17 @@
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\packages\boost.1.54.0.1\build\native\boost.targets" Condition="Exists('..\packages\boost.1.54.0.1\build\native\boost.targets')" />
+    <Import Project="..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets" Condition="Exists('..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets')" />
+    <Import Project="..\packages\boost_system.1.54.0.2\build\native\boost_system.targets" Condition="Exists('..\packages\boost_system.1.54.0.2\build\native\boost_system.targets')" />
+    <Import Project="..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets" Condition="Exists('..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets')" />
+    <Import Project="..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets" Condition="Exists('..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets')" />
+    <Import Project="..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets" Condition="Exists('..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets')" />
+    <Import Project="..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
+    <Import Project="..\packages\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\packages\zlib.1.2.8.6\build\native\zlib.targets')" />
+    <Import Project="..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
+    <Import Project="..\packages\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\packages\openssl.1.0.1.24\build\native\openssl.targets')" />
+    <Import Project="..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets" Condition="Exists('..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets')" />
+    <Import Project="..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets" Condition="Exists('..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file

diff --git a/icinga-app/icinga-app.vcxproj.filters b/icinga-app/icinga-app.vcxproj.filters
index 9cd09d6aed689ca400969d7e716f9d375d6fffd6..2b935b52e517d5503963b227b64afc72f8ad9dd4 100644 (file)
--- a/icinga-app/icinga-app.vcxproj.filters
+++ b/icinga-app/icinga-app.vcxproj.filters
@@ -13,4 +13,7 @@
       <Filter>Quelldateien</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/icinga-app/packages.config b/icinga-app/packages.config
new file mode 100644 (file)
index 0000000..63dced5
--- /dev/null
+++ b/icinga-app/packages.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="boost" version="1.54.0.1" targetFramework="Native" />
+  <package id="boost_chrono" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_date_time" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_exception" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_program_options" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_system" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_thread" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_unit_test_framework" version="1.54.0.2" targetFramework="Native" />
+  <package id="openssl" version="1.0.1.24" targetFramework="Native" />
+  <package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
+  <package id="zlib" version="1.2.8.6" targetFramework="Native" />
+  <package id="zlib.redist" version="1.2.8.6" targetFramework="Native" />
+</packages>
\ No newline at end of file

diff --git a/icinga2.sln b/icinga2.sln
index c0199d279dba97b210c361847c117fc8c3043d7e..765d15e2f88260820830655d1c91eb0aefe7d415 100644 (file)
--- a/icinga2.sln
+++ b/icinga2.sln
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2012 for Windows Desktop
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icinga-app", "icinga-app\icinga-app.vcxproj", "{BE412865-FEBA-4259-AD41-58950D1F5432}"
        ProjectSection(ProjectDependencies) = postProject
                {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA} = {2BD1C70C-43DB-4F44-B66B-67CF5C7044AA}
@@ -95,8 +95,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cluster", "components\clust
                {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ido", "lib\ido\ido.vcxproj", "{87BBCE4C-36F5-4C04-90FB-9B74618AF988}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_ido_mysql", "components\db_ido_mysql\db_ido_mysql.vcxproj", "{273A9D62-F556-4B5E-B235-B608106CB028}"
        ProjectSection(ProjectDependencies) = postProject
+               {87BBCE4C-36F5-4C04-90FB-9B74618AF988} = {87BBCE4C-36F5-4C04-90FB-9B74618AF988}
+               {D5EE8062-8FC5-40E8-81C0-B435B06AB311} = {D5EE8062-8FC5-40E8-81C0-B435B06AB311}
+               {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677}
+               {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} = {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}
+               {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_ido", "lib\db_ido\db_ido.vcxproj", "{87BBCE4C-36F5-4C04-90FB-9B74618AF988}"
+       ProjectSection(ProjectDependencies) = postProject
+               {D5EE8062-8FC5-40E8-81C0-B435B06AB311} = {D5EE8062-8FC5-40E8-81C0-B435B06AB311}
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677}
                {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7} = {B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}
                {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8} = {C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}
@@ -278,6 +288,16 @@ Global
                {8732E0CD-E3D0-41F2-A538-94884543890F}.Release|Win64.ActiveCfg = Release|Win32
                {8732E0CD-E3D0-41F2-A538-94884543890F}.Release|x64.ActiveCfg = Release|x64
                {8732E0CD-E3D0-41F2-A538-94884543890F}.Release|x64.Build.0 = Release|x64
+               {273A9D62-F556-4B5E-B235-B608106CB028}.Debug|Win32.ActiveCfg = Debug|Win32
+               {273A9D62-F556-4B5E-B235-B608106CB028}.Debug|Win32.Build.0 = Debug|Win32
+               {273A9D62-F556-4B5E-B235-B608106CB028}.Debug|Win64.ActiveCfg = Debug|Win32
+               {273A9D62-F556-4B5E-B235-B608106CB028}.Debug|x64.ActiveCfg = Debug|x64
+               {273A9D62-F556-4B5E-B235-B608106CB028}.Debug|x64.Build.0 = Debug|x64
+               {273A9D62-F556-4B5E-B235-B608106CB028}.Release|Win32.ActiveCfg = Release|Win32
+               {273A9D62-F556-4B5E-B235-B608106CB028}.Release|Win32.Build.0 = Release|Win32
+               {273A9D62-F556-4B5E-B235-B608106CB028}.Release|Win64.ActiveCfg = Release|Win32
+               {273A9D62-F556-4B5E-B235-B608106CB028}.Release|x64.ActiveCfg = Release|x64
+               {273A9D62-F556-4B5E-B235-B608106CB028}.Release|x64.Build.0 = Release|x64
                {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Debug|Win32.ActiveCfg = Debug|Win32
                {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Debug|Win32.Build.0 = Debug|Win32
                {87BBCE4C-36F5-4C04-90FB-9B74618AF988}.Debug|Win64.ActiveCfg = Debug|Win32
@@ -299,6 +319,7 @@ Global
                {2E6C1133-730F-4875-A72C-B455B1DD4C5C} = {4A1773FD-DDED-4952-8700-C898E890554A}
                {950E8743-BB34-4F8A-99EC-C87E8FC0EB3F} = {4A1773FD-DDED-4952-8700-C898E890554A}
                {8732E0CD-E3D0-41F2-A538-94884543890F} = {4A1773FD-DDED-4952-8700-C898E890554A}
+               {273A9D62-F556-4B5E-B235-B608106CB028} = {4A1773FD-DDED-4952-8700-C898E890554A}
                {19CBCE06-3F5C-479A-BD75-E2AB6215D345} = {3BE47C55-D74A-46E6-8F8B-470B3FD29FB7}
                {66BED474-C33F-48F9-90BA-BBCFEDC006B8} = {3BE47C55-D74A-46E6-8F8B-470B3FD29FB7}
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {BC82DE9C-42E2-4880-92DA-C2269D2F6416}

diff --git a/lib/base/application.cpp b/lib/base/application.cpp
index 3ba47522ae24a5837aeba0587dd5ac5c1eeb2bfc..c0687ce4c03b9002cdc6d9b7579388745f58bc73 100644 (file)
--- a/lib/base/application.cpp
+++ b/lib/base/application.cpp
@@ -39,6 +39,10 @@
 #include <boost/exception/errinfo_file_name.hpp>
 #include <iostream>
 
+#ifndef _WIN32
+#      include "icinga-version.h"
+#endif /* _WIN32 */
+
 using namespace icinga;
 
 Application *Application::m_Instance = NULL;
@@ -708,5 +712,9 @@ ThreadPool& Application::GetTP(void)
 
 String Application::GetVersion(void)
 {
-       return ICINGA_VERSION;
+#ifndef _WIN32
+       return VERSION ", " GIT_MESSAGE;
+#else /* _WIN32 */
+       return "unspecified version";
+#endif /* _WIN32 */
 }

diff --git a/lib/base/application.h b/lib/base/application.h
index 878fd3aa944ffe276c9266ad3a143bc3d1a7b018..9a5c302e1b2bec94ff233758f00a8c6430440862 100644 (file)
--- a/lib/base/application.h
+++ b/lib/base/application.h
@@ -23,8 +23,6 @@
 #include "base/i2-base.h"
 #include "base/threadpool.h"
 #include "base/dynamicobject.h"
-#include "icinga-version.h"
-#define ICINGA_VERSION VERSION ", " GIT_MESSAGE
 
 namespace icinga {
 

diff --git a/lib/base/base.vcxproj b/lib/base/base.vcxproj
index b779f7aafb2ce82fd68c9c0e0631f9c5cbf10d0b..f68d71ca7a072beb07ae1915694121f83c7b5111 100644 (file)
--- a/lib/base/base.vcxproj
+++ b/lib/base/base.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.props" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -112,6 +113,9 @@
     <ClInclude Include="value.h" />
     <ClInclude Include="win32.h" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9C92DA90-FD53-43A9-A244-90F2E8AF9677}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -122,23 +126,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -193,7 +201,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>dbghelp.lib;ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;libeay32MTd.lib;ssleay32MTd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>dbghelp.lib;ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Lib>
       <AdditionalDependencies>ws2_32.lib;shlwapi.lib</AdditionalDependencies>
@@ -236,7 +244,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>dbghelp.lib;ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;libeay32MT.lib;ssleay32MT.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>dbghelp.lib;ws2_32.lib;shlwapi.lib;mmatch.lib;cJSON.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Lib>
       <AdditionalDependencies>ws2_32.lib;shlwapi.lib</AdditionalDependencies>
@@ -268,5 +276,17 @@
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\packages\boost.1.54.0.1\build\native\boost.targets" Condition="Exists('..\..\packages\boost.1.54.0.1\build\native\boost.targets')" />
+    <Import Project="..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets" Condition="Exists('..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets')" />
+    <Import Project="..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets" Condition="Exists('..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets')" />
+    <Import Project="..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets" Condition="Exists('..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets')" />
+    <Import Project="..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets" Condition="Exists('..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets')" />
+    <Import Project="..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets" Condition="Exists('..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets')" />
+    <Import Project="..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
+    <Import Project="..\..\packages\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\..\packages\zlib.1.2.8.6\build\native\zlib.targets')" />
+    <Import Project="..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
+    <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.targets')" />
+    <Import Project="..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets" Condition="Exists('..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets')" />
+    <Import Project="..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets" Condition="Exists('..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file

diff --git a/lib/base/base.vcxproj.filters b/lib/base/base.vcxproj.filters
index b9c12fd4de92986d920f8f709654e15d033382aa..ac97bf4aa9d2d481da915058e5202cb6abe1573a 100644 (file)
--- a/lib/base/base.vcxproj.filters
+++ b/lib/base/base.vcxproj.filters
@@ -282,4 +282,7 @@
       <UniqueIdentifier>{7bbee99c-5763-4063-836c-ddbcc8966ae3}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/lib/base/packages.config b/lib/base/packages.config
new file mode 100644 (file)
index 0000000..63dced5
--- /dev/null
+++ b/lib/base/packages.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="boost" version="1.54.0.1" targetFramework="Native" />
+  <package id="boost_chrono" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_date_time" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_exception" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_program_options" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_system" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_thread" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_unit_test_framework" version="1.54.0.2" targetFramework="Native" />
+  <package id="openssl" version="1.0.1.24" targetFramework="Native" />
+  <package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
+  <package id="zlib" version="1.2.8.6" targetFramework="Native" />
+  <package id="zlib.redist" version="1.2.8.6" targetFramework="Native" />
+</packages>
\ No newline at end of file

diff --git a/lib/base/win32.h b/lib/base/win32.h
index 04a5620fc54b045d417fa556de4c69a062c387a3..728357d521d8794c1896bb3099c355665f1147c9 100644 (file)
--- a/lib/base/win32.h
+++ b/lib/base/win32.h
@@ -28,6 +28,8 @@
 #include <imagehlp.h>
 #include <shlwapi.h>
 
+#include <direct.h>
+
 #ifdef __MINGW32__
 #      ifndef IPV6_V6ONLY
 #              define IPV6_V6ONLY 27

diff --git a/lib/config/.gitignore b/lib/config/.gitignore
index e8c1bf77714ccc4c61a501e23f2ff28c5a463042..07c4f5e76c6784417cf916f65746f4ed4c70ac7d 100644 (file)
--- a/lib/config/.gitignore
+++ b/lib/config/.gitignore
@@ -1 +1,5 @@
 base-type.cpp
+config_lexer.cc
+config_parser.cc
+config_parser.h
+config_parser.hh
\ No newline at end of file

diff --git a/lib/config/config.vcxproj b/lib/config/config.vcxproj
index 3b2e46bfa12795a6f47365060718bab2c2488997..36acd56bc539271c11010ef858528f86d1738e1c 100644 (file)
--- a/lib/config/config.vcxproj
+++ b/lib/config/config.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.props" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -85,28 +86,51 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
-    <None Include="config_lexer.ll">
+    <CustomBuild Include="config_lexer.ll">
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">config_lexer.cc</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">config_lexer.cc</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">config_lexer.cc</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">config_lexer.cc</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">win_flex "%(FullPath)"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">win_flex "%(FullPath)"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">win_flex "%(FullPath)"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">win_flex "%(FullPath)"</Command>
-      <FileType>Document</FileType>
-    </None>
-    <None Include="config_parser.yy">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">win_bison -d "%(FullPath)"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">win_bison -d "%(FullPath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">win_flex "%(FullPath)"
+del config_lexer.cc
+ren lex.yy.c config_lexer.cc</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">win_flex "%(FullPath)"
+del config_lexer.cc
+ren lex.yy.c config_lexer.cc</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">win_flex "%(FullPath)"
+del config_lexer.cc
+ren lex.yy.c config_lexer.cc</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">win_flex "%(FullPath)"
+del config_lexer.cc
+ren lex.yy.c config_lexer.cc</Command>
+    </CustomBuild>
+    <CustomBuild Include="config_parser.yy">
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">win_bison -d "%(FullPath)"
+del config_parser.cc
+ren config_parser.tab.cc config_parser.cc
+del config_parser.h
+ren config_parser.tab.hh config_parser.h</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">win_bison -d "%(FullPath)"
+del config_parser.cc
+ren config_parser.tab.cc config_parser.cc
+del config_parser.h
+ren config_parser.tab.hh config_parser.h</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">config_parser.cc config_parser.h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">config_parser.cc config_parser.h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">win_bison -d "%(FullPath)"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">win_bison -d "%(FullPath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">win_bison -d "%(FullPath)"
+del config_parser.cc
+ren config_parser.tab.cc config_parser.cc
+del config_parser.h
+ren config_parser.tab.hh config_parser.h</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">win_bison -d "%(FullPath)"
+del config_parser.cc
+ren config_parser.tab.cc config_parser.cc
+del config_parser.h
+ren config_parser.tab.hh config_parser.h</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">config_parser.cc config_parser.h</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">config_parser.cc config_parser.h</Outputs>
-      <FileType>Document</FileType>
-    </None>
+    </CustomBuild>
+    <None Include="packages.config" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B26AFFA6-2BDF-42E6-A224-2591FFD9BFB7}</ProjectGuid>
@@ -118,23 +142,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -250,5 +278,17 @@
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\packages\boost.1.54.0.1\build\native\boost.targets" Condition="Exists('..\..\packages\boost.1.54.0.1\build\native\boost.targets')" />
+    <Import Project="..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets" Condition="Exists('..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets')" />
+    <Import Project="..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets" Condition="Exists('..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets')" />
+    <Import Project="..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets" Condition="Exists('..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets')" />
+    <Import Project="..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets" Condition="Exists('..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets')" />
+    <Import Project="..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets" Condition="Exists('..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets')" />
+    <Import Project="..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
+    <Import Project="..\..\packages\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\..\packages\zlib.1.2.8.6\build\native\zlib.targets')" />
+    <Import Project="..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
+    <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.targets')" />
+    <Import Project="..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets" Condition="Exists('..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets')" />
+    <Import Project="..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets" Condition="Exists('..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file

diff --git a/lib/config/config.vcxproj.filters b/lib/config/config.vcxproj.filters
index 49c92f108d2a9855b440c11fe1c7ca3a58f0b01f..624ef31313b513c4516789a52359165bbe57fea4 100644 (file)
--- a/lib/config/config.vcxproj.filters
+++ b/lib/config/config.vcxproj.filters
@@ -77,12 +77,7 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="config_lexer.ll">
-      <Filter>Quelldateien</Filter>
-    </None>
-    <None Include="config_parser.yy">
-      <Filter>Quelldateien</Filter>
-    </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Headerdateien">
@@ -96,5 +91,11 @@
     <CustomBuild Include="base-type.conf">
       <Filter>Quelldateien</Filter>
     </CustomBuild>
+    <CustomBuild Include="config_lexer.ll">
+      <Filter>Quelldateien</Filter>
+    </CustomBuild>
+    <CustomBuild Include="config_parser.yy">
+      <Filter>Quelldateien</Filter>
+    </CustomBuild>
   </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/lib/config/packages.config b/lib/config/packages.config
new file mode 100644 (file)
index 0000000..63dced5
--- /dev/null
+++ b/lib/config/packages.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="boost" version="1.54.0.1" targetFramework="Native" />
+  <package id="boost_chrono" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_date_time" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_exception" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_program_options" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_system" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_thread" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_unit_test_framework" version="1.54.0.2" targetFramework="Native" />
+  <package id="openssl" version="1.0.1.24" targetFramework="Native" />
+  <package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
+  <package id="zlib" version="1.2.8.6" targetFramework="Native" />
+  <package id="zlib.redist" version="1.2.8.6" targetFramework="Native" />
+</packages>
\ No newline at end of file

diff --git a/lib/db_ido/ido.vcxproj b/lib/db_ido/db_ido.vcxproj
similarity index 82%
rename from lib/db_ido/ido.vcxproj
rename to lib/db_ido/db_ido.vcxproj
index 79ddf52f6f8e44c702e061e183218f0ca1e011d6..2f012b5ec6bb6ddd688465626019658acb95a7c1 100644 (file)
--- a/lib/db_ido/ido.vcxproj
+++ b/lib/db_ido/db_ido.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.props" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,7 +29,7 @@
     <ClCompile Include="dbvalue.cpp" />
     <ClCompile Include="hostdbobject.cpp" />
     <ClCompile Include="hostgroupdbobject.cpp" />
-    <ClCompile Include="ido-type.cpp" />
+    <ClCompile Include="db_ido-type.cpp" />
     <ClCompile Include="servicedbobject.cpp" />
     <ClCompile Include="servicegroupdbobject.cpp" />
     <ClCompile Include="timeperioddbobject.cpp" />
@@ -52,7 +53,7 @@
     <ClInclude Include="usergroupdbobject.h" />
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="ido-type.conf">
+    <CustomBuild Include="db_ido-type.conf">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(SolutionDir)$(Platform)\$(Configuration)\mkembedconfig.exe" "%(Identity)" "%(Filename).cpp"</Command>
@@ -72,6 +73,9 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{87BBCE4C-36F5-4C04-90FB-9B74618AF988}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -82,23 +86,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -214,5 +222,17 @@
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\packages\boost.1.54.0.1\build\native\boost.targets" Condition="Exists('..\..\packages\boost.1.54.0.1\build\native\boost.targets')" />
+    <Import Project="..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets" Condition="Exists('..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets')" />
+    <Import Project="..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets" Condition="Exists('..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets')" />
+    <Import Project="..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets" Condition="Exists('..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets')" />
+    <Import Project="..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets" Condition="Exists('..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets')" />
+    <Import Project="..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets" Condition="Exists('..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets')" />
+    <Import Project="..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
+    <Import Project="..\..\packages\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\..\packages\zlib.1.2.8.6\build\native\zlib.targets')" />
+    <Import Project="..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
+    <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.targets')" />
+    <Import Project="..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets" Condition="Exists('..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets')" />
+    <Import Project="..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets" Condition="Exists('..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file

diff --git a/lib/db_ido/ido.vcxproj.filters b/lib/db_ido/db_ido.vcxproj.filters
similarity index 95%
rename from lib/db_ido/ido.vcxproj.filters
rename to lib/db_ido/db_ido.vcxproj.filters
index f6e4a8ea537b2f19042391d330b7d50895532c72..143c5ec8249c862e5aeabfe2e14aaa8ff149fcb3 100644 (file)
--- a/lib/db_ido/ido.vcxproj.filters
+++ b/lib/db_ido/db_ido.vcxproj.filters
@@ -51,7 +51,7 @@
     <ClCompile Include="usergroupdbobject.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="ido-type.cpp">
+    <ClCompile Include="db_ido-type.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
   </ItemGroup>
@@ -100,7 +100,10 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="ido-type.conf">
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="db_ido-type.conf">
       <Filter>Quelldateien</Filter>
     </CustomBuild>
   </ItemGroup>

diff --git a/lib/db_ido/packages.config b/lib/db_ido/packages.config
new file mode 100644 (file)
index 0000000..63dced5
--- /dev/null
+++ b/lib/db_ido/packages.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="boost" version="1.54.0.1" targetFramework="Native" />
+  <package id="boost_chrono" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_date_time" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_exception" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_program_options" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_system" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_thread" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_unit_test_framework" version="1.54.0.2" targetFramework="Native" />
+  <package id="openssl" version="1.0.1.24" targetFramework="Native" />
+  <package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
+  <package id="zlib" version="1.2.8.6" targetFramework="Native" />
+  <package id="zlib.redist" version="1.2.8.6" targetFramework="Native" />
+</packages>
\ No newline at end of file

diff --git a/lib/icinga/icinga.vcxproj b/lib/icinga/icinga.vcxproj
index 8f037ff3c3a8e44aad86819374084d1b7ae83912..997a97d1ffc10243fbd00984f9ee9fa96d530082 100644 (file)
--- a/lib/icinga/icinga.vcxproj
+++ b/lib/icinga/icinga.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.props" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -108,6 +109,9 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\tools\mkembedconfig\mkembedconfig.c</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{C1FC77E1-04A4-481B-A78B-2F7AF489C2F8}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -119,23 +123,27 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -194,7 +202,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -210,7 +218,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>base.lib;config.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -231,7 +239,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -252,10 +260,22 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>base.lib;config.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>base.lib;config.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\packages\boost.1.54.0.1\build\native\boost.targets" Condition="Exists('..\..\packages\boost.1.54.0.1\build\native\boost.targets')" />
+    <Import Project="..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets" Condition="Exists('..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets')" />
+    <Import Project="..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets" Condition="Exists('..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets')" />
+    <Import Project="..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets" Condition="Exists('..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets')" />
+    <Import Project="..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets" Condition="Exists('..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets')" />
+    <Import Project="..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets" Condition="Exists('..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets')" />
+    <Import Project="..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
+    <Import Project="..\..\packages\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\..\packages\zlib.1.2.8.6\build\native\zlib.targets')" />
+    <Import Project="..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
+    <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.targets')" />
+    <Import Project="..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets" Condition="Exists('..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets')" />
+    <Import Project="..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets" Condition="Exists('..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file

diff --git a/lib/icinga/icinga.vcxproj.filters b/lib/icinga/icinga.vcxproj.filters
index 959dc8e2a0caed13883f4b6fa25164a7eabbdd75..be841daac6e1bfa4010222f1e2fc9b4688ccfb2a 100644 (file)
--- a/lib/icinga/icinga.vcxproj.filters
+++ b/lib/icinga/icinga.vcxproj.filters
@@ -197,4 +197,7 @@
       <Filter>Quelldateien</Filter>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/lib/icinga/packages.config b/lib/icinga/packages.config
new file mode 100644 (file)
index 0000000..63dced5
--- /dev/null
+++ b/lib/icinga/packages.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="boost" version="1.54.0.1" targetFramework="Native" />
+  <package id="boost_chrono" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_date_time" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_exception" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_program_options" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_system" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_thread" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_unit_test_framework" version="1.54.0.2" targetFramework="Native" />
+  <package id="openssl" version="1.0.1.24" targetFramework="Native" />
+  <package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
+  <package id="zlib" version="1.2.8.6" targetFramework="Native" />
+  <package id="zlib.redist" version="1.2.8.6" targetFramework="Native" />
+</packages>
\ No newline at end of file

diff --git a/packages/repositories.config b/packages/repositories.config
new file mode 100644 (file)
index 0000000..d853c31
--- /dev/null
+++ b/packages/repositories.config
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositories>
+  <repository path="..\components\checker\packages.config" />
+  <repository path="..\components\cluster\packages.config" />
+  <repository path="..\components\compat\packages.config" />
+  <repository path="..\components\db_ido_mysql\packages.config" />
+  <repository path="..\components\demo\packages.config" />
+  <repository path="..\components\livestatus\packages.config" />
+  <repository path="..\components\notification\packages.config" />
+  <repository path="..\icinga-app\packages.config" />
+  <repository path="..\lib\base\packages.config" />
+  <repository path="..\lib\config\packages.config" />
+  <repository path="..\lib\db_ido\packages.config" />
+  <repository path="..\lib\icinga\packages.config" />
+  <repository path="..\test\packages.config" />
+  <repository path="..\third-party\cJSON\packages.config" />
+  <repository path="..\third-party\mmatch\packages.config" />
+  <repository path="..\tools\mkembedconfig\packages.config" />
+</repositories>
\ No newline at end of file

diff --git a/test/packages.config b/test/packages.config
new file mode 100644 (file)
index 0000000..63dced5
--- /dev/null
+++ b/test/packages.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="boost" version="1.54.0.1" targetFramework="Native" />
+  <package id="boost_chrono" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_date_time" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_exception" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_program_options" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_system" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_thread" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_unit_test_framework" version="1.54.0.2" targetFramework="Native" />
+  <package id="openssl" version="1.0.1.24" targetFramework="Native" />
+  <package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
+  <package id="zlib" version="1.2.8.6" targetFramework="Native" />
+  <package id="zlib.redist" version="1.2.8.6" targetFramework="Native" />
+</packages>
\ No newline at end of file

diff --git a/test/test.vcxproj b/test/test.vcxproj
index 39476a28a60c09da380db6d1a26357f734ff7309..18dd2e317764c8b7fa47640b8aeb4e39ee32a355 100644 (file)
--- a/test/test.vcxproj
+++ b/test/test.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\openssl.1.0.1.24\build\native\openssl.props" Condition="Exists('..\packages\openssl.1.0.1.24\build\native\openssl.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,23 +29,27 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -169,7 +174,22 @@
     <ClCompile Include="base-timer.cpp" />
     <ClCompile Include="test.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\packages\boost.1.54.0.1\build\native\boost.targets" Condition="Exists('..\packages\boost.1.54.0.1\build\native\boost.targets')" />
+    <Import Project="..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets" Condition="Exists('..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets')" />
+    <Import Project="..\packages\boost_system.1.54.0.2\build\native\boost_system.targets" Condition="Exists('..\packages\boost_system.1.54.0.2\build\native\boost_system.targets')" />
+    <Import Project="..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets" Condition="Exists('..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets')" />
+    <Import Project="..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets" Condition="Exists('..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets')" />
+    <Import Project="..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets" Condition="Exists('..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets')" />
+    <Import Project="..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
+    <Import Project="..\packages\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\packages\zlib.1.2.8.6\build\native\zlib.targets')" />
+    <Import Project="..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
+    <Import Project="..\packages\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\packages\openssl.1.0.1.24\build\native\openssl.targets')" />
+    <Import Project="..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets" Condition="Exists('..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets')" />
+    <Import Project="..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets" Condition="Exists('..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file

diff --git a/test/test.vcxproj.filters b/test/test.vcxproj.filters
index 7ad20b45b4150cfbcfdbb290b859c7991ffeecd8..bb4ed7cb3720f9580a69240d0c870b125cc85e2c 100644 (file)
--- a/test/test.vcxproj.filters
+++ b/test/test.vcxproj.filters
@@ -43,4 +43,7 @@
       <Filter>Quelldateien</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/third-party/cJSON/cJSON.vcxproj b/third-party/cJSON/cJSON.vcxproj
index c12ea597038a6e07625e17c4070a5371884def79..f8d40d2c2d7ea58071bec4975c4544c863927f0d 100644 (file)
--- a/third-party/cJSON/cJSON.vcxproj
+++ b/third-party/cJSON/cJSON.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.props" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -24,6 +25,9 @@
   <ItemGroup>
     <ClInclude Include="cJSON.h" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{66BED474-C33F-48F9-90BA-BBCFEDC006B8}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -34,23 +38,27 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -156,5 +164,17 @@
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\packages\boost.1.54.0.1\build\native\boost.targets" Condition="Exists('..\..\packages\boost.1.54.0.1\build\native\boost.targets')" />
+    <Import Project="..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets" Condition="Exists('..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets')" />
+    <Import Project="..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets" Condition="Exists('..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets')" />
+    <Import Project="..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets" Condition="Exists('..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets')" />
+    <Import Project="..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets" Condition="Exists('..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets')" />
+    <Import Project="..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets" Condition="Exists('..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets')" />
+    <Import Project="..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
+    <Import Project="..\..\packages\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\..\packages\zlib.1.2.8.6\build\native\zlib.targets')" />
+    <Import Project="..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
+    <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.targets')" />
+    <Import Project="..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets" Condition="Exists('..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets')" />
+    <Import Project="..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets" Condition="Exists('..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file

diff --git a/third-party/cJSON/cJSON.vcxproj.filters b/third-party/cJSON/cJSON.vcxproj.filters
index aca8c6a15c99121f3ec7cf3e78c493aa72376fc5..6465e0e0ca21728d6e4e5f4efc6fb95bb474a8c5 100644 (file)
--- a/third-party/cJSON/cJSON.vcxproj.filters
+++ b/third-party/cJSON/cJSON.vcxproj.filters
@@ -18,4 +18,7 @@
       <Filter>Headerdateien</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/third-party/cJSON/packages.config b/third-party/cJSON/packages.config
new file mode 100644 (file)
index 0000000..63dced5
--- /dev/null
+++ b/third-party/cJSON/packages.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="boost" version="1.54.0.1" targetFramework="Native" />
+  <package id="boost_chrono" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_date_time" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_exception" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_program_options" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_system" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_thread" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_unit_test_framework" version="1.54.0.2" targetFramework="Native" />
+  <package id="openssl" version="1.0.1.24" targetFramework="Native" />
+  <package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
+  <package id="zlib" version="1.2.8.6" targetFramework="Native" />
+  <package id="zlib.redist" version="1.2.8.6" targetFramework="Native" />
+</packages>
\ No newline at end of file

diff --git a/third-party/mmatch/mmatch.vcxproj b/third-party/mmatch/mmatch.vcxproj
index fc656a5fe5416422428b27ea3ead593dd388bf7a..77d0b10c1d3d33752d656f07b5cf271f772cb4a7 100644 (file)
--- a/third-party/mmatch/mmatch.vcxproj
+++ b/third-party/mmatch/mmatch.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.props" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -24,6 +25,9 @@
   <ItemGroup>
     <ClInclude Include="mmatch.h" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{19CBCE06-3F5C-479A-BD75-E2AB6215D345}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -34,23 +38,27 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -154,5 +162,17 @@
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\packages\boost.1.54.0.1\build\native\boost.targets" Condition="Exists('..\..\packages\boost.1.54.0.1\build\native\boost.targets')" />
+    <Import Project="..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets" Condition="Exists('..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets')" />
+    <Import Project="..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets" Condition="Exists('..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets')" />
+    <Import Project="..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets" Condition="Exists('..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets')" />
+    <Import Project="..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets" Condition="Exists('..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets')" />
+    <Import Project="..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets" Condition="Exists('..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets')" />
+    <Import Project="..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
+    <Import Project="..\..\packages\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\..\packages\zlib.1.2.8.6\build\native\zlib.targets')" />
+    <Import Project="..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
+    <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.targets')" />
+    <Import Project="..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets" Condition="Exists('..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets')" />
+    <Import Project="..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets" Condition="Exists('..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file

diff --git a/third-party/mmatch/mmatch.vcxproj.filters b/third-party/mmatch/mmatch.vcxproj.filters
index 52551b3fb213da2654674605972dc36777f4433d..3adbbe12bc1374926efb5224a044bfbc1d54e093 100644 (file)
--- a/third-party/mmatch/mmatch.vcxproj.filters
+++ b/third-party/mmatch/mmatch.vcxproj.filters
@@ -18,4 +18,7 @@
       <Filter>Headerdateien</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/third-party/mmatch/packages.config b/third-party/mmatch/packages.config
new file mode 100644 (file)
index 0000000..63dced5
--- /dev/null
+++ b/third-party/mmatch/packages.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="boost" version="1.54.0.1" targetFramework="Native" />
+  <package id="boost_chrono" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_date_time" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_exception" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_program_options" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_system" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_thread" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_unit_test_framework" version="1.54.0.2" targetFramework="Native" />
+  <package id="openssl" version="1.0.1.24" targetFramework="Native" />
+  <package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
+  <package id="zlib" version="1.2.8.6" targetFramework="Native" />
+  <package id="zlib.redist" version="1.2.8.6" targetFramework="Native" />
+</packages>
\ No newline at end of file

diff --git a/tools/mkembedconfig/mkembedconfig.vcxproj b/tools/mkembedconfig/mkembedconfig.vcxproj
index 797aec9a8eb9e0f2398ec818777617b9ccec8691..054093097272ab78596ab4a18fe42c795ab43a63 100644 (file)
--- a/tools/mkembedconfig/mkembedconfig.vcxproj
+++ b/tools/mkembedconfig/mkembedconfig.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.props" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,23 +29,27 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -141,7 +146,22 @@
   <ItemGroup>
     <ClCompile Include="mkembedconfig.c" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\packages\boost.1.54.0.1\build\native\boost.targets" Condition="Exists('..\..\packages\boost.1.54.0.1\build\native\boost.targets')" />
+    <Import Project="..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets" Condition="Exists('..\..\packages\boost_thread.1.54.0.2\build\native\boost_thread.targets')" />
+    <Import Project="..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets" Condition="Exists('..\..\packages\boost_system.1.54.0.2\build\native\boost_system.targets')" />
+    <Import Project="..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets" Condition="Exists('..\..\packages\boost_exception.1.54.0.2\build\native\boost_exception.targets')" />
+    <Import Project="..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets" Condition="Exists('..\..\packages\boost_program_options.1.54.0.2\build\native\boost_program_options.targets')" />
+    <Import Project="..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets" Condition="Exists('..\..\packages\boost_unit_test_framework.1.54.0.2\build\native\boost_unit_test_framework.targets')" />
+    <Import Project="..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\..\packages\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
+    <Import Project="..\..\packages\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\..\packages\zlib.1.2.8.6\build\native\zlib.targets')" />
+    <Import Project="..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\..\packages\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
+    <Import Project="..\..\packages\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\..\packages\openssl.1.0.1.24\build\native\openssl.targets')" />
+    <Import Project="..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets" Condition="Exists('..\..\packages\boost_date_time.1.54.0.2\build\native\boost_date_time.targets')" />
+    <Import Project="..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets" Condition="Exists('..\..\packages\boost_chrono.1.54.0.2\build\native\boost_chrono.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file

diff --git a/tools/mkembedconfig/mkembedconfig.vcxproj.filters b/tools/mkembedconfig/mkembedconfig.vcxproj.filters
index 4ef62086c8a86d842aa114fb579df399101db07e..d46f1b9b3765262b5754e6aaf2e47d88e2052f04 100644 (file)
--- a/tools/mkembedconfig/mkembedconfig.vcxproj.filters
+++ b/tools/mkembedconfig/mkembedconfig.vcxproj.filters
@@ -19,4 +19,7 @@
       <Filter>Quelldateien</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/tools/mkembedconfig/packages.config b/tools/mkembedconfig/packages.config
new file mode 100644 (file)
index 0000000..63dced5
--- /dev/null
+++ b/tools/mkembedconfig/packages.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="boost" version="1.54.0.1" targetFramework="Native" />
+  <package id="boost_chrono" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_date_time" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_exception" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_program_options" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_system" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_thread" version="1.54.0.2" targetFramework="Native" />
+  <package id="boost_unit_test_framework" version="1.54.0.2" targetFramework="Native" />
+  <package id="openssl" version="1.0.1.24" targetFramework="Native" />
+  <package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
+  <package id="zlib" version="1.2.8.6" targetFramework="Native" />
+  <package id="zlib.redist" version="1.2.8.6" targetFramework="Native" />
+</packages>
\ No newline at end of file