libutil move and liblogger rename on Windows

9 files changed, 18 insertions, 6 deletions

diff --git a/tests/fetcher/Makefile.W32 b/tests/fetcher/Makefile.W32
index fb33e07..b4e5128 100755
--- a/tests/fetcher/Makefile.W32
+++ b/tests/fetcher/Makefile.W32
@@ -23,7 +23,8 @@ INCLUDE_LIBS = \
 	$(TOPDIR)\src\modules\fetcher\winhttp\winhttpfetcher.lib \
 	WinHttp.lib \
 	$(TOPDIR)\src\modules\urlnormalizer\simpleurl\simpleurlnormalizerstatic.lib \
-	$(TOPDIR)\src\libcrawler\crawlerstatic.lib
+	$(TOPDIR)\src\libcrawler\crawlerstatic.lib \
+	$(TOPDIR)\src\libutil\util.lib
 
 TEST_CPP_BINS = \
 	test1.exe
diff --git a/tests/fetcher/run.cmd b/tests/fetcher/run.cmd
new file mode 100644
index 0000000..5b6b4b5
--- /dev/null
+++ b/tests/fetcher/run.cmd
@@ -0,0 +1,7 @@
+@echo off
+
+copy ..\..\src\libcrawler\crawler.dll . >NUL
+copy ..\..\src\liblogger\logger.dll . >NUL
+copy ..\..\src\libutil\util.dll . >NUL
+test1 %1 %2
+
diff --git a/tests/logger/Makefile.W32 b/tests/logger/Makefile.W32
index 783add0..2ae78cc 100755
--- a/tests/logger/Makefile.W32
+++ b/tests/logger/Makefile.W32
@@ -17,7 +17,7 @@ INCLUDE_DIRS = \
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
-	$(TOPDIR)\src\logger\logger.lib \
+	$(TOPDIR)\src\liblogger\logger.lib \
 	Ws2_32.lib
 
 TEST_CPP_BINS = \
diff --git a/tests/logger/exec_test.cmd b/tests/logger/exec_test.cmd
index 123b666..7efe5bc 100755
--- a/tests/logger/exec_test.cmd
+++ b/tests/logger/exec_test.cmd
@@ -3,7 +3,7 @@
 set BINARY=%1

 set TITLE=%2

 

-copy ..\..\src\logger\logger.dll . >NUL

+copy ..\..\src\liblogger\logger.dll . >NUL

 %BINARY% >%BINARY%.OUT 2>%BINARY%.ERR

 ..\..\utils\win32\dos2unix <%BINARY%.OUT >%BINARY%.RES

 ..\..\utils\win32\dos2unix <%BINARY%.ERR >%BINARY%.RES

diff --git a/tests/modules/Makefile.W32 b/tests/modules/Makefile.W32
index 405166f..ea86b36 100755
--- a/tests/modules/Makefile.W32
+++ b/tests/modules/Makefile.W32
@@ -18,6 +18,7 @@ INCLUDE_DIRS = \
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
+	$(TOPDIR)\src\libutil\util.lib \
 	$(TOPDIR)\src\libcrawler\crawler.lib \
 	$(TOPDIR)\tests\modules\libcommon\common.lib
 
diff --git a/tests/modules/exec_test.cmd b/tests/modules/exec_test.cmd
index 511c14a..d2763e9 100755
--- a/tests/modules/exec_test.cmd
+++ b/tests/modules/exec_test.cmd
@@ -5,7 +5,8 @@ set TITLE=%2
 

 copy libcommon\common.dll . >NUL

 copy ..\..\src\libcrawler\crawler.dll . >NUL

-copy ..\..\src\logger\logger.dll . >NUL

+copy ..\..\src\liblogger\logger.dll . >NUL

+copy ..\..\src\libutil\util.dll . >NUL

 %BINARY% >%BINARY%.OUT 2>%BINARY%.ERR

 ..\..\utils\win32\dos2unix <%BINARY%.OUT >%BINARY%.RES

 erase /q %BINARY%.OUT

diff --git a/tests/modules/testmod3/Makefile.W32 b/tests/modules/testmod3/Makefile.W32
index d4ead3c..44d289d 100755
--- a/tests/modules/testmod3/Makefile.W32
+++ b/tests/modules/testmod3/Makefile.W32
@@ -19,7 +19,7 @@ INCLUDE_DIRS = \
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
-	$(TOPDIR)\src\libcrawler\crawler.lib \
+	$(TOPDIR)\src\libutil\util.lib \
 	..\libcommon\common.lib
 
 DYNAMIC_MODULE = \
diff --git a/tests/url/Makefile.W32 b/tests/url/Makefile.W32
index ff48b7f..d71853c 100755
--- a/tests/url/Makefile.W32
+++ b/tests/url/Makefile.W32
@@ -20,6 +20,7 @@ INCLUDE_DIRS = \
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
+	$(TOPDIR)\src\libutil\util.lib \
 	$(TOPDIR)\src\libcrawler\crawler.lib \
 	$(TOPDIR)\src\modules\urlnormalizer\simpleurl\simpleurlnormalizer.lib \
 	$(TOPDIR)\src\modules\urlnormalizer\googleurl\googleurlnormalizer.lib \
diff --git a/tests/url/exec_test.cmd b/tests/url/exec_test.cmd
index e01c81e..79af578 100755
--- a/tests/url/exec_test.cmd
+++ b/tests/url/exec_test.cmd
@@ -7,8 +7,9 @@ shift
 set TITLE=%1

 shift

 

+copy ..\..\src\libutil\util.dll . >NUL

 copy ..\..\src\libcrawler\crawler.dll . >NUL

-copy ..\..\src\logger\logger.dll . >NUL

+copy ..\..\src\liblogger\logger.dll . >NUL

 %BINARY% %1 %2 %3 %4 >%ID%.OUT 2>%ID%.ERR

 type %ID%.ERR >> %ID%.OUT

 ..\..\utils\win32\dos2unix <%ID%.OUT >%ID%.RES