Update of /cvsroot/monetdb/pathfinder/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4421/NT
Modified Files:
pf_config.h.in rules.msc
Added Files:
pf.bat
Log Message:
propagated changes of Wednesday Jun 13 2007 - Friday Jun 15 2007
from the XQuery_0-18 branch to the development trunk
Index: rules.msc
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/NT/rules.msc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- rules.msc 12 Jun 2007 17:35:57 -0000 1.15
+++ rules.msc 15 Jun 2007 14:41:28 -0000 1.16
@@ -25,11 +25,11 @@
BURG="$(TOPDIR)\..\..\buildtools\burg\burg.exe"
# This is the location of libxml2 and its dependencies (depends how it was
compiled; sometimes iconv and zlib are needed)
-LIBXML2 = C:\libxml2-2.6.27.win32
-LIBICONV = C:\iconv-1.9.2.win32
+LIBXML2 = C:\libxml2-2.6.28.win32
+LIBICONV =
LIBZLIB = C:\zlib-1.2.3.win32
-LIBXML2_CFLAGS = "-I$(LIBXML2)\include" "-I$(LIBICONV)\include"
"-I$(LIBZLIB)\include"
-LIBXML2_LIBS = "$(LIBXML2)\lib\libxml2.lib" "$(LIBICONV)\lib\iconv.lib"
"$(LIBZLIB)\lib\zlib.lib"
+LIBXML2_CFLAGS = "-I$(LIBXML2)\include" "-I$(LIBZLIB)\include"
+LIBXML2_LIBS = "$(LIBXML2)\lib\libxml2.lib" "$(LIBZLIB)\lib\zdll.lib"
# override value from global rules.msc
LIBC_INCS = $(PTHREAD_INCS) $(LIBXML_INCS)
@@ -87,3 +87,6 @@
!ELSE
MONETDB5_INCS=
!ENDIF
+
+# also see pf_config.h.in
+HAVE_PFTIJAH=yes
Index: pf_config.h.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/NT/pf_config.h.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pf_config.h.in 12 Jun 2007 17:35:57 -0000 1.6
+++ pf_config.h.in 15 Jun 2007 14:41:27 -0000 1.7
@@ -50,3 +50,6 @@
#define MILPRINT_SUMMER_IS_DEFAULT 1
#define HAVE_MONETDB4 1
+
+/* also see rules.msc */
+#define HAVE_PFTIJAH 1
--- NEW FILE: pf.bat ---
@rem figure out the folder name
@set MONETDB=%~dp0
@rem remove the final backslash from the path
@set MONETDB=%MONETDB:~0,-1%
@rem extend the search path with our EXE and DLL folders
@rem we depend on pthreadVCE.dll having been copied to the lib folder
@set PATH=%MONETDB%\bin;%MONETDB%\lib;%MONETDB%\lib\bin;%PATH%
@rem start the real client
@"%MONETDB%\bin\pf.exe" %*
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
