BIND 10 trac826, updated. f4d59306f92a2b070025c8d19c3f8ba48814f689 [trac826] fixed tests
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Oct 3 23:10:39 UTC 2011
The branch, trac826 has been updated
via f4d59306f92a2b070025c8d19c3f8ba48814f689 (commit)
from 84a384a93a4d124676ce7595e364e17b2fab2a29 (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 f4d59306f92a2b070025c8d19c3f8ba48814f689
Author: Francis Dupont <fdupont at isc.org>
Date: Tue Oct 4 01:10:15 2011 +0200
[trac826] fixed tests
added socket.inet_ntop/pton in the WIN32-NOTES how file
built .wire testdata files
introduced BIND10HOME environment variable
added unit test status in WIN32-NOTES
-----------------------------------------------------------------------
Summary of changes:
WIN32-NOTES | 58 +++++-
src/bin/resolver/spec_config.h.pre.win32 | 2 +-
.../config/tests/data_def_unittests_config.h.win32 | 2 +-
src/lib/log/tests/console_test.sh.win32 | 2 +-
src/lib/log/tests/destination_test.sh.win32 | 6 +-
src/lib/log/tests/init_logger_test.sh.win32 | 4 +-
src/lib/log/tests/local_file_test.sh.win32 | 4 +-
src/lib/log/tests/severity_test.sh.win32 | 2 +-
src/lib/log/tests/tempdir.h.win32 | 2 +-
src/lib/python/isc/cc/tests/cc_test.win32 | 4 +-
src/lib/python/isc/config/tests/config_test.win32 | 6 +-
.../python/isc/notify/tests/notify_out_test.win32 | 4 +-
src/lib/server_common/tests/data_path.h.win32 | 4 +-
.../VS2010/b10-resolver/b10-resolver.vcxproj | 4 +-
.../b10-resolver_tests/b10-resolver_tests.vcxproj | 4 +-
.../VS2010/libbench_tests/libbench_tests.vcxproj | 4 +-
.../VS2010/libcache_tests/libcache_tests.vcxproj | 4 +-
.../libcfgclient_tests/libcfgclient_tests.vcxproj | 4 +-
.../libdatasrc_tests/libdatasrc_tests.vcxproj | 4 +-
.../VS2010/libdns++_tests/libdns++_tests.vcxproj | 232 +++++++++++++++++++-
.../VS2010/liblog_tests/liblog_tests.vcxproj | 4 +-
.../libserver_common_tests.vcxproj | 4 +-
.../VS2010/libtestutils/libtestutils.vcxproj | 30 +++-
win32build/VS2010/libutil/libutil.vcxproj | 14 +-
24 files changed, 358 insertions(+), 50 deletions(-)
-----------------------------------------------------------------------
diff --git a/WIN32-NOTES b/WIN32-NOTES
index 91915c0..3da8199 100644
--- a/WIN32-NOTES
+++ b/WIN32-NOTES
@@ -13,7 +13,8 @@ What is needed:
- python >= 3.1 (I got Cpython 3.2 MSI from python.org,
note the pre-built python can give C++ runtime issue with
an incompatible Visual Studio, and botan wants a version 2
- for configuration)
+ for configuration. Current python has no socket.inet_ntop /
+ socket.inet_pton or _d.lib, so I recommend to recompile it)
- perl (the Windows native one)
@@ -39,6 +40,13 @@ What is needed:
- log4cplus (compiled from sources in the same style...
Note WIN32 disables syslog support)
+Environment variables:
+ (for VS2010 now)
+
+ - BOOST -> C:\Program Files\boost\boost_1_44
+
+ - BIND10HOME -> c:/cygwin/home/dupont/bind10.trac826
+
How to compile google test:
- remove the /MD -> /MT line in the CMakeLists.txt, use cmake
@@ -51,10 +59,36 @@ How to compile google test:
- msvc gives the gtestd.lib (in place of gtest.lib) for the debug version
+How to recompile python:
+
+ - solution file is in PCbuild/pcbuild.sln
+
+ - patch socketmodule.h with:
+
+#else /* MS_WINDOWS */
+# define NTDDI_VERSION NTDDI_WIN7
+# define WINVER _WIN32_WINNT_WIN7
+# define _WIN32_WINNT _WIN32_WINNT_WIN7
+# include <ws2tcpip.h>
+/* VC6 is shipped with old platform headers, and does not have MSTcpIP.h
+ * Separate SDKs have all the functions we want, but older ones don't have
+ * any version information.
+ * I use SIO_GET_MULTICAST_FILTER to detect a decent SDK.
+ */
+# ifdef SIO_GET_MULTICAST_FILTER
+# include <MSTcpIP.h> /* for SIO_RCVALL */
+# define HAVE_ADDRINFO
+# define HAVE_SOCKADDR_STORAGE
+# define HAVE_GETADDRINFO
+# define HAVE_GETNAMEINFO
+# define HAVE_INET_NTOP
+# define HAVE_INET_PTON
+# define ENABLE_IPV6
+# else
+
Where I put things (hardwired paths):
- - <home>\bind10.trac826 for bind10
- (wired in dns tests preprocessor defines)
+ - <home>\bind10.trac826 for bind10 (BIND10HOME environment variable)
- <home>\gtest\include
@@ -68,11 +102,14 @@ Where I put things (hardwired paths):
(tested only for VS 2010 / md10)
- "C:\Program Files\boost\boost_1_44" (the include and
- sometimes the libraries (in lib, called by the auto_link) too)
+ sometimes the libraries (in lib, called by the auto_link) too,
+ BOOST environment variable)
- C:\Python32 (update your PATH, same for perl)
- - C:\sqlite3 (don't forget to copy the DLL in a place in the PATH)
+ - C:\sqlite3 (don't forget to copy the DLL in a place in the PATH,
+ on Window7 I can't get the permissions right but it works with a copy
+ in the current directory?)
How to compile:
@@ -118,3 +155,14 @@ Random notes (for porting new code):
not < 0), errno -> WSAGetLastError()
- different declarations: send, recv,
- WSAStartup/WSACleanup in main()
+
+Test status: (unittests failures)
+ log: LoggerManagerTest* (2) (+crash in debug)
+ cfgclient: LogConfigTest (1)
+ acl: RequestCheckTest (3) IPAddress (2)
+ bench: BenchMarkTest (1) (too long?)
+ asiolink: IOEndpointTest.getSockAddr (debug crash)
+ asiodns: IOFetchTest (19)
+ cc: Element.removeIdentical (debug crash)
+ resolve: *imeout* (+crash in debug)
+ b10-dhcp6: interface stuff?
diff --git a/src/bin/resolver/spec_config.h.pre.win32 b/src/bin/resolver/spec_config.h.pre.win32
index 9f20c47..a7dea2b 100644
--- a/src/bin/resolver/spec_config.h.pre.win32
+++ b/src/bin/resolver/spec_config.h.pre.win32
@@ -12,4 +12,4 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define RESOLVER_SPECFILE_LOCATION "c:/cygwin/home/fdupont/bind10.trac826/src/bin/resolver/resolver.spec"
+#define RESOLVER_SPECFILE_LOCATION BIND10HOME "/src/bin/resolver/resolver.spec"
diff --git a/src/lib/config/tests/data_def_unittests_config.h.win32 b/src/lib/config/tests/data_def_unittests_config.h.win32
index 37582d1..04b41e7 100644
--- a/src/lib/config/tests/data_def_unittests_config.h.win32
+++ b/src/lib/config/tests/data_def_unittests_config.h.win32
@@ -13,4 +13,4 @@
// PERFORMANCE OF THIS SOFTWARE.
// #define TEST_DATA_PATH "@abs_srcdir@/testdata"
-#define LOG_SPEC_FILE "c:/cygwin/home/fdupont/bind10.trac826/src/bin/cfgmgr/plugins/logging.spec"
+#define LOG_SPEC_FILE BIND10HOME "/src/bin/cfgmgr/plugins/logging.spec"
diff --git a/src/lib/log/tests/console_test.sh.win32 b/src/lib/log/tests/console_test.sh.win32
index 36ca4e7..2fa715b 100755
--- a/src/lib/log/tests/console_test.sh.win32
+++ b/src/lib/log/tests/console_test.sh.win32
@@ -20,7 +20,7 @@ testname="Console output test"
echo $testname
failcount=0
-tempfile=c:/cygwin/home/fdupont/bind10.trac826/src/lib/log/tests/console_test_tempfile_$$
+tempfile=$BIND10HOME/src/lib/log/tests/console_test_tempfile_$$
# Look at tempfile and check that the count equals the expected count
passfail() {
diff --git a/src/lib/log/tests/destination_test.sh.win32 b/src/lib/log/tests/destination_test.sh.win32
index d076924..3cfc783 100755
--- a/src/lib/log/tests/destination_test.sh.win32
+++ b/src/lib/log/tests/destination_test.sh.win32
@@ -19,9 +19,9 @@ testname="Destination test"
echo $testname
failcount=0
-tempfile=c:/cygwin/home/fdupont/bind10.trac826/src/lib/log/tests/destination_test_tempfile_$$
-destfile1=c:/cygwin/home/fdupont/bind10.trac826/src/lib/log/tests/destination_test_destfile_1_$$
-destfile2=c:/cygwin/home/fdupont/bind10.trac826/src/lib/log/tests/destination_test_destfile_2_$$
+tempfile=$BIND10HOME/src/lib/log/tests/destination_test_tempfile_$$
+destfile1=$BIND10HOME/src/lib/log/tests/destination_test_destfile_1_$$
+destfile2=$BIND10HOME/src/lib/log/tests/destination_test_destfile_2_$$
passfail() {
if [ $1 -eq 0 ]; then
diff --git a/src/lib/log/tests/init_logger_test.sh.win32 b/src/lib/log/tests/init_logger_test.sh.win32
index ad532ad..d4437da 100755
--- a/src/lib/log/tests/init_logger_test.sh.win32
+++ b/src/lib/log/tests/init_logger_test.sh.win32
@@ -20,8 +20,8 @@ testname="initLogger test"
echo $testname
failcount=0
-tempfile=c:/cygwin/home/fdupont/bind10.trac826/src/lib/log/tests/init_logger_test_tempfile_$$
-destfile=c:/cygwin/home/fdupont/bind10.trac826/src/lib/log/tests/init_logger_test_destfile_$$
+tempfile=$BIND10HOME/src/lib/log/tests/init_logger_test_tempfile_$$
+destfile=$BIND10HOME/src/lib/log/tests/init_logger_test_destfile_$$
passfail() {
if [ $1 -eq 0 ]; then
diff --git a/src/lib/log/tests/local_file_test.sh.win32 b/src/lib/log/tests/local_file_test.sh.win32
index 6ca52bd..9624c17 100755
--- a/src/lib/log/tests/local_file_test.sh.win32
+++ b/src/lib/log/tests/local_file_test.sh.win32
@@ -20,8 +20,8 @@ testname="Local message file test"
echo $testname
failcount=0
-localmes=c:/cygwin/home/fdupont/bind10.trac826/src/lib/log/tests/localdef_mes_$$
-tempfile=c:/cygwin/home/fdupont/bind10.trac826/src/lib/log/tests/run_time_init_test_tempfile_$$
+localmes=$BIND10HOME/src/lib/log/tests/localdef_mes_$$
+tempfile=$BIND10HOME/src/lib/log/tests/run_time_init_test_tempfile_$$
passfail() {
if [ $1 -eq 0 ]; then
diff --git a/src/lib/log/tests/severity_test.sh.win32 b/src/lib/log/tests/severity_test.sh.win32
index 0c7eb93..a7b8201 100755
--- a/src/lib/log/tests/severity_test.sh.win32
+++ b/src/lib/log/tests/severity_test.sh.win32
@@ -20,7 +20,7 @@ testname="Severity test"
echo $testname
failcount=0
-tempfile=c:/cygwin/home/fdupont/bind10.trac826/src/lib/log/tests/severity_test_tempfile_$$
+tempfile=$BIND10HOME/src/lib/log/tests/severity_test_tempfile_$$
passfail() {
if [ $1 -eq 0 ]; then
diff --git a/src/lib/log/tests/tempdir.h.win32 b/src/lib/log/tests/tempdir.h.win32
index 357e5e4..85e831d 100644
--- a/src/lib/log/tests/tempdir.h.win32
+++ b/src/lib/log/tests/tempdir.h.win32
@@ -23,7 +23,7 @@
#include <string>
namespace {
-std::string TEMP_DIR("c:/cygwin/home/fdupont/bind10.trac826/src/lib/log/tests");
+std::string TEMP_DIR(BIND10HOME "/bind10.trac826/src/lib/log/tests");
}
#endif // __TEMPDIR_H
diff --git a/src/lib/python/isc/cc/tests/cc_test.win32 b/src/lib/python/isc/cc/tests/cc_test.win32
index 7a64830..67cac0e 100755
--- a/src/lib/python/isc/cc/tests/cc_test.win32
+++ b/src/lib/python/isc/cc/tests/cc_test.win32
@@ -18,9 +18,9 @@
PYTHON_EXEC=${PYTHON_EXEC:-/usr/bin/python}
export PYTHON_EXEC
-CONFIG_PATH=c:/cygwin/home/fdupont/bind10.trac826/src/lib/python/isc/cc/tests
+CONFIG_PATH=$BIND10HOME/src/lib/python/isc/cc/tests
-PYTHONPATH=c:/cygwin/home/fdupont/bind10.trac826/src/lib/python
+PYTHONPATH=$BIND10HOME/src/lib/python
export PYTHONPATH
cd ${BIND10_PATH}
diff --git a/src/lib/python/isc/config/tests/config_test.win32 b/src/lib/python/isc/config/tests/config_test.win32
index 644ce89..154e68e 100755
--- a/src/lib/python/isc/config/tests/config_test.win32
+++ b/src/lib/python/isc/config/tests/config_test.win32
@@ -18,12 +18,12 @@
PYTHON_EXEC=${PYTHON_EXEC:-/usr/bin/python}
export PYTHON_EXEC
-CONFIG_PATH=c:/cygwin/home/fdupont/bind10.trac826/src/lib/python/isc/config/tests
+CONFIG_PATH=$BIND10HOME/src/lib/python/isc/config/tests
-PYTHONPATH=c:/cygwin/home/fdupont/bind10.trac826/src/lib/python
+PYTHONPATH=$BIND10HOME/src/lib/python
export PYTHONPATH
-CONFIG_TESTDATA_PATH=c:/cygwin/home/fdupont/bind10.trac826/src/lib/config/testdata
+CONFIG_TESTDATA_PATH=$BIND10HOME/src/lib/config/testdata
export CONFIG_TESTDATA_PATH
cd ${BIND10_PATH}
diff --git a/src/lib/python/isc/notify/tests/notify_out_test.win32 b/src/lib/python/isc/notify/tests/notify_out_test.win32
index 61d64b6..e37632a 100755
--- a/src/lib/python/isc/notify/tests/notify_out_test.win32
+++ b/src/lib/python/isc/notify/tests/notify_out_test.win32
@@ -18,9 +18,9 @@
PYTHON_EXEC=${PYTHON_EXEC:-/usr/bin/python}
export PYTHON_EXEC
-NOTIFY_OUT_PATH=c:/cygwin/home/fdupont/bind10.trac826/src/lib/python/isc/notify/tests
+NOTIFY_OUT_PATH=$BIND10HOME/src/lib/python/isc/notify/tests
-PYTHONPATH=c:/cygwin/home/fdupont/bind10.trac826/src/lib/python
+PYTHONPATH=$BIND10HOME/src/lib/python
export PYTHONPATH
cd ${BIND10_PATH}
diff --git a/src/lib/server_common/tests/data_path.h.win32 b/src/lib/server_common/tests/data_path.h.win32
index ddc8c2c..06e2ace 100644
--- a/src/lib/server_common/tests/data_path.h.win32
+++ b/src/lib/server_common/tests/data_path.h.win32
@@ -12,5 +12,5 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#define TEST_DATA_PATH "c:/cygwin/home/fdupont/bind10.trac826/src/lib/server_common/tests/testdata"
-#define PLUGIN_DATA_PATH "c:/cygwin/home/fdupont/bind10.trac826/src/bin/cfgmgr/plugins"
+#define TEST_DATA_PATH BIND10HOME "/src/lib/server_common/tests/testdata"
+#define PLUGIN_DATA_PATH BIND10HOME "/src/bin/cfgmgr/plugins"
diff --git a/win32build/VS2010/b10-resolver/b10-resolver.vcxproj b/win32build/VS2010/b10-resolver/b10-resolver.vcxproj
index 6dfc21d..77a8ddb 100755
--- a/win32build/VS2010/b10-resolver/b10-resolver.vcxproj
+++ b/win32build/VS2010/b10-resolver/b10-resolver.vcxproj
@@ -52,7 +52,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;BIND10HOME="%BIND10HOME%";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\bin;..\..\..\src\bin\resolver;..\..\..\ext\asio;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
@@ -78,7 +78,7 @@ copy spec_config.h.pre.win32 spec_config.h
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;BIND10HOME="%BIND10HOME%";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\bin;..\..\..\src\bin\resolver;..\..\..\ext\asio;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
diff --git a/win32build/VS2010/b10-resolver_tests/b10-resolver_tests.vcxproj b/win32build/VS2010/b10-resolver_tests/b10-resolver_tests.vcxproj
index 421bef8..3510a17 100755
--- a/win32build/VS2010/b10-resolver_tests/b10-resolver_tests.vcxproj
+++ b/win32build/VS2010/b10-resolver_tests/b10-resolver_tests.vcxproj
@@ -52,7 +52,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;TEST_DATA_DIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/testutils/testdata/";TEST_DATA_BUILDDIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/testutils/testdata/";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;TEST_DATA_DIR="%BIND10HOME%/src/lib/testutils/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/testutils/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\bin;..\..\..\ext\asio;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
@@ -71,7 +71,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;TEST_DATA_DIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/testutils/testdata/";TEST_DATA_BUILDDIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/testutils/testdata/";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;TEST_DATA_DIR="%BIND10HOME%/src/lib/testutils/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/testutils/testdata";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\bin;..\..\..\ext\asio;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
diff --git a/win32build/VS2010/libbench_tests/libbench_tests.vcxproj b/win32build/VS2010/libbench_tests/libbench_tests.vcxproj
index bd6f074..46f2833 100755
--- a/win32build/VS2010/libbench_tests/libbench_tests.vcxproj
+++ b/win32build/VS2010/libbench_tests/libbench_tests.vcxproj
@@ -52,7 +52,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;TEST_DATA_DIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/bench/tests/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;TEST_DATA_DIR="%BIND10HOME%/src/lib/bench/tests/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
@@ -71,7 +71,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;TEST_DATA_DIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/bench/tests/testdata";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;TEST_DATA_DIR="%BIND10HOME%/src/lib/bench/tests/testdata";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
diff --git a/win32build/VS2010/libcache_tests/libcache_tests.vcxproj b/win32build/VS2010/libcache_tests/libcache_tests.vcxproj
index 83e5018..a644840 100755
--- a/win32build/VS2010/libcache_tests/libcache_tests.vcxproj
+++ b/win32build/VS2010/libcache_tests/libcache_tests.vcxproj
@@ -52,7 +52,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;TEST_DATA_SRCDIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/cache/tests/testdata";TEST_DATA_BUILDDIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/cache/tests/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;TEST_DATA_SRCDIR="%BIND10HOME%/src/lib/cache/tests/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/cache/tests/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CompileAs>CompileAsCpp</CompileAs>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\cache;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
@@ -71,7 +71,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;TEST_DATA_SRCDIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/cache/tests/testdata";TEST_DATA_BUILDDIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/cache/tests/testdata";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;TEST_DATA_SRCDIR="%BIND10HOME%/src/lib/cache/tests/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/cache/tests/testdata";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CompileAs>CompileAsCpp</CompileAs>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\cache;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
diff --git a/win32build/VS2010/libcfgclient_tests/libcfgclient_tests.vcxproj b/win32build/VS2010/libcfgclient_tests/libcfgclient_tests.vcxproj
index ae916e2..487280f 100755
--- a/win32build/VS2010/libcfgclient_tests/libcfgclient_tests.vcxproj
+++ b/win32build/VS2010/libcfgclient_tests/libcfgclient_tests.vcxproj
@@ -52,7 +52,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;TEST_DATA_PATH="c:/cygwin/home/fdupont/bind10.trac826/src/lib/config/tests/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;TEST_DATA_PATH="%BIND10HOME%/src/lib/config/tests/testdata";BIND10HOME="%BIND10HOME%";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
@@ -76,7 +76,7 @@ copy data_def_unittests_config.h.win32 data_def_unittests_config.h
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;TEST_DATA_PATH="c:/cygwin/home/fdupont/bind10.trac826/src/lib/config/tests/testdata";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;TEST_DATA_PATH="%BIND10HOME%/src/lib/config/tests/testdata";BIND10HOME="%BIND10HOME%";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
diff --git a/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj b/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj
index 02285c3..7448c65 100755
--- a/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj
+++ b/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj
@@ -52,7 +52,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;TEST_DATA_DIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/datasrc/tests/testdata";TEST_DATA_BUILDDIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/datasrc/tests/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;TEST_DATA_DIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\..\gtest\include;%BOOST%;C:\sqlite3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
@@ -71,7 +71,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;TEST_DATA_DIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/datasrc/tests/testdata";TEST_DATA_BUILDDIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/datasrc/tests/testdata";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;TEST_DATA_DIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\..\gtest\include;%BOOST%;C:\sqlite3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
diff --git a/win32build/VS2010/libdns++_tests/libdns++_tests.vcxproj b/win32build/VS2010/libdns++_tests/libdns++_tests.vcxproj
index 7c2f4ee..82b40ab 100755
--- a/win32build/VS2010/libdns++_tests/libdns++_tests.vcxproj
+++ b/win32build/VS2010/libdns++_tests/libdns++_tests.vcxproj
@@ -52,7 +52,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;TEST_DATA_SRCDIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/dns/tests/testdata";TEST_DATA_BUILDDIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/dns/tests/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;TEST_DATA_SRCDIR="%BIND10HOME%/src/lib/dns/tests/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/dns/tests/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\util;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
@@ -63,8 +63,118 @@
<AdditionalLibraryDirectories>..\libexceptions\Debug;..\libutil\Debug;..\libutil_unittests\Debug;..\libcryptolink\Debug;..\libdns++\Debug;..\..\..\..\gtest\md10\Debug;..\..\..\..\botan\md10\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PreBuildEvent>
- <Command>
- </Command>
+ <Command>cd ..\..\..\src\lib\dns\tests\testdata
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o edns_toWire1.wire edns_toWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o edns_toWire2.wire edns_toWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o edns_toWire3.wire edns_toWire3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o edns_toWire4.wire edns_toWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire10.wire message_fromWire10.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire11.wire message_fromWire11.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire12.wire message_fromWire12.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire13.wire message_fromWire13.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire14.wire message_fromWire14.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire15.wire message_fromWire15.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire16.wire message_fromWire16.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire17.wire message_fromWire17.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire18.wire message_fromWire18.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire19.wire message_fromWire19.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire20.wire message_fromWire20.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire21.wire message_fromWire21.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire22.wire message_fromWire22.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_toText1.wire message_toText1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_toText2.wire message_toText2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_toText3.wire message_toText3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_toWire2.wire message_toWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_toWire3.wire message_toWire3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_toWire4.wire message_toWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_toWire5.wire message_toWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o name_toWire5.wire name_toWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o name_toWire6.wire name_toWire6.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire1.wire rdata_afsdb_fromWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire2.wire rdata_afsdb_fromWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire3.wire rdata_afsdb_fromWire3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire4.wire rdata_afsdb_fromWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire5.wire rdata_afsdb_fromWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_toWire1.wire rdata_afsdb_toWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_toWire2.wire rdata_afsdb_toWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdatafields1.wire rdatafields1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdatafields2.wire rdatafields2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdatafields3.wire rdatafields3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdatafields4.wire rdatafields4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdatafields5.wire rdatafields5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdatafields6.wire rdatafields6.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire1.wire rdata_minfo_fromWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire2.wire rdata_minfo_fromWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire3.wire rdata_minfo_fromWire3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire4.wire rdata_minfo_fromWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire5.wire rdata_minfo_fromWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire6.wire rdata_minfo_fromWire6.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_toWire1.wire rdata_minfo_toWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_toWire2.wire rdata_minfo_toWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_toWireUncompressed1.wire rdata_minfo_toWireUncompressed1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_toWireUncompressed2.wire rdata_minfo_toWireUncompressed2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire10.wire rdata_nsec3_fromWire10.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire11.wire rdata_nsec3_fromWire11.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire12.wire rdata_nsec3_fromWire12.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire13.wire rdata_nsec3_fromWire13.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire14.wire rdata_nsec3_fromWire14.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire15.wire rdata_nsec3_fromWire15.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire1.wire rdata_nsec3_fromWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire2.wire rdata_nsec3_fromWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire4.wire rdata_nsec3_fromWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire5.wire rdata_nsec3_fromWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire6.wire rdata_nsec3_fromWire6.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire7.wire rdata_nsec3_fromWire7.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire8.wire rdata_nsec3_fromWire8.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire9.wire rdata_nsec3_fromWire9.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire10.wire rdata_nsec_fromWire10.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire4.wire rdata_nsec_fromWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire5.wire rdata_nsec_fromWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire6.wire rdata_nsec_fromWire6.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire7.wire rdata_nsec_fromWire7.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire8.wire rdata_nsec_fromWire8.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire9.wire rdata_nsec_fromWire9.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire1.wire rdata_rp_fromWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire2.wire rdata_rp_fromWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire3.wire rdata_rp_fromWire3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire4.wire rdata_rp_fromWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire5.wire rdata_rp_fromWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire6.wire rdata_rp_fromWire6.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_rp_toWire1.wire rdata_rp_toWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_rp_toWire2.wire rdata_rp_toWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_rrsig_fromWire2.wire rdata_rrsig_fromWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_soa_toWireUncompressed.wire rdata_soa_toWireUncompressed.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire1.wire rdata_tsig_fromWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire2.wire rdata_tsig_fromWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire3.wire rdata_tsig_fromWire3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire4.wire rdata_tsig_fromWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire5.wire rdata_tsig_fromWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire6.wire rdata_tsig_fromWire6.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire7.wire rdata_tsig_fromWire7.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire8.wire rdata_tsig_fromWire8.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire9.wire rdata_tsig_fromWire9.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire1.wire rdata_tsig_toWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire2.wire rdata_tsig_toWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire3.wire rdata_tsig_toWire3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire4.wire rdata_tsig_toWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire5.wire rdata_tsig_toWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_txt_fromWire2.wire rdata_txt_fromWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_txt_fromWire3.wire rdata_txt_fromWire3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_txt_fromWire4.wire rdata_txt_fromWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_txt_fromWire5.wire rdata_txt_fromWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsigrecord_toWire1.wire tsigrecord_toWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsigrecord_toWire2.wire tsigrecord_toWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify10.wire tsig_verify10.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify1.wire tsig_verify1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify2.wire tsig_verify2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify3.wire tsig_verify3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify4.wire tsig_verify4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify5.wire tsig_verify5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify6.wire tsig_verify6.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify7.wire tsig_verify7.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify8.wire tsig_verify8.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify9.wire tsig_verify9.spec
+</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -74,7 +184,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;TEST_DATA_SRCDIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/dns/tests/testdata";TEST_DATA_BUILDDIR="c:/cygwin/home/fdupont/bind10.trac826/src/lib/dns/tests/testdata";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;TEST_DATA_SRCDIR="%BIND10HOME%/src/lib/dns/tests/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/dns/tests/testdata";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\src\lib\util;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
@@ -87,8 +197,118 @@
<AdditionalLibraryDirectories>..\libexceptions\Release;..\libutil\Release;..\libutil_unittests\Release;..\libcryptolink\Release;..\libdns++\Release;..\..\..\..\gtest\md10\Release;..\..\..\..\botan\md10\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PreBuildEvent>
- <Command>
- </Command>
+ <Command>cd ..\..\..\src\lib\dns\tests\testdata
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o edns_toWire1.wire edns_toWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o edns_toWire2.wire edns_toWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o edns_toWire3.wire edns_toWire3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o edns_toWire4.wire edns_toWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire10.wire message_fromWire10.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire11.wire message_fromWire11.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire12.wire message_fromWire12.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire13.wire message_fromWire13.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire14.wire message_fromWire14.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire15.wire message_fromWire15.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire16.wire message_fromWire16.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire17.wire message_fromWire17.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire18.wire message_fromWire18.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire19.wire message_fromWire19.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire20.wire message_fromWire20.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire21.wire message_fromWire21.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_fromWire22.wire message_fromWire22.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_toText1.wire message_toText1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_toText2.wire message_toText2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_toText3.wire message_toText3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_toWire2.wire message_toWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_toWire3.wire message_toWire3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_toWire4.wire message_toWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o message_toWire5.wire message_toWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o name_toWire5.wire name_toWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o name_toWire6.wire name_toWire6.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire1.wire rdata_afsdb_fromWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire2.wire rdata_afsdb_fromWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire3.wire rdata_afsdb_fromWire3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire4.wire rdata_afsdb_fromWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_fromWire5.wire rdata_afsdb_fromWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_toWire1.wire rdata_afsdb_toWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_afsdb_toWire2.wire rdata_afsdb_toWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdatafields1.wire rdatafields1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdatafields2.wire rdatafields2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdatafields3.wire rdatafields3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdatafields4.wire rdatafields4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdatafields5.wire rdatafields5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdatafields6.wire rdatafields6.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire1.wire rdata_minfo_fromWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire2.wire rdata_minfo_fromWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire3.wire rdata_minfo_fromWire3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire4.wire rdata_minfo_fromWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire5.wire rdata_minfo_fromWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_fromWire6.wire rdata_minfo_fromWire6.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_toWire1.wire rdata_minfo_toWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_toWire2.wire rdata_minfo_toWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_toWireUncompressed1.wire rdata_minfo_toWireUncompressed1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_minfo_toWireUncompressed2.wire rdata_minfo_toWireUncompressed2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire10.wire rdata_nsec3_fromWire10.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire11.wire rdata_nsec3_fromWire11.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire12.wire rdata_nsec3_fromWire12.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire13.wire rdata_nsec3_fromWire13.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire14.wire rdata_nsec3_fromWire14.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire15.wire rdata_nsec3_fromWire15.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire1.wire rdata_nsec3_fromWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire2.wire rdata_nsec3_fromWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire4.wire rdata_nsec3_fromWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire5.wire rdata_nsec3_fromWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire6.wire rdata_nsec3_fromWire6.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire7.wire rdata_nsec3_fromWire7.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire8.wire rdata_nsec3_fromWire8.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec3_fromWire9.wire rdata_nsec3_fromWire9.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire10.wire rdata_nsec_fromWire10.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire4.wire rdata_nsec_fromWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire5.wire rdata_nsec_fromWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire6.wire rdata_nsec_fromWire6.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire7.wire rdata_nsec_fromWire7.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire8.wire rdata_nsec_fromWire8.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_nsec_fromWire9.wire rdata_nsec_fromWire9.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire1.wire rdata_rp_fromWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire2.wire rdata_rp_fromWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire3.wire rdata_rp_fromWire3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire4.wire rdata_rp_fromWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire5.wire rdata_rp_fromWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_rp_fromWire6.wire rdata_rp_fromWire6.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_rp_toWire1.wire rdata_rp_toWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_rp_toWire2.wire rdata_rp_toWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_rrsig_fromWire2.wire rdata_rrsig_fromWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_soa_toWireUncompressed.wire rdata_soa_toWireUncompressed.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire1.wire rdata_tsig_fromWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire2.wire rdata_tsig_fromWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire3.wire rdata_tsig_fromWire3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire4.wire rdata_tsig_fromWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire5.wire rdata_tsig_fromWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire6.wire rdata_tsig_fromWire6.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire7.wire rdata_tsig_fromWire7.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire8.wire rdata_tsig_fromWire8.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_fromWire9.wire rdata_tsig_fromWire9.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire1.wire rdata_tsig_toWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire2.wire rdata_tsig_toWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire3.wire rdata_tsig_toWire3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire4.wire rdata_tsig_toWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_tsig_toWire5.wire rdata_tsig_toWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_txt_fromWire2.wire rdata_txt_fromWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_txt_fromWire3.wire rdata_txt_fromWire3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_txt_fromWire4.wire rdata_txt_fromWire4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o rdata_txt_fromWire5.wire rdata_txt_fromWire5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsigrecord_toWire1.wire tsigrecord_toWire1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsigrecord_toWire2.wire tsigrecord_toWire2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify10.wire tsig_verify10.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify1.wire tsig_verify1.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify2.wire tsig_verify2.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify3.wire tsig_verify3.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify4.wire tsig_verify4.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify5.wire tsig_verify5.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify6.wire tsig_verify6.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify7.wire tsig_verify7.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify8.wire tsig_verify8.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o tsig_verify9.wire tsig_verify9.spec
+</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/win32build/VS2010/liblog_tests/liblog_tests.vcxproj b/win32build/VS2010/liblog_tests/liblog_tests.vcxproj
index 22a949d..920b8e9 100755
--- a/win32build/VS2010/liblog_tests/liblog_tests.vcxproj
+++ b/win32build/VS2010/liblog_tests/liblog_tests.vcxproj
@@ -72,7 +72,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;BIND10HOME="%BIND10HOME%";_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\log;..\..\..\..\log4cplus\include;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
@@ -97,7 +97,7 @@ copy tempdir.h.win32 tempdir.h
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;BIND10HOME="%BIND10HOME%";NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\log;..\..\..\..\log4cplus\include;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
diff --git a/win32build/VS2010/libserver_common_tests/libserver_common_tests.vcxproj b/win32build/VS2010/libserver_common_tests/libserver_common_tests.vcxproj
index 84f5591..ecd373d 100755
--- a/win32build/VS2010/libserver_common_tests/libserver_common_tests.vcxproj
+++ b/win32build/VS2010/libserver_common_tests/libserver_common_tests.vcxproj
@@ -52,7 +52,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;BIND10HOME="%BIND10HOME%";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\server_common;..\..\..\ext\asio;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
@@ -76,7 +76,7 @@ copy data_path.h.win32 data_path.h
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;BIND10HOME="%BIND10HOME%";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\server_common;..\..\..\ext\asio;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
diff --git a/win32build/VS2010/libtestutils/libtestutils.vcxproj b/win32build/VS2010/libtestutils/libtestutils.vcxproj
index dbfe691..309d5ce 100755
--- a/win32build/VS2010/libtestutils/libtestutils.vcxproj
+++ b/win32build/VS2010/libtestutils/libtestutils.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">
@@ -66,6 +66,20 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
+ <PreBuildEvent>
+ <Command>cd ..\..\..\src\lib\testutils\testdata
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o badExampleQuery_fromWire.wire badExampleQuery_fromWire.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o examplequery_fromWire.wire examplequery_fromWire.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o iquery_fromWire.wire iquery_fromWire.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o iquery_response_fromWire.wire iquery_response_fromWire.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o iqueryresponse_fromWire.wire iqueryresponse_fromWire.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o multiquestion_fromWire.wire multiquestion_fromWire.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o queryBadEDNS_fromWire.wire queryBadEDNS_fromWire.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o shortanswer_fromWire.wire shortanswer_fromWire.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o simplequery_fromWire.wire simplequery_fromWire.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o simpleresponse_fromWire.wire simpleresponse_fromWire.spec
+</Command>
+ </PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -84,6 +98,20 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
+ <PreBuildEvent>
+ <Command>cd ..\..\..\src\lib\testutils\testdata
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o badExampleQuery_fromWire.wire badExampleQuery_fromWire.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o examplequery_fromWire.wire examplequery_fromWire.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o iquery_fromWire.wire iquery_fromWire.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o iquery_response_fromWire.wire iquery_response_fromWire.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o iqueryresponse_fromWire.wire iqueryresponse_fromWire.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o multiquestion_fromWire.wire multiquestion_fromWire.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o queryBadEDNS_fromWire.wire queryBadEDNS_fromWire.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o shortanswer_fromWire.wire shortanswer_fromWire.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o simplequery_fromWire.wire simplequery_fromWire.spec
+python %BIND10HOME%/src/lib/util/python/gen_wiredata.py -o simpleresponse_fromWire.wire simpleresponse_fromWire.spec
+</Command>
+ </PreBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/win32build/VS2010/libutil/libutil.vcxproj b/win32build/VS2010/libutil/libutil.vcxproj
index 5246763..5858f2f 100755
--- a/win32build/VS2010/libutil/libutil.vcxproj
+++ b/win32build/VS2010/libutil/libutil.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">
@@ -83,6 +83,12 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
+ <PreBuildEvent>
+ <Command>cd ..\..\..\src\lib\util\python
+copy gen_wiredata.py.win32 gen_wiredata.py
+copy mkpywrapper.py.win32 mkpywrapper.py
+</Command>
+ </PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -101,6 +107,12 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
+ <PreBuildEvent>
+ <Command>cd ..\..\..\src\lib\util\python
+copy gen_wiredata.py.win32 gen_wiredata.py
+copy mkpywrapper.py.win32 mkpywrapper.py
+</Command>
+ </PreBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
More information about the bind10-changes
mailing list