fixed all tests on Windows, still issues with static libcrawl

6 files changed, 25 insertions, 11 deletions

diff --git a/src/libcrawler/Makefile.W32 b/src/libcrawler/Makefile.W32
index 9a734ce..7408a4f 100755
--- a/src/libcrawler/Makefile.W32
+++ b/src/libcrawler/Makefile.W32
@@ -20,24 +20,37 @@ INCLUDE_LIBS = \
 	$(TOPDIR)\src\logger\logger.lib
 
 CPP_OBJS = \
+	win32\errormsg.obj \
+	win32\stringutils.obj \
+	URL.obj \
+	MIMEType.obj \
+	SpoolRewindInputStream.obj
+
+DYNAMIC_CPP_OBJS = \
 	win32\errormsg.dllobj \
 	win32\stringutils.dllobj \
 	URL.dllobj \
 	MIMEType.dllobj \
 	SpoolRewindInputStream.dllobj
+
+STATIC_LIB = \
+	crawlerstatic.lib
 	
 DYNAMIC_LIB = \
 	crawler.dll
 
 !INCLUDE $(TOPDIR)\makefiles\nmake\sub.mk
 
-$(DYNAMIC_LIB): $(CPP_OBJS)
+$(DYNAMIC_LIB): $(DYNAMIC_CPP_OBJS)
 	$(LINK) /nologo /dll /out:$@ $(LDFLAGS) $(LIBS) $?
 
-local_all: $(DYNAMIC_LIB)
+$(STATIC_LIB): $(CPP_OBJS)
+	$(LINK) /lib /nologo /out:$@ $(STATIC_LDFLAGS) $(LIBS) $?
+
+local_all: $(DYNAMIC_LIB) $(STATIC_LIB)
 
 local_clean:
-	@-erase $(DYNAMIC_LIB) 2>NUL
+	@-erase $(DYNAMIC_LIB) $(STATIC_LIB) 2>NUL
 	@-erase win32\*.obj win32\*.dllobj 2>NUL
 
 local_distclean:
diff --git a/src/modules/processor/htmllinkextract/Makefile.W32 b/src/modules/processor/htmllinkextract/Makefile.W32
index 1a53fec..1a34965 100755
--- a/src/modules/processor/htmllinkextract/Makefile.W32
+++ b/src/modules/processor/htmllinkextract/Makefile.W32
@@ -20,7 +20,8 @@ INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
 	$(TOPDIR)\streamhtmlparser\streamhtmlparser.lib \
-	$(TOPDIR)\src\libcrawler\crawler.lib
+	$(TOPDIR)\src\libcrawler\crawler.lib \
+	$(TOPDIR)\src\logger\logger.lib
 
 DYNAMIC_MODULE = \
 	mod_processor_htmllinkextract.dll
diff --git a/src/modules/urlnormalizer/simpleurl/Makefile.W32 b/src/modules/urlnormalizer/simpleurl/Makefile.W32
index 2a26e9c..641b656 100755
--- a/src/modules/urlnormalizer/simpleurl/Makefile.W32
+++ b/src/modules/urlnormalizer/simpleurl/Makefile.W32
@@ -23,7 +23,7 @@ DYNAMIC_MODULE = \
 	mod_urlnormalizer_simple.dll
 
 STATIC_LIB = \
-	simpleurlnormalizer.lib
+	simpleurlnormalizerstatic.lib
 
 CPP_OBJS = \
 	SimpleURLNormalizer.obj
@@ -34,7 +34,7 @@ SHARED_CPP_OBJS = \
 !INCLUDE $(TOPDIR)\makefiles\nmake\sub.mk
 
 $(STATIC_LIB): $(CPP_OBJS)
-	$(LINK) /lib /nologo /out:$@ $(STATIC_LDFLAGS) $?
+	$(LINK) /lib /nologo /out:$@ $(STATIC_LDFLAGS) $(LIBS) $?
 
 $(DYNAMIC_MODULE): $(SHARED_CPP_OBJS)
 	$(LINK) /dll /nologo /out:$@ $(LDFLAGS) $(LIBS) $?
diff --git a/tests/fetcher/Makefile.W32 b/tests/fetcher/Makefile.W32
index d02324b..fb33e07 100755
--- a/tests/fetcher/Makefile.W32
+++ b/tests/fetcher/Makefile.W32
@@ -20,10 +20,10 @@ INCLUDE_DIRS = \
 INCLUDE_LDFLAGS = \
 
 INCLUDE_LIBS = \
-	$(TOPDIR)\src\libcrawler\crawler.lib \
 	$(TOPDIR)\src\modules\fetcher\winhttp\winhttpfetcher.lib \
 	WinHttp.lib \
-	$(TOPDIR)\src\modules\urlnormalizer\simpleurl\simpleurlnormalizer.lib
+	$(TOPDIR)\src\modules\urlnormalizer\simpleurl\simpleurlnormalizerstatic.lib \
+	$(TOPDIR)\src\libcrawler\crawlerstatic.lib
 
 TEST_CPP_BINS = \
 	test1.exe
diff --git a/tests/logger/exec_test.cmd b/tests/logger/exec_test.cmd
index 1203382..123b666 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 .

+copy ..\..\src\logger\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/url/exec_test.cmd b/tests/url/exec_test.cmd
index 2809f46..e01c81e 100755
--- a/tests/url/exec_test.cmd
+++ b/tests/url/exec_test.cmd
@@ -7,8 +7,8 @@ shift
 set TITLE=%1

 shift

 

-copy ..\..\src\libcrawler\crawler.dll . >NULL

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

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

+copy ..\..\src\logger\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