X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=4c6755ec9a29a3d430dd1f735cdf25fb896774e6;hb=ddc156360c0c46ef669accde05fea1106cc6b244;hp=378db8e86c458218f4eed90d3f3bcaaf04caccd7;hpb=bdc16dc527223fb56dd0e9aac566481968db9ec6;p=metaproxy-moved-to-github.git diff --git a/win/makefile b/win/makefile index 378db8e..4c6755e 100644 --- a/win/makefile +++ b/win/makefile @@ -1,38 +1,42 @@ -# Copyright (C) 2005, Index Data ApS +# Copyright (C) 2005-2008, Index Data ApS # All rights reserved. -# $Id: makefile,v 1.3 2005-11-08 08:56:39 adam Exp $ +# $Id: makefile,v 1.37 2008-02-29 15:25:20 adam Exp $ -# MS NMAKE makefile for yp2 +# MS NMAKE makefile for metaproxy # Parameters that we customize often. DEBUG=0 # 0 for release, 1 for debug +# Metaproxy version +VERSION=1.0.17 + # YAZ and YAZ++ directories YAZ_DIR=..\..\yaz -YAZPP_DIR=..\..\yaz++ +YAZPP_DIR=..\..\yazpp # Boost -BOOST=\boost -BOOSTVER=1_33 +BOOST=\program files\boost\boost_1_35_0 +BOOST_VERSION=1_35 +BOOST_TOOLSET=vc90 # vc90 for VS2008, vc80 for VS 2005, vc71 for 2003 +BOOST_MODEL=mt # libxml2 + libxslt + associates ZLIB_DIR=\zlib-1.2.3.win32 -ICONV_DIR=\iconv-1.9.1.win32 -LIBXML2_DIR=\libxml2-2.6.20.win32 -LIBXSLT_DIR=\libxslt-1.1.14.win32 +ICONV_DIR=\iconv-1.9.2.win32 +LIBXML2_DIR=\libxml2-2.7.1.win32 +LIBXSLT_DIR=\libxslt-1.1.24.win32 # The targets default: all -all: dirs config yaz yazpp libxslt dll progs - -progs: ex_libxml2_conf ex_filter_frontend_net test_pipe +all: dirs config yaz yazpp libxslt progs +progs: metaproxy ex_filter_frontend_net # test_pipe does not work NSIS="c:\program files\nsis\makensis.exe" nsis: all - $(NSIS) yp2.nsi + $(NSIS) metaproxy.nsi # Directories # The current directory is supposed to be something like @@ -43,57 +47,69 @@ INCLDIR=$(ROOTDIR)\include # our includes LIBDIR=$(ROOTDIR)\lib # We produce .lib, .exp etc there BINDIR=$(ROOTDIR)\bin # We produce exes and dlls there WINDIR=$(ROOTDIR)\win # all these Win make things -OBJDIR=$(WINDIR)\obj # where we store intermediate files SRCDIR=$(ROOTDIR)\src # for the case we move them under src +!if $(DEBUG) +OBJDIR=$(WINDIR)\dobj # where we store intermediate files +!else +OBJDIR=$(WINDIR)\obj # where we store intermediate files +!endif + TMPDIR=$(ROOTDIR)\win\tmp TMP=$(TMPDIR) -########################################################### + +########################################################## ############### Targets - what to make ########################################################### -PROJECT_DLL=$(BINDIR)\yp2.dll -PROJECT_IMPLIB=$(LIBDIR)\yp2.lib EX_FILTER_FRONTEND_NET=$(BINDIR)\ex_filter_frontend_net.exe -EX_LIBXML2_CONF=$(BINDIR)\ex_libxml2_conf.exe +METAPROXY_PROG=$(BINDIR)\metaproxy.exe TEST_PIPE=$(BINDIR)\test_pipe.exe # shortcut names defined here -dll: $(PROJECT_DLL) ex_filter_frontend_net: $(EX_FILTER_FRONTEND_NET) -ex_libxml2_conf: $(EX_LIBXML2_CONF) +metaproxy: $(METAPROXY_PROG) test_pipe: $(TEST_PIPE) ########################################################### ############### Compiler and linker options ########################################################### +!if $(DEBUG) +YAZD=yaz3d +YAZPPD=yazpp3d +!else +YAZD=yaz3 +YAZPPD=yazpp3 +!endif + # YAZ includes & libs -YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib" -YAZ_DEF=/DYAZ_USE_NEW_LOG=1 /I"$(YAZ_DIR)\include" +YAZ_LIB="$(YAZ_DIR)\lib\$(YAZD).lib" +YAZ_DEF=/DYAZ_HAVE_XML2=1 /DYAZ_HAVE_XSLT=1 /DYAZ_USE_NEW_LOG=1 /I"$(YAZ_DIR)\include" # Copy yaz.dll to our bin -yaz: $(BINDIR)\yaz.dll -$(BINDIR)\yaz.dll: $(YAZ_DIR)\bin\yaz.dll - copy "$(YAZ_DIR)\bin\yaz.dll" $(BINDIR) +yaz: $(BINDIR)\$(YAZD).dll +$(BINDIR)\$(YAZD).dll: "$(YAZ_DIR)\bin\$(YAZD).dll" + copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR) # YAZ++ includes & libs -YAZPP_LIB="$(YAZPP_DIR)\lib\yazpp.lib" +YAZPP_LIB="$(YAZPP_DIR)\lib\$(YAZPPD).lib" YAZPP_DEF=/I"$(YAZPP_DIR)\include" # Copy yazpp.dll to our bin -yazpp: $(BINDIR)\yazpp.dll -$(BINDIR)\yazpp.dll: $(YAZPP_DIR)\bin\yazpp.dll - copy "$(YAZPP_DIR)\bin\yazpp.dll" $(BINDIR) +yazpp: $(BINDIR)\$(YAZPPD).dll +$(BINDIR)\$(YAZPPD).dll: "$(YAZPP_DIR)\bin\$(YAZPPD).dll" + copy "$(YAZPP_DIR)\bin\$(YAZPPD).dll" $(BINDIR) # Copy libxslt and associates to our bin directory libxslt: $(BINDIR)\libxslt.dll -$(BINDIR)\libxslt.dll: $(LIBXSLT_DIR)\bin\libxslt.dll - copy $(ICONV_DIR)\bin\iconv.dll $(BINDIR) - copy $(LIBXML2_DIR)\bin\libxml2.dll $(BINDIR) - copy $(LIBXSLT_DIR)\bin\libxslt.dll $(BINDIR) +$(BINDIR)\libxslt.dll: "$(LIBXSLT_DIR)\bin\libxslt.dll" + copy "$(ICONV_DIR)\bin\iconv.dll" $(BINDIR) + copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR) + copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR) + copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR) config: $(SRCDIR)\config.hpp @@ -102,12 +118,19 @@ $(SRCDIR)\config.hpp: # Boost # -BOOST_DEF = /I"$(BOOST)\include\boost-$(BOOSTVER)" +!if $(DEBUG) +BOOST_LIB_SUFFIX=$(BOOST_TOOLSET)-$(BOOST_MODEL)-gd-$(BOOST_VERSION).lib +!else +BOOST_LIB_SUFFIX=$(BOOST_TOOLSET)-$(BOOST_MODEL)-$(BOOST_VERSION).lib +!endif + +BOOST_DEF = /I"$(BOOST)" BOOST_LIB = \ - "$(BOOST)\lib\libboost_date_time-vc71-mt-$(BOOSTVER).lib" \ - "$(BOOST)\lib\libboost_program_options-vc71-mt-$(BOOSTVER).lib" \ - "$(BOOST)\lib\libboost_thread-vc71-mt-$(BOOSTVER).lib" \ - "$(BOOST)\lib\libboost_unit_test_framework-vc71-mt-$(BOOSTVER).lib" + "$(BOOST)\lib\libboost_date_time-$(BOOST_LIB_SUFFIX)" \ + "$(BOOST)\lib\libboost_thread-$(BOOST_LIB_SUFFIX)" + +#"$(BOOST)\lib\libboost_program_options-$(BOOST_LIB_SUFFIX)" \ +# "$(BOOST)\lib\libboost_unit_test_framework-$(BOOST_LIB_SUFFIX)" LIBXSLT_DEF = \ @@ -121,14 +144,15 @@ LIBXSLT_LIB = \ "$(LIBXSLT_DIR)\lib\libxslt.lib" COMMON_C_OPTIONS= \ - /nologo /W3 /GX /FD /c \ + /nologo /W3 /EHsc /FD /c \ + /D "_CRT_SECURE_NO_DEPRECATE" \ $(YAZ_DEF) \ $(YAZPP_DEF) \ $(BOOST_DEF) \ $(LIBXSLT_DEF) \ + /D VERSION=\"$(VERSION)\" \ /D "_WINDOWS" \ /D "WIN32" \ - /EHsc \ /FR"$(OBJDIR)\\" \ /Fo"$(OBJDIR)\\" \ /Fd"$(OBJDIR)\\" \ @@ -136,7 +160,7 @@ COMMON_C_OPTIONS= \ DEBUG_C_OPTIONS= \ /D "_DEBUG" \ - /MDd /Od /YX /Zi /Gm + /MDd /Od /Zi /Gm RELEASE_C_OPTIONS= \ /D "NDEBUG" \ @@ -153,7 +177,6 @@ RELEASE_C_OPTIONS= \ # /MDd = Runtime library: Multithread DLL (debug) # /Od = Disable optimising (debug) # /O2 = Optimize for speed -# /YX = Automatic use of precomipled headers # /Gm = Minimal rebuild (some cpp class stuff) # /Zi = Program database for debuggers # /ZI = Pgm database with special "edit&continue" stuff - not available in C5 @@ -162,12 +185,11 @@ RELEASE_C_OPTIONS= \ ### Linker options LINK=link.exe -LINK_LIBS= kernel32.lib user32.lib gdi32.lib \ - advapi32.lib uuid.lib \ - wsock32.lib advapi32.lib \ - $(BOOST_LIB) \ - $(YAZ_LIB) $(YAZPP_LIB) $(ICONV_LIB) $(LIBXSLT_LIB) \ - $(BOOST_LIB) +LINK_LIBS=kernel32.lib user32.lib gdi32.lib advapi32.lib uuid.lib \ + wsock32.lib advapi32.lib \ + $(BOOST_LIB) \ + $(YAZ_LIB) $(YAZPP_LIB) $(ICONV_LIB) $(LIBXSLT_LIB) \ + $(BOOST_LIB) COMMON_LNK_OPTIONS= /nologo \ /subsystem:windows \ @@ -198,21 +220,42 @@ LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) ########################################################### PROJECT_DLL_OBJS = \ - $(OBJDIR)\session.obj \ - $(OBJDIR)\router_chain.obj \ - $(OBJDIR)\router_flexml.obj \ + $(OBJDIR)\factory_filter.obj \ + $(OBJDIR)\factory_static.obj \ $(OBJDIR)\filter.obj \ + $(OBJDIR)\filter_auth_simple.obj \ + $(OBJDIR)\filter_backend_test.obj \ + $(OBJDIR)\filter_bounce.obj \ + $(OBJDIR)\filter_cql_to_rpn.obj \ $(OBJDIR)\filter_frontend_net.obj \ + $(OBJDIR)\filter_http_file.obj \ + $(OBJDIR)\filter_load_balance.obj \ $(OBJDIR)\filter_log.obj \ + $(OBJDIR)\filter_multi.obj \ + $(OBJDIR)\filter_query_rewrite.obj \ + $(OBJDIR)\filter_record_transform.obj \ + $(OBJDIR)\filter_session_shared.obj \ + $(OBJDIR)\filter_sru_to_z3950.obj \ + $(OBJDIR)\filter_template.obj \ $(OBJDIR)\filter_virt_db.obj \ $(OBJDIR)\filter_z3950_client.obj \ - $(OBJDIR)\filter_backend_test.obj \ - $(OBJDIR)\thread_pool_observer.obj \ + $(OBJDIR)\filter_zeerex_explain.obj \ + $(OBJDIR)\filter_limit.obj \ + $(OBJDIR)\gduutil.obj \ + $(OBJDIR)\origin.obj \ + $(OBJDIR)\package.obj \ $(OBJDIR)\pipe.obj \ - $(OBJDIR)\util.obj + $(OBJDIR)\plainfile.obj \ + $(OBJDIR)\router_chain.obj \ + $(OBJDIR)\router_flexml.obj \ + $(OBJDIR)\session.obj \ + $(OBJDIR)\sru_util.obj \ + $(OBJDIR)\thread_pool_observer.obj \ + $(OBJDIR)\util.obj \ + $(OBJDIR)\xmlutil.obj EX_FILTER_FRONTEND_NET_OBJS = $(OBJDIR)\ex_filter_frontend_net.obj -EX_LIBXML2_CONF_OBJS = $(OBJDIR)\ex_libxml2_conf.obj +METAPROXY_OBJS = $(OBJDIR)\metaproxy_prog.obj TEST_PIPE_OBJS = $(OBJDIR)\test_pipe.obj ########################################################### @@ -235,8 +278,8 @@ COMMON_RC_OPTIONS= /l 0x406 /i"$(ROOTDIR)" DEBUG_RC_OPTIONS=/d "_DEBUG" RELEASE_RC_OPTIONS=/d "NDEBUG" -PROJECT_RES=$(OBJDIR)\yp2.res -PROJECT_RC=$(WINDIR)\yp2.rc +PROJECT_RES=$(OBJDIR)\metaproxy.res +PROJECT_RC=$(WINDIR)\metaproxy.rc !if $(DEBUG) RSOPT=/d_DEBUG @@ -251,34 +294,41 @@ $(PROJECT_RES): $(PROJECT_RC) ############### Linking ########################################################### -$(PROJECT_DLL) $(PROJECT_IMPLIB): "$(BINDIR)" $(PROJECT_DLL_OBJS) - @echo Linking $(PROJECT_DLL) - $(LINK) $(LNKOPT) $(LINK_LIBS) $(DLL_LINK_OPTIONS) $(PROJECT_DLL_OBJS) /out:"$(PROJECT_DLL)" /implib:"$(PROJECT_IMPLIB)" - -$(EX_FILTER_FRONTEND_NET) : "$(BINDIR)" $(EX_FILTER_FRONTEND_NET_OBJS) $(PROJECT_IMPLIB) - @echo Linking $(EX_FILTER_FRONTEND_NET) - $(LINK) $(LNKOPT) $(PROG_LINK_OPTIONS) $(LINK_LIBS) $(PROJECT_DLL_OBJS) $(EX_FILTER_FRONTEND_NET_OBJS) /out:$(EX_FILTER_FRONTEND_NET) - -$(EX_LIBXML2_CONF) : "$(BINDIR)" $(EX_LIBXML2_CONF_OBJS) $(PROJECT_DLL_OBJS) - @echo Linking $(EX_LIBXML2_CONF) - $(LINK) $(LNKOPT) $(PROG_LINK_OPTIONS) $(LINK_LIBS) $(PROJECT_IMPLIB) $(EX_LIBXML2_CONF_OBJS) /out:$(EX_LIBXML2_CONF) - -$(TEST_PIPE) : "$(BINDIR)" $(TEST_PIPE_OBJS) $(PROJECT_IMPLIB) - @echo Linking $(TEST_PIPE) - $(LINK) $(LNKOPT) $(PROG_LINK_OPTIONS) $(LINK_LIBS) $(TEST_PIPE_OBJS) $(PROJECT_DLL_OBJS) /out:$(TEST_PIPE) +$(EX_FILTER_FRONTEND_NET) : "$(BINDIR)" $(EX_FILTER_FRONTEND_NET_OBJS) $(PROJECT_DLL_OBJS) + $(LINK) \ + $(LNKOPT) \ + $(PROG_LINK_OPTIONS) \ + $(LINK_LIBS) \ + $(PROJECT_DLL_OBJS) \ + $(EX_FILTER_FRONTEND_NET_OBJS) \ + /out:$(EX_FILTER_FRONTEND_NET) + +$(METAPROXY_PROG) : "$(BINDIR)" $(METAPROXY_OBJS) $(PROJECT_DLL_OBJS) + $(LINK) \ + $(LNKOPT) \ + $(PROG_LINK_OPTIONS) \ + $(LINK_LIBS) \ + $(METAPROXY_OBJS) \ + $(PROJECT_DLL_OBJS) \ + /out:$(METAPROXY_PROG) + +$(TEST_PIPE) : "$(BINDIR)" $(TEST_PIPE_OBJS) $(PROJECT_DLL_OBJS) + $(LINK) \ + $(LNKOPT) \ + $(PROG_LINK_OPTIONS) \ + $(LINK_LIBS) \ + $(PROJECT_DLL_OBJS) \ + $(TEST_PIPE_OBJS) \ + /out:$(TEST_PIPE) ############## clean clean: -del $(BINDIR)\*.exe -del $(BINDIR)\*.dll -del $(TMPDIR)\*. - -del $(LIBDIR)\*.MAP -del $(LIBDIR)\*.LIB -del $(OBJDIR)\*.OBJ -realclean: clean - -del $(ZOOMDIR)\zoom.h - dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR) $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):