X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=788549c805112752f19e2cb8d3b0146d4ccc8b87;hb=af17ce65db77bb9b783c44decd5976b4bb0f50dd;hp=bc21267f40cc457849d98fd518051cf7a18487c8;hpb=f765f54b6e82159c6b5ea09de95bf50ee299c567;p=metaproxy-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index bc21267..788549c 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,6 @@
-# Copyright (C) 2005-2012 Index Data
-# All rights reserved.
+# This file is part of metaproxy
+# Copyright (C) Index Data
+# See the file LICENSE for details.
 
 # MS NMAKE makefile for metaproxy
 
@@ -7,23 +8,22 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # Metaproxy version
-VERSION=1.3.51
+VERSION=1.8.7
 
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz
 YAZPP_DIR=..\..\yazpp
 
 # Boost
-BOOST=\program files\boost\boost_1_51
-BOOST_VERSION=1_51
-BOOST_TOOLSET=vc90 # vc90 for VS2008, vc80 for VS 2005, vc71 for 2003
+BOOST=\local\boost_1_57_0
+BOOST_VERSION=1_57
+BOOST_LIBPATH=$(BOOST)\lib32-msvc-12.0
+BOOST_TOOLSET=vc120 # vs120 for VS2013, vc90 for VS2008, vc80 for VS 2005
 BOOST_MODEL=mt
 
 # libxml2 + libxslt + associates
-ZLIB_DIR=\zlib-1.2.3.win32
-ICONV_DIR=\iconv-1.9.2.win32
-LIBXML2_DIR=\libxml2-2.7.6.win32
-LIBXSLT_DIR=\libxslt-1.1.26.win32
+LIBXML2_DIR=\libxml2-2.9.2.win32
+LIBXSLT_DIR=\libxslt-1.1.28.win32
 
 # The targets
 
@@ -31,7 +31,7 @@ default: all
 
 all: dirs config yaz yazpp libxslt progs
 
-progs: metaproxy ex_filter_frontend_net # test_pipe does not work
+progs: metaproxy # test_pipe does not work
 NSIS="c:\program files\nsis\makensis.exe"
 
 nsis: all
@@ -62,12 +62,10 @@ TMP=$(TMPDIR)
 ############### Targets - what to make
 ###########################################################
 
-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
-ex_filter_frontend_net: $(EX_FILTER_FRONTEND_NET)
 metaproxy: $(METAPROXY_PROG)
 test_pipe: $(TEST_PIPE)
 
@@ -76,11 +74,11 @@ test_pipe: $(TEST_PIPE)
 ###########################################################
 
 !if $(DEBUG)
-YAZD=yaz4d
-YAZPPD=yazpp5d
+YAZD=yaz5d
+YAZPPD=yazpp6d
 !else
-YAZD=yaz4
-YAZPPD=yazpp5
+YAZD=yaz5
+YAZPPD=yazpp6
 !endif
 
 # YAZ includes & libs
@@ -104,11 +102,9 @@ $(BINDIR)\$(YAZPPD).dll: "$(YAZPP_DIR)\bin\$(YAZPPD).dll"
 # 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 "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR)
+$(BINDIR)\libxslt.dll: "$(LIBXSLT_DIR)\lib\libxslt.dll"
 	copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)
-	copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR)
+	copy "$(LIBXSLT_DIR)\lib\libxslt.dll" $(BINDIR)
 
 config: $(SRCDIR)\config.hpp
 
@@ -125,24 +121,23 @@ BOOST_LIB_SUFFIX=$(BOOST_TOOLSET)-$(BOOST_MODEL)-$(BOOST_VERSION).lib
 
 BOOST_DEF = /I"$(BOOST)"
 BOOST_LIB = \
-	     /LIBPATH:"$(BOOST)\lib" \
+	     /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" \
-	      /I"$(LIBXML2_DIR)\include" \
+	      /I"$(LIBXML2_DIR)\include\libxml2" \
 	      /I"$(LIBXSLT_DIR)\include"
 
 LIBXSLT_LIB = \
-    "$(ICONV_DIR)\lib\iconv.lib" \
     "$(LIBXML2_DIR)\lib\libxml2.lib" \
     "$(LIBXSLT_DIR)\lib\libxslt.lib"
 
 COMMON_C_OPTIONS=          \
   /nologo /W3 /EHsc /FD /c \
   /D "_CRT_SECURE_NO_DEPRECATE" \
+  /D _SCL_SECURE_NO_WARNINGS \
   $(YAZ_DEF)               \
   $(YAZPP_DEF)             \
   $(BOOST_DEF)             \
@@ -219,15 +214,20 @@ PROJECT_DLL_OBJS = \
 	$(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 \
@@ -237,12 +237,14 @@ PROJECT_DLL_OBJS = \
         $(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 \
@@ -251,7 +253,6 @@ PROJECT_DLL_OBJS = \
         $(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
 
@@ -291,15 +292,6 @@ $(PROJECT_RES): $(PROJECT_RC)
 ############### Linking
 ###########################################################
 
-$(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) \