-# Copyright (C) 2005-2007, Index Data ApS
-# All rights reserved.
-# $Id: makefile,v 1.34 2007-09-18 18:34:28 adam Exp $
+# This file is part of metaproxy
+# Copyright (C) Index Data
+# See the file LICENSE for details.
# MS NMAKE makefile for metaproxy
DEBUG=0 # 0 for release, 1 for debug
# Metaproxy version
-VERSION=1.0.11
+VERSION=1.6.0
# YAZ and YAZ++ directories
YAZ_DIR=..\..\yaz
YAZPP_DIR=..\..\yazpp
# Boost
-BOOST=\program files\boost\boost_1_34_1
-BOOST_VERSION=1_34_1
-BOOST_TOOLSET=vc80 # vc80 for VS 2005, vc71 for 2003
+BOOST=\local\boost_1_55_0
+BOOST_VERSION=1_55
+BOOST_LIBPATH=$(BOOST)\lib32-msvc-9.0
+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.2.win32
-LIBXML2_DIR=\libxml2-2.6.28.win32
-LIBXSLT_DIR=\libxslt-1.1.19.win32
+LIBXML2_DIR=\libxml2-2.7.6.win32
+LIBXSLT_DIR=\libxslt-1.1.26.win32
# The targets
default: all
-all: dirs config yaz yazpp libxslt dll progs
-
-progs: metaproxy ex_filter_frontend_net test_pipe
+all: dirs config yaz yazpp libxslt progs
+progs: metaproxy # test_pipe does not work
NSIS="c:\program files\nsis\makensis.exe"
nsis: all
############### Targets - what to make
###########################################################
-PROJECT_DLL=$(BINDIR)\metaproxy.dll
-PROJECT_IMPLIB=$(LIBDIR)\metaproxy.lib
-EX_FILTER_FRONTEND_NET=$(BINDIR)\ex_filter_frontend_net.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)
metaproxy: $(METAPROXY_PROG)
test_pipe: $(TEST_PIPE)
###########################################################
!if $(DEBUG)
-YAZD=yaz3d
-YAZPPD=yazpp2d
+YAZD=yaz5d
+YAZPPD=yazpp6d
!else
-YAZD=yaz3
-YAZPPD=yazpp2
+YAZD=yaz5
+YAZPPD=yazpp6
!endif
# YAZ includes & libs
BOOST_DEF = /I"$(BOOST)"
BOOST_LIB = \
- "$(BOOST)\lib\libboost_date_time-$(BOOST_LIB_SUFFIX)" \
- "$(BOOST)\lib\libboost_program_options-$(BOOST_LIB_SUFFIX)" \
- "$(BOOST)\lib\libboost_thread-$(BOOST_LIB_SUFFIX)" \
- "$(BOOST)\lib\libboost_unit_test_framework-$(BOOST_LIB_SUFFIX)"
-
+ /LIBPATH:"$(BOOST_LIBPATH)" \
+ "libboost_thread-$(BOOST_LIB_SUFFIX)" \
+ "libboost_regex-$(BOOST_LIB_SUFFIX)" \
+ "libboost_date_time-$(BOOST_LIB_SUFFIX)"
LIBXSLT_DEF = \
/I"$(ICONV_DIR)\include" \
COMMON_C_OPTIONS= \
/nologo /W3 /EHsc /FD /c \
/D "_CRT_SECURE_NO_DEPRECATE" \
+ /D _SCL_SECURE_NO_WARNINGS \
$(YAZ_DEF) \
$(YAZPP_DEF) \
$(BOOST_DEF) \
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 \
- /machine:i386 \
- /incremental:no
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
DEBUG_LNK_OPTIONS= /debug
$(OBJDIR)\filter_auth_simple.obj \
$(OBJDIR)\filter_backend_test.obj \
$(OBJDIR)\filter_bounce.obj \
- $(OBJDIR)\filter_cql_to_rpn.obj \
+ $(OBJDIR)\filter_cql_rpn.obj \
$(OBJDIR)\filter_frontend_net.obj \
+ $(OBJDIR)\filter_http_client.obj \
$(OBJDIR)\filter_http_file.obj \
+ $(OBJDIR)\filter_http_rewrite.obj \
+ $(OBJDIR)\filter_http_rewrite1.obj \
+ $(OBJDIR)\filter_limit.obj \
$(OBJDIR)\filter_load_balance.obj \
$(OBJDIR)\filter_log.obj \
$(OBJDIR)\filter_multi.obj \
+ $(OBJDIR)\filter_present_chunk.obj \
$(OBJDIR)\filter_query_rewrite.obj \
$(OBJDIR)\filter_record_transform.obj \
+ $(OBJDIR)\filter_sd_remove.obj \
$(OBJDIR)\filter_session_shared.obj \
+ $(OBJDIR)\filter_sort.obj \
$(OBJDIR)\filter_sru_to_z3950.obj \
$(OBJDIR)\filter_template.obj \
$(OBJDIR)\filter_virt_db.obj \
$(OBJDIR)\filter_z3950_client.obj \
$(OBJDIR)\filter_zeerex_explain.obj \
+ $(OBJDIR)\filter_zoom.obj \
$(OBJDIR)\gduutil.obj \
+ $(OBJDIR)\html_parser.obj \
$(OBJDIR)\origin.obj \
$(OBJDIR)\package.obj \
$(OBJDIR)\pipe.obj \
$(OBJDIR)\plainfile.obj \
$(OBJDIR)\router_chain.obj \
$(OBJDIR)\router_flexml.obj \
+ $(OBJDIR)\router_xml.obj \
$(OBJDIR)\session.obj \
$(OBJDIR)\sru_util.obj \
$(OBJDIR)\thread_pool_observer.obj \
+ $(OBJDIR)\torus.obj \
+ $(OBJDIR)\url_recipe.obj \
$(OBJDIR)\util.obj \
$(OBJDIR)\xmlutil.obj
-EX_FILTER_FRONTEND_NET_OBJS = $(OBJDIR)\ex_filter_frontend_net.obj
METAPROXY_OBJS = $(OBJDIR)\metaproxy_prog.obj
TEST_PIPE_OBJS = $(OBJDIR)\test_pipe.obj
############### Linking
###########################################################
-$(PROJECT_DLL) $(PROJECT_IMPLIB): "$(BINDIR)" $(PROJECT_DLL_OBJS)
- $(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)
+$(METAPROXY_PROG) : "$(BINDIR)" $(METAPROXY_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_IMPLIB)
- $(LINK) \
- $(LNKOPT) \
- $(PROG_LINK_OPTIONS) \
- $(LINK_LIBS) \
- $(PROJECT_DLL_OBJS) \
$(METAPROXY_OBJS) \
+ $(PROJECT_DLL_OBJS) \
/out:$(METAPROXY_PROG)
-$(TEST_PIPE) : "$(BINDIR)" $(TEST_PIPE_OBJS) $(PROJECT_IMPLIB)
+$(TEST_PIPE) : "$(BINDIR)" $(TEST_PIPE_OBJS) $(PROJECT_DLL_OBJS)
$(LINK) \
$(LNKOPT) \
$(PROG_LINK_OPTIONS) \
$(LINK_LIBS) \
- $(TEST_PIPE_OBJS) \
$(PROJECT_DLL_OBJS) \
+ $(TEST_PIPE_OBJS) \
/out:$(TEST_PIPE)
############## clean