diff options
author | Andreas Baumann <abaumann@yahoo.com> | 2012-08-15 18:32:10 +0200 |
---|---|---|
committer | Andreas Baumann <abaumann@yahoo.com> | 2012-08-15 18:32:10 +0200 |
commit | 8cbb2941b31878f7b0cccc3763f8df0d41554212 (patch) | |
tree | e0f9c9fe22d9ab45f051a1223a50fb25592a8df7 | |
parent | b3ec0b60c5b4911d048db84cec92fdee5ee7b9a5 (diff) | |
download | crawler-8cbb2941b31878f7b0cccc3763f8df0d41554212.tar.gz crawler-8cbb2941b31878f7b0cccc3763f8df0d41554212.tar.bz2 |
renamed
33 files changed, 38 insertions, 36 deletions
@@ -43,6 +43,8 @@ http://www.isotton.com/devel/docs/C++-dlopen-mini-HOWTO/C++-dlopen-mini-HOWTO.ht http://www.linuxjournal.com/article/3687?page=0,1 http://www.artima.com/cppsource/subscription_problem.html http://kristiannielsen.livejournal.com/11783.html +http://www.yolinux.com/TUTORIALS/LibraryArchives-StaticAndDynamic.html: +for singleton/issues on Windows and how to solve them in an elegant way Meta Programming in C++ diff --git a/docs/smallwolf.png b/docs/smallwolf.png Binary files differdeleted file mode 100644 index 24114cc..0000000 --- a/docs/smallwolf.png +++ /dev/null diff --git a/src/GNUmakefile b/src/GNUmakefile index f30d750..0fad567 100755 --- a/src/GNUmakefile +++ b/src/GNUmakefile @@ -31,10 +31,10 @@ CPP_OBJS = \ $(LOCAL_STATIC_LIB_OBJS) LOCAL_STATIC_LIB = \ - libcrawlingwolf.a + libcrawler.a CPP_BINS = \ - crawlingwolf$(EXE) + crawler$(EXE) -include $(TOPDIR)/makefiles/gmake/sub.mk @@ -52,10 +52,10 @@ local_distclean: local_install: $(INSTALL) -d -m 0755 $(DESTDIR)$(bindir) - $(INSTALL) -m 0775 crawlingwolf$(EXE) $(DESTDIR)$(bindir) + $(INSTALL) -m 0775 crawler$(EXE) $(DESTDIR)$(bindir) local_uninstall: - @-rm -f $(DESTDIR)$(bindir)/crawlingwolf + @-rm -f $(DESTDIR)$(bindir)/crawler @-rmdir $(DESTDIR)$(bindir) local_test: diff --git a/src/Makefile.W32 b/src/Makefile.W32 index 3e1c8c8..6231f11 100755 --- a/src/Makefile.W32 +++ b/src/Makefile.W32 @@ -21,19 +21,19 @@ LOCAL_STATIC_LIB_OBJS = \ MIMEType.obj LOCAL_STATIC_LIB = \ - crawlingwolf.lib + crawler.lib CPP_OBJS = \ $(LOCAL_STATIC_LIB_OBJS) CPP_BINS = \ - crawlingwolf.exe + crawler.exe all: $(CPP_OBJS) $(CPP_BINS) !INCLUDE $(TOPDIR)\makefiles\nmake\sub.mk -crawlingwolf.exe: crawlingwolf.obj $(CPP_OBJS) +crawler.exe: crawler.obj $(CPP_OBJS) $(LOCAL_STATIC_LIB): $(LOCAL_STATIC_LIB_OBJS) $(LINK) /lib /nologo /out:$@ $(STATIC_LDFLAGS) $? @@ -54,4 +54,4 @@ copy_prereq: @-copy "$(ICU_DIR)\bin\icudt49.dll" . >NUL run: copy_prereq - @-crawlingwolf.exe + @-crawler.exe diff --git a/src/crawlingwolf.cpp b/src/crawler.cpp index 08f3eec..08f3eec 100755 --- a/src/crawlingwolf.cpp +++ b/src/crawler.cpp diff --git a/src/modules/deduper/null/GNUmakefile b/src/modules/deduper/null/GNUmakefile index ae9663f..b7c1686 100644 --- a/src/modules/deduper/null/GNUmakefile +++ b/src/modules/deduper/null/GNUmakefile @@ -12,7 +12,7 @@ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)/src/libcrawlingwolf.a + $(TOPDIR)/src/libcrawler.a DYNAMIC_MODULE = \ mod_deduper_null.so diff --git a/src/modules/deduper/null/Makefile.W32 b/src/modules/deduper/null/Makefile.W32 index 685e9e6..dc033ce 100755 --- a/src/modules/deduper/null/Makefile.W32 +++ b/src/modules/deduper/null/Makefile.W32 @@ -14,7 +14,7 @@ INCLUDE_DIRS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)\src\crawlingwolf.lib + $(TOPDIR)\src\crawler.lib DYNAMIC_MODULE = \ mod_deduper_null.dll diff --git a/src/modules/fetcher/file/GNUmakefile b/src/modules/fetcher/file/GNUmakefile index c143110..5432203 100644 --- a/src/modules/fetcher/file/GNUmakefile +++ b/src/modules/fetcher/file/GNUmakefile @@ -12,7 +12,7 @@ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)/src/libcrawlingwolf.a + $(TOPDIR)/src/libcrawler.a DYNAMIC_MODULE = \ mod_fetcher_file.so diff --git a/src/modules/fetcher/file/Makefile.W32 b/src/modules/fetcher/file/Makefile.W32 index 928cad0..ddc942d 100755 --- a/src/modules/fetcher/file/Makefile.W32 +++ b/src/modules/fetcher/file/Makefile.W32 @@ -14,7 +14,7 @@ INCLUDE_DIRS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)\src\crawlingwolf.lib + $(TOPDIR)\src\crawler.lib DYNAMIC_MODULE = \ mod_fetcher_file.dll diff --git a/src/modules/fetcher/libfetch/GNUmakefile b/src/modules/fetcher/libfetch/GNUmakefile index 707a4c0..84635ee 100644 --- a/src/modules/fetcher/libfetch/GNUmakefile +++ b/src/modules/fetcher/libfetch/GNUmakefile @@ -13,7 +13,7 @@ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)/src/libcrawlingwolf.a \ + $(TOPDIR)/src/libcrawler.a \ $(TOPDIR)/libfetch/libfetch.a DYNAMIC_MODULE = \ diff --git a/src/modules/fetcher/winhttp/Makefile.W32 b/src/modules/fetcher/winhttp/Makefile.W32 index b006c34..5ef2a42 100755 --- a/src/modules/fetcher/winhttp/Makefile.W32 +++ b/src/modules/fetcher/winhttp/Makefile.W32 @@ -14,7 +14,7 @@ INCLUDE_DIRS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)\src\crawlingwolf.lib \ + $(TOPDIR)\src\crawler.lib \ WinHttp.lib DYNAMIC_MODULE = \ diff --git a/src/modules/frontier/memory/GNUmakefile b/src/modules/frontier/memory/GNUmakefile index 0d81f07..effa93d 100644 --- a/src/modules/frontier/memory/GNUmakefile +++ b/src/modules/frontier/memory/GNUmakefile @@ -12,7 +12,7 @@ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)/src/libcrawlingwolf.a + $(TOPDIR)/src/libcrawler.a DYNAMIC_MODULE = \ mod_frontier_memory.so diff --git a/src/modules/frontier/memory/Makefile.W32 b/src/modules/frontier/memory/Makefile.W32 index 4337655..903be8c 100755 --- a/src/modules/frontier/memory/Makefile.W32 +++ b/src/modules/frontier/memory/Makefile.W32 @@ -14,7 +14,7 @@ INCLUDE_DIRS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)\src\crawlingwolf.lib + $(TOPDIR)\src\crawler.lib DYNAMIC_MODULE = \ mod_frontier_memory.dll diff --git a/src/modules/processor/htmllinkextract/GNUmakefile b/src/modules/processor/htmllinkextract/GNUmakefile index b32a980..87ef459 100644 --- a/src/modules/processor/htmllinkextract/GNUmakefile +++ b/src/modules/processor/htmllinkextract/GNUmakefile @@ -13,7 +13,7 @@ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)/src/libcrawlingwolf.a \ + $(TOPDIR)/src/libcrawler.a \ $(TOPDIR)/streamhtmlparser/libstreamhtmlparser.a DYNAMIC_MODULE = \ diff --git a/src/modules/processor/htmllinkextract/Makefile.W32 b/src/modules/processor/htmllinkextract/Makefile.W32 index ff84dea..ea2cede 100755 --- a/src/modules/processor/htmllinkextract/Makefile.W32 +++ b/src/modules/processor/htmllinkextract/Makefile.W32 @@ -16,7 +16,7 @@ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ $(TOPDIR)\streamhtmlparser\streamhtmlparser.lib \ - $(TOPDIR)\src\crawlingwolf.lib + $(TOPDIR)\src\crawler.lib DYNAMIC_MODULE = \ mod_processor_htmllinkextract.dll diff --git a/src/modules/typedetect/libmagic/GNUmakefile b/src/modules/typedetect/libmagic/GNUmakefile index c88c4dd..7ac0357 100644 --- a/src/modules/typedetect/libmagic/GNUmakefile +++ b/src/modules/typedetect/libmagic/GNUmakefile @@ -12,7 +12,7 @@ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)/src/libcrawlingwolf.a \ + $(TOPDIR)/src/libcrawler.a \ -lmagic DYNAMIC_MODULE = \ diff --git a/src/modules/urlfilter/chain/GNUmakefile b/src/modules/urlfilter/chain/GNUmakefile index 5b7c827..2ed1c27 100644 --- a/src/modules/urlfilter/chain/GNUmakefile +++ b/src/modules/urlfilter/chain/GNUmakefile @@ -12,7 +12,7 @@ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)/src/libcrawlingwolf.a + $(TOPDIR)/src/libcrawler.a DYNAMIC_MODULE = \ mod_urlfilter_chain.so diff --git a/src/modules/urlfilter/chain/Makefile.W32 b/src/modules/urlfilter/chain/Makefile.W32 index 2358227..ec7e496 100755 --- a/src/modules/urlfilter/chain/Makefile.W32 +++ b/src/modules/urlfilter/chain/Makefile.W32 @@ -14,7 +14,7 @@ INCLUDE_DIRS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)\src\crawlingwolf.lib + $(TOPDIR)\src\crawler.lib DYNAMIC_MODULE = \ mod_urlfilter_chain.dll diff --git a/src/modules/urlfilter/host/GNUmakefile b/src/modules/urlfilter/host/GNUmakefile index beff685..8477730 100644 --- a/src/modules/urlfilter/host/GNUmakefile +++ b/src/modules/urlfilter/host/GNUmakefile @@ -12,7 +12,7 @@ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)/src/libcrawlingwolf.a + $(TOPDIR)/src/libcrawler.a DYNAMIC_MODULE = \ mod_urlfilter_host.so diff --git a/src/modules/urlfilter/host/Makefile.W32 b/src/modules/urlfilter/host/Makefile.W32 index 4f1412b..8c5cfdb 100755 --- a/src/modules/urlfilter/host/Makefile.W32 +++ b/src/modules/urlfilter/host/Makefile.W32 @@ -14,7 +14,7 @@ INCLUDE_DIRS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)\src\crawlingwolf.lib + $(TOPDIR)\src\crawler.lib DYNAMIC_MODULE = \ mod_urlfilter_host.dll diff --git a/src/modules/urlfilter/protocol/GNUmakefile b/src/modules/urlfilter/protocol/GNUmakefile index 52027bc..897a71b 100644 --- a/src/modules/urlfilter/protocol/GNUmakefile +++ b/src/modules/urlfilter/protocol/GNUmakefile @@ -12,7 +12,7 @@ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)/src/libcrawlingwolf.a + $(TOPDIR)/src/libcrawler.a DYNAMIC_MODULE = \ mod_urlfilter_protocol.so diff --git a/src/modules/urlfilter/protocol/Makefile.W32 b/src/modules/urlfilter/protocol/Makefile.W32 index 91b8302..ff1b497 100755 --- a/src/modules/urlfilter/protocol/Makefile.W32 +++ b/src/modules/urlfilter/protocol/Makefile.W32 @@ -14,7 +14,7 @@ INCLUDE_DIRS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)\src\crawlingwolf.lib + $(TOPDIR)\src\crawler.lib DYNAMIC_MODULE = \ mod_urlfilter_protocol.dll diff --git a/src/modules/urlnormalizer/googleurl/GNUmakefile b/src/modules/urlnormalizer/googleurl/GNUmakefile index 9b86a52..14cd2c1 100644 --- a/src/modules/urlnormalizer/googleurl/GNUmakefile +++ b/src/modules/urlnormalizer/googleurl/GNUmakefile @@ -14,7 +14,7 @@ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ $(TOPDIR)/googleurl/libgoogleurl.a \ - $(TOPDIR)/src/libcrawlingwolf.a \ + $(TOPDIR)/src/libcrawler.a \ -licui18n -licuuc DYNAMIC_MODULE = \ diff --git a/src/modules/urlnormalizer/googleurl/Makefile.W32 b/src/modules/urlnormalizer/googleurl/Makefile.W32 index d56c568..ac94a5c 100755 --- a/src/modules/urlnormalizer/googleurl/Makefile.W32 +++ b/src/modules/urlnormalizer/googleurl/Makefile.W32 @@ -16,7 +16,7 @@ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ $(TOPDIR)\googleurl\googleurl.lib \ - $(TOPDIR)\src\crawlingwolf.lib \ + $(TOPDIR)\src\crawler.lib \ "$(ICU_DIR)\lib\icuuc.lib" DYNAMIC_MODULE = \ diff --git a/src/modules/urlnormalizer/simpleurl/GNUmakefile b/src/modules/urlnormalizer/simpleurl/GNUmakefile index d91d94d..c388c43 100644 --- a/src/modules/urlnormalizer/simpleurl/GNUmakefile +++ b/src/modules/urlnormalizer/simpleurl/GNUmakefile @@ -12,7 +12,7 @@ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)/src/libcrawlingwolf.a + $(TOPDIR)/src/libcrawler.a DYNAMIC_MODULE = \ mod_urlnormalizer_simple.so diff --git a/src/modules/urlnormalizer/simpleurl/Makefile.W32 b/src/modules/urlnormalizer/simpleurl/Makefile.W32 index b0af459..5dc0dba 100755 --- a/src/modules/urlnormalizer/simpleurl/Makefile.W32 +++ b/src/modules/urlnormalizer/simpleurl/Makefile.W32 @@ -14,7 +14,7 @@ INCLUDE_DIRS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)\src\crawlingwolf.lib + $(TOPDIR)\src\crawler.lib DYNAMIC_MODULE = \ mod_urlnormalizer_simple.dll diff --git a/src/modules/urlseen/memory/GNUmakefile b/src/modules/urlseen/memory/GNUmakefile index 73395f8..440b498 100644 --- a/src/modules/urlseen/memory/GNUmakefile +++ b/src/modules/urlseen/memory/GNUmakefile @@ -12,7 +12,7 @@ INCLUDE_CXXFLAGS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)/src/libcrawlingwolf.a + $(TOPDIR)/src/libcrawler.a DYNAMIC_MODULE = \ mod_urlseen_memory.so diff --git a/src/modules/urlseen/memory/Makefile.W32 b/src/modules/urlseen/memory/Makefile.W32 index c5d4609..6cd075e 100755 --- a/src/modules/urlseen/memory/Makefile.W32 +++ b/src/modules/urlseen/memory/Makefile.W32 @@ -14,7 +14,7 @@ INCLUDE_DIRS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)\src\crawlingwolf.lib + $(TOPDIR)\src\crawler.lib DYNAMIC_MODULE = \ mod_urlseen_memory.dll diff --git a/tests/fetcher/GNUmakefile b/tests/fetcher/GNUmakefile index f6e0d25..b26f916 100644 --- a/tests/fetcher/GNUmakefile +++ b/tests/fetcher/GNUmakefile @@ -15,7 +15,7 @@ INCLUDE_LDFLAGS = INCLUDE_LIBS = \ $(TOPDIR)/src/modules/urlnormalizer/simpleurl/libsimpleurlnormalizer.a \ $(TOPDIR)/src/modules/fetcher/libfetch/liblibfetchfetcher.a \ - $(TOPDIR)/src/libcrawlingwolf.a \ + $(TOPDIR)/src/libcrawler.a \ $(TOPDIR)/libfetch/libfetch.a # openssl diff --git a/tests/fetcher/Makefile.W32 b/tests/fetcher/Makefile.W32 index c472a8a..9a94a75 100755 --- a/tests/fetcher/Makefile.W32 +++ b/tests/fetcher/Makefile.W32 @@ -17,7 +17,7 @@ INCLUDE_DIRS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)\src\crawlingwolf.lib \ + $(TOPDIR)\src\crawler.lib \ $(TOPDIR)\src\modules\fetcher\winhttp\winhttpfetcher.lib \ $(TOPDIR)\src\modules\urlnormalizer\simpleurl\simpleurlnormalizer.lib diff --git a/tests/typedetect/GNUmakefile b/tests/typedetect/GNUmakefile index a3a8475..251a2a2 100644 --- a/tests/typedetect/GNUmakefile +++ b/tests/typedetect/GNUmakefile @@ -21,7 +21,7 @@ INCLUDE_LIBS = \ $(TOPDIR)/src/modules/fetcher/libfetch/liblibfetchfetcher.a \ $(TOPDIR)/libfetch/libfetch.a \ $(TOPDIR)/src/modules/urlnormalizer/simpleurl/libsimpleurlnormalizer.a \ - $(TOPDIR)/src/libcrawlingwolf.a + $(TOPDIR)/src/libcrawler.a # openssl ifeq ($(WITH_SSL),1) diff --git a/tests/url/GNUmakefile b/tests/url/GNUmakefile index 69d882d..38de19c 100644 --- a/tests/url/GNUmakefile +++ b/tests/url/GNUmakefile @@ -13,7 +13,7 @@ INCLUDE_DIRS = \ INCLUDE_LDFLAGS = INCLUDE_LIBS = \ - $(TOPDIR)/src/libcrawlingwolf.a \ + $(TOPDIR)/src/libcrawler.a \ $(TOPDIR)/src/modules/urlnormalizer/simpleurl/libsimpleurlnormalizer.a \ $(TOPDIR)/src/modules/urlnormalizer/googleurl/libgoogleurlnormalizer.a \ $(TOPDIR)/googleurl/libgoogleurl.a \ diff --git a/tests/url/Makefile.W32 b/tests/url/Makefile.W32 index 27c140e..806f3f2 100755 --- a/tests/url/Makefile.W32 +++ b/tests/url/Makefile.W32 @@ -17,7 +17,7 @@ INCLUDE_DIRS = \ INCLUDE_LDFLAGS = \ INCLUDE_LIBS = \ - $(TOPDIR)\src\crawlingwolf.lib \ + $(TOPDIR)\src\crawler.lib \ $(TOPDIR)\src\modules\urlnormalizer\simpleurl\simpleurlnormalizer.lib \ $(TOPDIR)\src\modules\urlnormalizer\googleurl\googleurlnormalizer.lib \ $(TOPDIR)\googleurl\googleurl.lib \ |