BIND 10 trac826, updated. cde3a5de0f5a96d7d739bf9f9115755a864e8c18 update last libraries, still need some tests
BIND 10 source code commits
bind10-changes at lists.isc.org
Sun Jul 1 18:50:48 UTC 2012
The branch, trac826 has been updated
via cde3a5de0f5a96d7d739bf9f9115755a864e8c18 (commit)
from 6143a6ef5e3dc5962e5c8b61aeff2574fe08705d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cde3a5de0f5a96d7d739bf9f9115755a864e8c18
Author: Francis Dupont <fdupont at isc.org>
Date: Sun Jul 1 20:50:17 2012 +0200
update last libraries, still need some tests
-----------------------------------------------------------------------
Summary of changes:
src/lib/dhcp/pkt4.cc | 2 ++
src/lib/dhcp/tests/option6_ia_unittest.cc | 2 +-
src/lib/python/isc/log/log.cc | 4 +++
src/lib/server_common/keyring.cc | 4 +++
src/lib/server_common/portconfig.cc | 5 ++++
src/lib/server_common/tests/keyring_test.cc | 4 +++
win32build/VS2008/bind10.sln | 22 +++++++++++++++
win32build/VS2008/libdhcp/libdhcp.vcproj | 16 +++++++++--
.../VS2008/libdhcp_tests/libdhcp_tests.vcproj | 6 ++++-
.../libserver_common_tests.vcproj | 4 ---
.../libstatistics.vcproj} | 18 ++++++-------
.../libstatistics.vcproj.vwin7.dupont.user} | 0
.../libstatistics_tests.vcproj} | 28 ++++++++++----------
.../libstatistics_tests.vcproj.vwin7.dupont.user} | 0
win32build/VS2008/pyddatasrc/pyddatasrc.vcproj | 12 +++++++++
win32build/VS2010/bind10.sln | 27 +++++++++++++++++++
win32build/VS2010/libdhcp/libdhcp.vcxproj | 7 +++--
win32build/VS2010/libdhcp/libdhcp.vcxproj.filters | 21 ++++++++++-----
.../VS2010/libdhcp_tests/libdhcp_tests.vcxproj | 3 ++-
.../libdhcp_tests/libdhcp_tests.vcxproj.filters | 9 ++++---
.../libserver_common_tests.vcxproj | 6 +++--
.../libserver_common_tests.vcxproj.filters | 8 +++---
.../libstatistics.vcxproj} | 10 ++++---
.../libstatistics.vcxproj.filters} | 8 +++---
.../libstatistics.vcxproj.user} | 0
.../libstatistics_tests.vcxproj} | 21 ++++++++-------
.../libstatistics_tests.vcxproj.filters} | 6 ++---
.../libstatistics_tests.vcxproj.user} | 0
win32build/VS2010/pyddatasrc/pyddatasrc.vcxproj | 3 +++
.../VS2010/pyddatasrc/pyddatasrc.vcxproj.filters | 9 +++++++
30 files changed, 196 insertions(+), 69 deletions(-)
copy win32build/VS2008/{libutil_io/libutil_io.vcproj => libstatistics/libstatistics.vcproj} (82%)
copy win32build/VS2008/{libacl/libacl.vcproj.vwin7.dupont.user => libstatistics/libstatistics.vcproj.vwin7.dupont.user} (100%)
copy win32build/VS2008/{liblog_i1utests/liblog_i1utests.vcproj => libstatistics_tests/libstatistics_tests.vcproj} (77%)
copy win32build/VS2008/{BINDInstall/BINDInstall.vcproj.vwin7.dupont.user => libstatistics_tests/libstatistics_tests.vcproj.vwin7.dupont.user} (100%)
copy win32build/VS2010/{libfake_session/libfake_session.vcxproj => libstatistics/libstatistics.vcxproj} (89%)
copy win32build/VS2010/{libutil_io/libutil_io.vcxproj.filters => libstatistics/libstatistics.vcxproj.filters} (77%)
copy win32build/VS2010/{BINDInstall/BINDInstall.vcxproj.user => libstatistics/libstatistics.vcxproj.user} (100%)
copy win32build/VS2010/{libcryptolink_tests/libcryptolink_tests.vcxproj => libstatistics_tests/libstatistics_tests.vcxproj} (79%)
copy win32build/VS2010/{libbench_tests/libbench_tests.vcxproj.filters => libstatistics_tests/libstatistics_tests.vcxproj.filters} (78%)
copy win32build/VS2010/{BINDInstall/BINDInstall.vcxproj.user => libstatistics_tests/libstatistics_tests.vcxproj.user} (100%)
-----------------------------------------------------------------------
diff --git a/src/lib/dhcp/pkt4.cc b/src/lib/dhcp/pkt4.cc
index 2c3f1eb..0451c72 100644
--- a/src/lib/dhcp/pkt4.cc
+++ b/src/lib/dhcp/pkt4.cc
@@ -12,6 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
+#include <config.h>
+
#include <dhcp/pkt4.h>
#include <dhcp/libdhcp++.h>
#include <dhcp/dhcp4.h>
diff --git a/src/lib/dhcp/tests/option6_ia_unittest.cc b/src/lib/dhcp/tests/option6_ia_unittest.cc
index 6711317..cd561b3 100644
--- a/src/lib/dhcp/tests/option6_ia_unittest.cc
+++ b/src/lib/dhcp/tests/option6_ia_unittest.cc
@@ -210,7 +210,7 @@ TEST_F(Option6IATest, suboptions_unpack) {
EXPECT_NO_THROW({
ia = new Option6IA(D6O_IA_NA, buf_.begin() + 4, buf_.begin() + sizeof(expected));
});
- ASSERT_TRUE(ia);
+ ASSERT_TRUE(ia != NULL);
EXPECT_EQ(D6O_IA_NA, ia->getType());
EXPECT_EQ(0x13579ace, ia->getIAID());
diff --git a/src/lib/python/isc/log/log.cc b/src/lib/python/isc/log/log.cc
index 69e70b7..1123811 100644
--- a/src/lib/python/isc/log/log.cc
+++ b/src/lib/python/isc/log/log.cc
@@ -18,6 +18,10 @@
#include <config.h>
+#ifdef _WIN32
+#include <ws2tcpip.h>
+#endif
+
#include <log/message_dictionary.h>
#include <log/logger_manager.h>
#include <log/logger_support.h>
diff --git a/src/lib/server_common/keyring.cc b/src/lib/server_common/keyring.cc
index 501dfd9..61c4a21 100644
--- a/src/lib/server_common/keyring.cc
+++ b/src/lib/server_common/keyring.cc
@@ -12,6 +12,10 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
+#ifdef _WIN32
+#include <ws2tcpip.h>
+#endif
+
#include <server_common/keyring.h>
#include <server_common/logger.h>
diff --git a/src/lib/server_common/portconfig.cc b/src/lib/server_common/portconfig.cc
index 1327f1e..2f15d48 100644
--- a/src/lib/server_common/portconfig.cc
+++ b/src/lib/server_common/portconfig.cc
@@ -14,6 +14,11 @@
#include <config.h>
+#ifdef _WIN32
+#include <ws2tcpip.h>
+#include <mswsock.h>
+#endif
+
#include <server_common/portconfig.h>
#include <server_common/logger.h>
#include <server_common/socket_request.h>
diff --git a/src/lib/server_common/tests/keyring_test.cc b/src/lib/server_common/tests/keyring_test.cc
index dab43df..98092de 100644
--- a/src/lib/server_common/tests/keyring_test.cc
+++ b/src/lib/server_common/tests/keyring_test.cc
@@ -12,6 +12,10 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
+#ifdef _WIN32
+#include <ws2tcpip.h>
+#endif
+
#include <server_common/keyring.h>
#include <server_common/tests/data_path.h>
diff --git a/win32build/VS2008/bind10.sln b/win32build/VS2008/bind10.sln
index aded719..24eba5e 100755
--- a/win32build/VS2008/bind10.sln
+++ b/win32build/VS2008/bind10.sln
@@ -561,6 +561,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdns++_mbench", "libdns++
{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstatistics", "libstatistics\libstatistics.vcproj", "{54BD83DD-8F29-45C6-9750-C3757D2C3C86}"
+ ProjectSection(ProjectDependencies) = postProject
+ {3ADF20CD-D230-4911-8BC6-5D394EF54A95} = {3ADF20CD-D230-4911-8BC6-5D394EF54A95}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstatistics_tests", "libstatistics_tests\libstatistics_tests.vcproj", "{F3CE5960-9B36-4271-8CBB-20DC8FA7591D}"
+ ProjectSection(ProjectDependencies) = postProject
+ {9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
+ {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+ {06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
+ {1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+ {54BD83DD-8F29-45C6-9750-C3757D2C3C86} = {54BD83DD-8F29-45C6-9750-C3757D2C3C86}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -823,6 +837,14 @@ Global
{2DB781B7-08FE-43AC-ABC5-C52B87798F1E}.Debug|Win32.Build.0 = Debug|Win32
{2DB781B7-08FE-43AC-ABC5-C52B87798F1E}.Release|Win32.ActiveCfg = Release|Win32
{2DB781B7-08FE-43AC-ABC5-C52B87798F1E}.Release|Win32.Build.0 = Release|Win32
+ {54BD83DD-8F29-45C6-9750-C3757D2C3C86}.Debug|Win32.ActiveCfg = Debug|Win32
+ {54BD83DD-8F29-45C6-9750-C3757D2C3C86}.Debug|Win32.Build.0 = Debug|Win32
+ {54BD83DD-8F29-45C6-9750-C3757D2C3C86}.Release|Win32.ActiveCfg = Release|Win32
+ {54BD83DD-8F29-45C6-9750-C3757D2C3C86}.Release|Win32.Build.0 = Release|Win32
+ {F3CE5960-9B36-4271-8CBB-20DC8FA7591D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F3CE5960-9B36-4271-8CBB-20DC8FA7591D}.Debug|Win32.Build.0 = Debug|Win32
+ {F3CE5960-9B36-4271-8CBB-20DC8FA7591D}.Release|Win32.ActiveCfg = Release|Win32
+ {F3CE5960-9B36-4271-8CBB-20DC8FA7591D}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/win32build/VS2008/libdhcp/libdhcp.vcproj b/win32build/VS2008/libdhcp/libdhcp.vcproj
index 56b96cc..46cc4f0 100755
--- a/win32build/VS2008/libdhcp/libdhcp.vcproj
+++ b/win32build/VS2008/libdhcp/libdhcp.vcproj
@@ -151,7 +151,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\..\src\lib\dhcp\libdhcp.cc"
+ RelativePath="..\..\..\src\lib\dhcp\libdhcp++.cc"
>
</File>
<File
@@ -159,6 +159,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\lib\dhcp\option4_addrlst.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\dhcp\option6_addrlst.cc"
>
</File>
@@ -193,7 +197,11 @@
>
</File>
<File
- RelativePath="..\..\..\src\lib\dhcp\libdhcp.h"
+ RelativePath="..\..\..\src\lib\dhcp\iface_mgr.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\lib\dhcp\libdhcp++.h"
>
</File>
<File
@@ -201,6 +209,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\lib\dhcp\option4_addrlst.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\dhcp\option6_addrlst.h"
>
</File>
diff --git a/win32build/VS2008/libdhcp_tests/libdhcp_tests.vcproj b/win32build/VS2008/libdhcp_tests/libdhcp_tests.vcproj
index 1dfb663..39284ac 100755
--- a/win32build/VS2008/libdhcp_tests/libdhcp_tests.vcproj
+++ b/win32build/VS2008/libdhcp_tests/libdhcp_tests.vcproj
@@ -179,7 +179,11 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\..\src\lib\dhcp\tests\libdhcp_unittest.cc"
+ RelativePath="..\..\..\src\lib\dhcp\tests\libdhcp++_unittest.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\lib\dhcp\tests\option4_addrlst_unittest.cc"
>
</File>
<File
diff --git a/win32build/VS2008/libserver_common_tests/libserver_common_tests.vcproj b/win32build/VS2008/libserver_common_tests/libserver_common_tests.vcproj
index 8cbfa75..226f349 100755
--- a/win32build/VS2008/libserver_common_tests/libserver_common_tests.vcproj
+++ b/win32build/VS2008/libserver_common_tests/libserver_common_tests.vcproj
@@ -191,10 +191,6 @@
>
</File>
<File
- RelativePath="..\..\..\src\lib\server_common\tests\portconfig_unittest.cc"
- >
- </File>
- <File
RelativePath="..\..\..\src\lib\server_common\tests\run_unittests.cc"
>
</File>
diff --git a/win32build/VS2008/libstatistics/libstatistics.vcproj b/win32build/VS2008/libstatistics/libstatistics.vcproj
new file mode 100755
index 0000000..42bafce
--- /dev/null
+++ b/win32build/VS2008/libstatistics/libstatistics.vcproj
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="libstatistics"
+ ProjectGUID="{54BD83DD-8F29-45C6-9750-C3757D2C3C86}"
+ RootNamespace="libstatistics"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..;..\..\..\src\lib;"$(BOOST)""
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ AdditionalIncludeDirectories="..\..;..\..\..\src\lib;"$(BOOST)""
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\..\src\lib\statistics\counter.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\lib\statistics\counter_dict.cc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath="..\..\..\src\lib\statistics\counter.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\lib\statistics\counter_dict.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/libstatistics/libstatistics.vcproj.vwin7.dupont.user b/win32build/VS2008/libstatistics/libstatistics.vcproj.vwin7.dupont.user
new file mode 100755
index 0000000..235170f
--- /dev/null
+++ b/win32build/VS2008/libstatistics/libstatistics.vcproj.vwin7.dupont.user
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioUserFile
+ ProjectType="Visual C++"
+ Version="9.00"
+ ShowAllFiles="false"
+ >
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ >
+ <DebugSettings
+ Command=""
+ WorkingDirectory=""
+ CommandArguments=""
+ Attach="false"
+ DebuggerType="3"
+ Remote="1"
+ RemoteMachine="VWIN7"
+ RemoteCommand=""
+ HttpUrl=""
+ PDBPath=""
+ SQLDebugging=""
+ Environment=""
+ EnvironmentMerge="true"
+ DebuggerFlavor=""
+ MPIRunCommand=""
+ MPIRunArguments=""
+ MPIRunWorkingDirectory=""
+ ApplicationCommand=""
+ ApplicationArguments=""
+ ShimCommand=""
+ MPIAcceptMode=""
+ MPIAcceptFilter=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ >
+ <DebugSettings
+ Command=""
+ WorkingDirectory=""
+ CommandArguments=""
+ Attach="false"
+ DebuggerType="3"
+ Remote="1"
+ RemoteMachine="VWIN7"
+ RemoteCommand=""
+ HttpUrl=""
+ PDBPath=""
+ SQLDebugging=""
+ Environment=""
+ EnvironmentMerge="true"
+ DebuggerFlavor=""
+ MPIRunCommand=""
+ MPIRunArguments=""
+ MPIRunWorkingDirectory=""
+ ApplicationCommand=""
+ ApplicationArguments=""
+ ShimCommand=""
+ MPIAcceptMode=""
+ MPIAcceptFilter=""
+ />
+ </Configuration>
+ </Configurations>
+</VisualStudioUserFile>
diff --git a/win32build/VS2008/libstatistics_tests/libstatistics_tests.vcproj b/win32build/VS2008/libstatistics_tests/libstatistics_tests.vcproj
new file mode 100755
index 0000000..bf58be5
--- /dev/null
+++ b/win32build/VS2008/libstatistics_tests/libstatistics_tests.vcproj
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="libstatistics_tests"
+ ProjectGUID="{F3CE5960-9B36-4271-8CBB-20DC8FA7591D}"
+ RootNamespace="libstatistics_tests"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"$(BOOST)""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libstatistics.lib log4cplusSD.lib gtestd.lib"
+ OutputFile="$(OutDir)\run_unittests.exe"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libstatistics\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ AdditionalIncludeDirectories="..\..;..\..\..\src\lib;..\..\..\..\gtest\include;"$(BOOST)""
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib libstatistics.lib log4cplusS.lib gtest.lib"
+ OutputFile="$(OutDir)\run_unittests.exe"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\libstatistics\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\..\src\lib\statistics\tests\counter_dict_unittest.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\lib\statistics\tests\counter_unittest.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\lib\statistics\tests\run_unittests.cc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/libstatistics_tests/libstatistics_tests.vcproj.vwin7.dupont.user b/win32build/VS2008/libstatistics_tests/libstatistics_tests.vcproj.vwin7.dupont.user
new file mode 100755
index 0000000..961152b
--- /dev/null
+++ b/win32build/VS2008/libstatistics_tests/libstatistics_tests.vcproj.vwin7.dupont.user
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioUserFile
+ ProjectType="Visual C++"
+ Version="9.00"
+ ShowAllFiles="false"
+ >
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ >
+ <DebugSettings
+ Command="$(TargetPath)"
+ WorkingDirectory=""
+ CommandArguments=""
+ Attach="false"
+ DebuggerType="3"
+ Remote="1"
+ RemoteMachine="VWIN7"
+ RemoteCommand=""
+ HttpUrl=""
+ PDBPath=""
+ SQLDebugging=""
+ Environment=""
+ EnvironmentMerge="true"
+ DebuggerFlavor=""
+ MPIRunCommand=""
+ MPIRunArguments=""
+ MPIRunWorkingDirectory=""
+ ApplicationCommand=""
+ ApplicationArguments=""
+ ShimCommand=""
+ MPIAcceptMode=""
+ MPIAcceptFilter=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ >
+ <DebugSettings
+ Command="$(TargetPath)"
+ WorkingDirectory=""
+ CommandArguments=""
+ Attach="false"
+ DebuggerType="3"
+ Remote="1"
+ RemoteMachine="VWIN7"
+ RemoteCommand=""
+ HttpUrl=""
+ PDBPath=""
+ SQLDebugging=""
+ Environment=""
+ EnvironmentMerge="true"
+ DebuggerFlavor=""
+ MPIRunCommand=""
+ MPIRunArguments=""
+ MPIRunWorkingDirectory=""
+ ApplicationCommand=""
+ ApplicationArguments=""
+ ShimCommand=""
+ MPIAcceptMode=""
+ MPIAcceptFilter=""
+ />
+ </Configuration>
+ </Configurations>
+</VisualStudioUserFile>
diff --git a/win32build/VS2008/pyddatasrc/pyddatasrc.vcproj b/win32build/VS2008/pyddatasrc/pyddatasrc.vcproj
index 9fd592f..8765644 100755
--- a/win32build/VS2008/pyddatasrc/pyddatasrc.vcproj
+++ b/win32build/VS2008/pyddatasrc/pyddatasrc.vcproj
@@ -195,6 +195,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\lib\python\isc\datasrc\journal_reader_python.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\python\isc\datasrc\updater_python.cc"
>
</File>
@@ -233,6 +237,14 @@
>
</File>
<File
+ RelativePath="..\..\..\src\lib\python\isc\datasrc\journal_reader_inc.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\lib\python\isc\datasrc\journal_reader_python.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\python\isc\datasrc\updater_inc.cc"
>
</File>
diff --git a/win32build/VS2010/bind10.sln b/win32build/VS2010/bind10.sln
index cd98f67..81bd21b 100755
--- a/win32build/VS2010/bind10.sln
+++ b/win32build/VS2010/bind10.sln
@@ -360,7 +360,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdhcp_tests", "libdhcp_te
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "b10-dhcp6", "b10-dhcp6\b10-dhcp6.vcxproj", "{831EDB24-3B0A-44AE-A192-6F3DEA1A9BA6}"
ProjectSection(ProjectDependencies) = postProject
+ {69048307-9655-4AAA-B07E-B67345C1DEF9} = {69048307-9655-4AAA-B07E-B67345C1DEF9}
+ {7D04222B-643C-446C-A2B8-93AF74A86246} = {7D04222B-643C-446C-A2B8-93AF74A86246}
+ {8F120666-1A69-4506-8546-0F665E80FFB7} = {8F120666-1A69-4506-8546-0F665E80FFB7}
+ {813BA1C9-8CD8-4B06-B1C0-FDAB576AC4B6} = {813BA1C9-8CD8-4B06-B1C0-FDAB576AC4B6}
{F27BC0D0-A334-4DC0-9DC9-880D5DA74524} = {F27BC0D0-A334-4DC0-9DC9-880D5DA74524}
+ {CC29C1F9-A77B-476C-803E-8830F8312571} = {CC29C1F9-A77B-476C-803E-8830F8312571}
+ {AEF3DFFE-B566-4E6A-B299-B59B81022C06} = {AEF3DFFE-B566-4E6A-B299-B59B81022C06}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "b10-dhcp6_tests", "b10-dhcp6_tests\b10-dhcp6_tests.vcxproj", "{E5640378-81D0-4769-B108-4DF4E2B0AD0C}"
@@ -549,6 +555,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdns++_mbench", "libdns++
{F6E728D3-A0B2-40F6-9B91-7D4474D778F3} = {F6E728D3-A0B2-40F6-9B91-7D4474D778F3}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstatistics", "libstatistics\libstatistics.vcxproj", "{FF298091-A570-41CF-BB91-841ECB7F4E5F}"
+ ProjectSection(ProjectDependencies) = postProject
+ {F27BC0D0-A334-4DC0-9DC9-880D5DA74524} = {F27BC0D0-A334-4DC0-9DC9-880D5DA74524}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstatistics_tests", "libstatistics_tests\libstatistics_tests.vcxproj", "{2D4553C4-1AA7-4524-ABC0-6FDF4EEE6F2E}"
+ ProjectSection(ProjectDependencies) = postProject
+ {7D04222B-643C-446C-A2B8-93AF74A86246} = {7D04222B-643C-446C-A2B8-93AF74A86246}
+ {FF298091-A570-41CF-BB91-841ECB7F4E5F} = {FF298091-A570-41CF-BB91-841ECB7F4E5F}
+ {2844FDFB-A0A1-4FA4-A654-15D69CC717DD} = {2844FDFB-A0A1-4FA4-A654-15D69CC717DD}
+ {AEF3DFFE-B566-4E6A-B299-B59B81022C06} = {AEF3DFFE-B566-4E6A-B299-B59B81022C06}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -811,6 +830,14 @@ Global
{E7E6EC32-E109-4334-9BCD-BC8190489070}.Debug|Win32.Build.0 = Debug|Win32
{E7E6EC32-E109-4334-9BCD-BC8190489070}.Release|Win32.ActiveCfg = Release|Win32
{E7E6EC32-E109-4334-9BCD-BC8190489070}.Release|Win32.Build.0 = Release|Win32
+ {FF298091-A570-41CF-BB91-841ECB7F4E5F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {FF298091-A570-41CF-BB91-841ECB7F4E5F}.Debug|Win32.Build.0 = Debug|Win32
+ {FF298091-A570-41CF-BB91-841ECB7F4E5F}.Release|Win32.ActiveCfg = Release|Win32
+ {FF298091-A570-41CF-BB91-841ECB7F4E5F}.Release|Win32.Build.0 = Release|Win32
+ {2D4553C4-1AA7-4524-ABC0-6FDF4EEE6F2E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2D4553C4-1AA7-4524-ABC0-6FDF4EEE6F2E}.Debug|Win32.Build.0 = Debug|Win32
+ {2D4553C4-1AA7-4524-ABC0-6FDF4EEE6F2E}.Release|Win32.ActiveCfg = Release|Win32
+ {2D4553C4-1AA7-4524-ABC0-6FDF4EEE6F2E}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/win32build/VS2010/libdhcp/libdhcp.vcxproj b/win32build/VS2010/libdhcp/libdhcp.vcxproj
index 724b380..236a9f5 100755
--- a/win32build/VS2010/libdhcp/libdhcp.vcxproj
+++ b/win32build/VS2010/libdhcp/libdhcp.vcxproj
@@ -13,8 +13,10 @@
<ItemGroup>
<ClInclude Include="..\..\..\src\lib\dhcp\dhcp4.h" />
<ClInclude Include="..\..\..\src\lib\dhcp\dhcp6.h" />
- <ClInclude Include="..\..\..\src\lib\dhcp\libdhcp.h" />
+ <ClInclude Include="..\..\..\src\lib\dhcp\iface_mgr.h" />
+ <ClInclude Include="..\..\..\src\lib\dhcp\libdhcp++.h" />
<ClInclude Include="..\..\..\src\lib\dhcp\option.h" />
+ <ClInclude Include="..\..\..\src\lib\dhcp\option4_addrlst.h" />
<ClInclude Include="..\..\..\src\lib\dhcp\option6_addrlst.h" />
<ClInclude Include="..\..\..\src\lib\dhcp\option6_ia.h" />
<ClInclude Include="..\..\..\src\lib\dhcp\option6_iaaddr.h" />
@@ -22,8 +24,9 @@
<ClInclude Include="..\..\..\src\lib\dhcp\pkt6.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\src\lib\dhcp\libdhcp.cc" />
+ <ClCompile Include="..\..\..\src\lib\dhcp\libdhcp++.cc" />
<ClCompile Include="..\..\..\src\lib\dhcp\option.cc" />
+ <ClCompile Include="..\..\..\src\lib\dhcp\option4_addrlst.cc" />
<ClCompile Include="..\..\..\src\lib\dhcp\option6_addrlst.cc" />
<ClCompile Include="..\..\..\src\lib\dhcp\option6_ia.cc" />
<ClCompile Include="..\..\..\src\lib\dhcp\option6_iaaddr.cc" />
diff --git a/win32build/VS2010/libdhcp/libdhcp.vcxproj.filters b/win32build/VS2010/libdhcp/libdhcp.vcxproj.filters
index 40c2c6e..648924f 100755
--- a/win32build/VS2010/libdhcp/libdhcp.vcxproj.filters
+++ b/win32build/VS2010/libdhcp/libdhcp.vcxproj.filters
@@ -18,9 +18,6 @@
<ClInclude Include="..\..\..\src\lib\dhcp\dhcp6.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\src\lib\dhcp\libdhcp.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\src\lib\dhcp\option.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -42,11 +39,17 @@
<ClInclude Include="..\..\..\src\lib\dhcp\pkt4.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\src\lib\dhcp\iface_mgr.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\lib\dhcp\libdhcp++.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\lib\dhcp\option4_addrlst.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\src\lib\dhcp\libdhcp.cc">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\src\lib\dhcp\option.cc">
<Filter>Source Files</Filter>
</ClCompile>
@@ -65,5 +68,11 @@
<ClCompile Include="..\..\..\src\lib\dhcp\pkt4.cc">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\lib\dhcp\libdhcp++.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\dhcp\option4_addrlst.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libdhcp_tests/libdhcp_tests.vcxproj b/win32build/VS2010/libdhcp_tests/libdhcp_tests.vcxproj
index 4188c91..e7cbd96 100755
--- a/win32build/VS2010/libdhcp_tests/libdhcp_tests.vcxproj
+++ b/win32build/VS2010/libdhcp_tests/libdhcp_tests.vcxproj
@@ -86,7 +86,8 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\src\lib\dhcp\tests\libdhcp_unittest.cc" />
+ <ClCompile Include="..\..\..\src\lib\dhcp\tests\libdhcp++_unittest.cc" />
+ <ClCompile Include="..\..\..\src\lib\dhcp\tests\option4_addrlst_unittest.cc" />
<ClCompile Include="..\..\..\src\lib\dhcp\tests\option6_addrlst_unittest.cc" />
<ClCompile Include="..\..\..\src\lib\dhcp\tests\option6_iaaddr_unittest.cc" />
<ClCompile Include="..\..\..\src\lib\dhcp\tests\option6_ia_unittest.cc" />
diff --git a/win32build/VS2010/libdhcp_tests/libdhcp_tests.vcxproj.filters b/win32build/VS2010/libdhcp_tests/libdhcp_tests.vcxproj.filters
index 392181b..af8560e 100755
--- a/win32build/VS2010/libdhcp_tests/libdhcp_tests.vcxproj.filters
+++ b/win32build/VS2010/libdhcp_tests/libdhcp_tests.vcxproj.filters
@@ -15,9 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\src\lib\dhcp\tests\libdhcp_unittest.cc">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\src\lib\dhcp\tests\option_unittest.cc">
<Filter>Source Files</Filter>
</ClCompile>
@@ -39,5 +36,11 @@
<ClCompile Include="..\..\..\src\lib\dhcp\tests\pkt4_unittest.cc">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\lib\dhcp\tests\libdhcp++_unittest.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\dhcp\tests\option4_addrlst_unittest.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libserver_common_tests/libserver_common_tests.vcxproj b/win32build/VS2010/libserver_common_tests/libserver_common_tests.vcxproj
index 65d5282..5631927 100755
--- a/win32build/VS2010/libserver_common_tests/libserver_common_tests.vcxproj
+++ b/win32build/VS2010/libserver_common_tests/libserver_common_tests.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -98,9 +98,11 @@ copy data_path.h.win32 data_path.h
<ItemGroup>
<ClCompile Include="..\..\..\src\lib\server_common\tests\client_unittest.cc" />
<ClCompile Include="..\..\..\src\lib\server_common\tests\keyring_test.cc" />
- <ClCompile Include="..\..\..\src\lib\server_common\tests\portconfig_unittest.cc" />
<ClCompile Include="..\..\..\src\lib\server_common\tests\run_unittests.cc" />
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\src\lib\server_common\tests\data_path.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/win32build/VS2010/libserver_common_tests/libserver_common_tests.vcxproj.filters b/win32build/VS2010/libserver_common_tests/libserver_common_tests.vcxproj.filters
index 8e39235..8de297f 100755
--- a/win32build/VS2010/libserver_common_tests/libserver_common_tests.vcxproj.filters
+++ b/win32build/VS2010/libserver_common_tests/libserver_common_tests.vcxproj.filters
@@ -15,9 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\src\lib\server_common\tests\portconfig_unittest.cc">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\src\lib\server_common\tests\run_unittests.cc">
<Filter>Source Files</Filter>
</ClCompile>
@@ -28,4 +25,9 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\src\lib\server_common\tests\data_path.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libstatistics/libstatistics.vcxproj b/win32build/VS2010/libstatistics/libstatistics.vcxproj
new file mode 100755
index 0000000..c57e8d2
--- /dev/null
+++ b/win32build/VS2010/libstatistics/libstatistics.vcxproj
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\src\lib\statistics\counter.h" />
+ <ClInclude Include="..\..\..\src\lib\statistics\counter_dict.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\lib\statistics\counter.cc" />
+ <ClCompile Include="..\..\..\src\lib\statistics\counter_dict.cc" />
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{FF298091-A570-41CF-BB91-841ECB7F4E5F}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>libstatistics</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>$(Configuration)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <OutDir>$(Configuration)\</OutDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsCpp</CompileAs>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsCpp</CompileAs>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libstatistics/libstatistics.vcxproj.filters b/win32build/VS2010/libstatistics/libstatistics.vcxproj.filters
new file mode 100755
index 0000000..3e035b9
--- /dev/null
+++ b/win32build/VS2010/libstatistics/libstatistics.vcxproj.filters
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\src\lib\statistics\counter.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\lib\statistics\counter_dict.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\lib\statistics\counter.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\statistics\counter_dict.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libstatistics/libstatistics.vcxproj.user b/win32build/VS2010/libstatistics/libstatistics.vcxproj.user
new file mode 100755
index 0000000..695b5c7
--- /dev/null
+++ b/win32build/VS2010/libstatistics/libstatistics.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libstatistics_tests/libstatistics_tests.vcxproj b/win32build/VS2010/libstatistics_tests/libstatistics_tests.vcxproj
new file mode 100755
index 0000000..a98e408
--- /dev/null
+++ b/win32build/VS2010/libstatistics_tests/libstatistics_tests.vcxproj
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{2D4553C4-1AA7-4524-ABC0-6FDF4EEE6F2E}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>libstatistics_tests</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ <OutDir>$(Configuration)\</OutDir>
+ <TargetName>run_unittests</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <LinkIncremental>false</LinkIncremental>
+ <OutDir>$(Configuration)\</OutDir>
+ <TargetName>run_unittests</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsCpp</CompileAs>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
+ <AdditionalLibraryDirectories>..\libexceptions\$(Configuration);..\libutil\$(Configuration);..\libutil_unittests\$(Configuration);..\liblog\$(Configuration);..\libstatistics\$(Configuration);..\..\..\..\log4cplus\md10\$(Configuration);..\..\..\..\gtest\md10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>libexceptions.lib;libutil.lib;libutil_unittests.lib;liblog.lib;libstatistics.lib;log4cplusSD.lib;gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsCpp</CompileAs>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
+ <AdditionalLibraryDirectories>..\libexceptions\$(Configuration);..\libutil\$(Configuration);..\libutil_unittests\$(Configuration);..\liblog\$(Configuration);..\libstatistics\$(Configuration);..\..\..\..\log4cplus\md10\$(Configuration);..\..\..\..\gtest\md10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>libexceptions.lib;libutil.lib;libutil_unittests.lib;liblog.lib;libstatistics.lib;log4cplusS.lib;gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\lib\statistics\tests\counter_dict_unittest.cc" />
+ <ClCompile Include="..\..\..\src\lib\statistics\tests\counter_unittest.cc" />
+ <ClCompile Include="..\..\..\src\lib\statistics\tests\run_unittests.cc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libstatistics_tests/libstatistics_tests.vcxproj.filters b/win32build/VS2010/libstatistics_tests/libstatistics_tests.vcxproj.filters
new file mode 100755
index 0000000..f57a87f
--- /dev/null
+++ b/win32build/VS2010/libstatistics_tests/libstatistics_tests.vcxproj.filters
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\lib\statistics\tests\counter_dict_unittest.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\statistics\tests\counter_unittest.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\statistics\tests\run_unittests.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libstatistics_tests/libstatistics_tests.vcxproj.user b/win32build/VS2010/libstatistics_tests/libstatistics_tests.vcxproj.user
new file mode 100755
index 0000000..695b5c7
--- /dev/null
+++ b/win32build/VS2010/libstatistics_tests/libstatistics_tests.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/pyddatasrc/pyddatasrc.vcxproj b/win32build/VS2010/pyddatasrc/pyddatasrc.vcxproj
index 3053d47..5ad924a 100755
--- a/win32build/VS2010/pyddatasrc/pyddatasrc.vcxproj
+++ b/win32build/VS2010/pyddatasrc/pyddatasrc.vcxproj
@@ -94,6 +94,8 @@
<ClCompile Include="..\..\..\src\lib\python\isc\datasrc\finder_inc.cc" />
<ClCompile Include="..\..\..\src\lib\python\isc\datasrc\finder_python.cc" />
<ClCompile Include="..\..\..\src\lib\python\isc\datasrc\iterator_python.cc" />
+ <ClCompile Include="..\..\..\src\lib\python\isc\datasrc\journal_reader_inc.cc" />
+ <ClCompile Include="..\..\..\src\lib\python\isc\datasrc\journal_reader_python.cc" />
<ClCompile Include="..\..\..\src\lib\python\isc\datasrc\updater_inc.cc" />
<ClCompile Include="..\..\..\src\lib\python\isc\datasrc\updater_python.cc" />
</ItemGroup>
@@ -102,6 +104,7 @@
<ClInclude Include="..\..\..\src\lib\python\isc\datasrc\datasrc.h" />
<ClInclude Include="..\..\..\src\lib\python\isc\datasrc\finder_python.h" />
<ClInclude Include="..\..\..\src\lib\python\isc\datasrc\iterator_python.h" />
+ <ClInclude Include="..\..\..\src\lib\python\isc\datasrc\journal_reader_python.h" />
<ClInclude Include="..\..\..\src\lib\python\isc\datasrc\updater_python.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/win32build/VS2010/pyddatasrc/pyddatasrc.vcxproj.filters b/win32build/VS2010/pyddatasrc/pyddatasrc.vcxproj.filters
index 688b94c..9ca941e 100755
--- a/win32build/VS2010/pyddatasrc/pyddatasrc.vcxproj.filters
+++ b/win32build/VS2010/pyddatasrc/pyddatasrc.vcxproj.filters
@@ -39,6 +39,12 @@
<ClCompile Include="..\..\..\src\lib\python\isc\datasrc\updater_python.cc">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\lib\python\isc\datasrc\journal_reader_inc.cc">
+ <Filter>Header Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\python\isc\datasrc\journal_reader_python.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\lib\python\isc\datasrc\client_python.h">
@@ -56,5 +62,8 @@
<ClInclude Include="..\..\..\src\lib\python\isc\datasrc\updater_python.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\src\lib\python\isc\datasrc\journal_reader_python.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
More information about the bind10-changes
mailing list