Update of /cvsroot/monetdb/pathfinder/NT
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27111
Modified Files:
Tag: XQuery_0-16
configure.py pf_config.h.in rules.msc
Log Message:
Converted Windows line endings to normal ones.
PLEASE, do not check in Windows files on Linux.
Index: rules.msc
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/NT/Attic/rules.msc,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -d -r1.8.2.2 -r1.8.2.3
--- rules.msc 1 Mar 2007 18:56:44 -0000 1.8.2.2
+++ rules.msc 2 Mar 2007 12:17:31 -0000 1.8.2.3
@@ -1,174 +1,174 @@
-# The contents of this file are subject to the MonetDB Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-#
-# The Original Code is the MonetDB Database System.
-#
-# The Initial Developer of the Original Code is CWI.
-# Portions created by CWI are Copyright (C) 1997-2006 CWI.
-# All Rights Reserved.
-
-!INCLUDE $(TOPDIR)\..\..\MonetDB\conf\rules.msc
-
-MONET4=1
-MONETDB4_INCS= -I$(TOPDIR)\..\..\MonetDB4\NT\include\plain
-I$(TOPDIR)\..\..\MonetDB4\NT\include\contrib \
- -I$(TOPDIR)\..\..\MonetDB4\NT\include\mapi
-I$(TOPDIR)\..\..\MonetDB4\NT\include\monet
-I$(TOPDIR)\..\..\MonetDB4\NT\include
-MONETDB4_LIBS=/libpath:$(TOPDIR)\..\..\MonetDB4\NT\lib
/libpath:$(TOPDIR)\..\..\MonetDB4\NT\lib\MonetDB4
-MONETDB_INCS=-I$(TOPDIR)\..\..\MonetDB\NT\include
-I$(TOPDIR)\..\..\MonetDB\NT\include\common
-I$(TOPDIR)\..\..\MonetDB\NT\include\gdk
-MONETDB_LIBS=/libpath:$(TOPDIR)\..\..\MonetDB\NT\lib
-CLIENTS_INCS=-I$(TOPDIR)\..\..\clients\NT\include
-I$(TOPDIR)\..\..\clients\NT\include\MonetDB\mapilib
-CLIENTS_LIBS=/libpath:$(TOPDIR)\..\..\clients\NT\lib
-
-# burg is part of the buildtools
-BURG=burg
-
-# 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
-LIBXML2_ICONV = C:\iconv-1.9.2.win32
-LIBXML2_ZLIB = C:\zlib-1.2.3.win32
-LIBXML2_CFLAGS = "-I$(LIBXML2)\include" "-I$(LIBXML2_ICONV)\include"
"-I$(LIBXML2_ZLIB)\include"
-LIBXML2_LIBS = "$(LIBXML2)\lib\libxml2.lib" "$(LIBXML2_ICONV)\lib\iconv.lib"
"$(LIBXML2_ZLIB)\lib\zlib.lib"
-
-CONFIG_H = pf_config.h
-
-# not need to edit beyond here..
-
-pkg = MonetDB
-exec_prefix = $(prefix)
-
-bindir = $(exec_prefix)\bin
-sbindir = $(exec_prefix)\sbin
-libexecdir = $(exec_prefix)\libexec
-datadir = $(prefix)\share
-sysconfdir = $(prefix)\etc
-sharedstatedir = $(prefix)\com
-localstatedir = $(prefix)\var
-libdir = $(exec_prefix)\lib
-infodir = $(prefix)\info
-mandir = $(prefix)\man
-includedir = $(prefix)\include
-oldincludedir = \usr\include
-pkgdatadir = $(datadir)\$(pkg)
-pkglibdir = $(libdir)\$(pkg)
-pkgincludedir = $(includedir)\$(pkg)
-
-#-FI$(TOPDIR)\config.h
-LIBC_INCS = $(PTHREAD_INCS) $(LIBXML_INCS)
-SOCKET_LIBS = wsock32.lib
-
-COMPILE_MEL=1
-COMPILE_MX=1
-MEL="$(TOPDIR)\..\..\buildtools\mel\mel.exe"
-MX="$(TOPDIR)\..\..\buildtools\Mx\Mx.exe"
-CP=copy
-MV=copy
-DEL=del
-!IFDEF HAVE_JAVA
-CONFIGURE=$(PYTHON) "$(TOPDIR)\configure.py" -DHAVE_JAVA "$(TOPDIR)"
"$(prefix)"
-!ELSE
-CONFIGURE=$(PYTHON) "$(TOPDIR)\configure.py" "$(TOPDIR)" "$(prefix)"
-!ENDIF
-
-# Use "nmake DEBUG=1" to get a debug build (assertions enabled);
-# use "nmake NDEBUG=1" to get a release build (assertions disabled);
-# use plain "nmake" to get the default.
-!IFNDEF DEBUG
-!IFDEF NDEBUG
-CFLAGS = $(CFLAGS) -DNDEBUG
-!ELSE
-# default in case neither NDEBUG nor DEBUG are defined
-CFLAGS = $(CFLAGS)
-!ENDIF
-!ENDIF
-
-PHP_INCS = -I$(PHP_SRCDIR) -I$(PHP_SRCDIR)\main -I$(PHP_SRCDIR)\TSRM
-I$(PHP_SRCDIR)\Zend -DPHP_WIN32 -DZEND_WIN32 -DZEND_DEBUG=0 -DZTS=1
-PHP_LIBS = $(PHP_INSTDIR)\php5embed.lib
-# there's nothing special about PEAR on Windows
-HAVE_PEAR = 1
-
-{$(SRCDIR)}.mx.h:
- $(MX) $(MXFLAGS) -x h $<
-
-.mx.h:
- $(MX) $(MXFLAGS) -x h $<
-
-{$(SRCDIR)}.mx.c:
- $(MX) $(MXFLAGS) -x c $<
-
-.mx.c:
- $(MX) $(MXFLAGS) -x c $<
-
-{$(SRCDIR)}.mx.m:
- $(MX) $(MXFLAGS) -x m $<
-
-.mx.m:
- $(MX) $(MXFLAGS) -x m $<
-
-.m.mil:
- $(MEL) $(INCLUDES) -mil $*.m > $@
- type $*.tmpmil >> $@
- if not exist .libs $(MKDIR) .libs
- $(INSTALL) $@ .libs\$@
-
-.m.mil:
- $(MEL) $(INCLUDES) -mil $*.m > $@
- if not exist .libs $(MKDIR) .libs
- $(INSTALL) $@ .libs\$@
-
-{$(SRCDIR)}.mx.tmpmil:
- $(MX) $(MXFLAGS) -l -x mil $<
- $(MV) $*.mil $*.tmpmil
- $(DEL) $*.mil
-
-{$(SRCDIR)}.mx.mil:
- $(MX) $(MXFLAGS) -l -x mil $<
-
-.mx.tmpmil:
- $(MX) $(MXFLAGS) -l -x mil $<
- $(MV) $*.mil $*.tmpmil
- $(DEL) $*.mil
-
-.mx.mil:
- $(MX) $(MXFLAGS) -l -x mil $<
-
-{$(SRCDIR)}.mx.y:
- $(MX) $(MXFLAGS) -x y $<
-
-.mx.y:
- $(MX) $(MXFLAGS) -x y $<
-
-{$(SRCDIR)}.mx.l:
- $(MX) $(MXFLAGS) -x l $<
-
-.mx.l:
- $(MX) $(MXFLAGS) -x l $<
-
-{$(SRCDIR)}.mx.yy:
- $(MX) $(MXFLAGS) -x Y $<
-
-.mx.yy:
- $(MX) $(MXFLAGS) -x Y $<
-
-{$(SRCDIR)}.mx.ll:
- $(MX) $(MXFLAGS) -x L $<
-
-.mx.ll:
- $(MX) $(MXFLAGS) -x L $<
-
-{$(SRCDIR)}.c.obj:
- $(CC) $(CFLAGS) $(INCLUDES) -c $<
-
-.c.obj:
- $(CC) $(CFLAGS) $(INCLUDES) -c $<
-
-{$(SRCDIR)}.brg.c:
- $(BURG) -c 1000 -d -I -p PF$* -o $@ < $<
-
-.SUFFIXES: .m .mx .proto_h .mil .glue_c .brg
-.PRECIOUS: .m
+# The contents of this file are subject to the MonetDB Public License
+# Version 1.1 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is the MonetDB Database System.
+#
+# The Initial Developer of the Original Code is CWI.
+# Portions created by CWI are Copyright (C) 1997-2006 CWI.
+# All Rights Reserved.
+
+!INCLUDE $(TOPDIR)\..\..\MonetDB\conf\rules.msc
+
+MONET4=1
+MONETDB4_INCS= -I$(TOPDIR)\..\..\MonetDB4\NT\include\plain
-I$(TOPDIR)\..\..\MonetDB4\NT\include\contrib \
+ -I$(TOPDIR)\..\..\MonetDB4\NT\include\mapi
-I$(TOPDIR)\..\..\MonetDB4\NT\include\monet
-I$(TOPDIR)\..\..\MonetDB4\NT\include
+MONETDB4_LIBS=/libpath:$(TOPDIR)\..\..\MonetDB4\NT\lib
/libpath:$(TOPDIR)\..\..\MonetDB4\NT\lib\MonetDB4
+MONETDB_INCS=-I$(TOPDIR)\..\..\MonetDB\NT\include
-I$(TOPDIR)\..\..\MonetDB\NT\include\common
-I$(TOPDIR)\..\..\MonetDB\NT\include\gdk
+MONETDB_LIBS=/libpath:$(TOPDIR)\..\..\MonetDB\NT\lib
+CLIENTS_INCS=-I$(TOPDIR)\..\..\clients\NT\include
-I$(TOPDIR)\..\..\clients\NT\include\MonetDB\mapilib
+CLIENTS_LIBS=/libpath:$(TOPDIR)\..\..\clients\NT\lib
+
+# burg is part of the buildtools
+BURG=burg
+
+# 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
+LIBXML2_ICONV = C:\iconv-1.9.2.win32
+LIBXML2_ZLIB = C:\zlib-1.2.3.win32
+LIBXML2_CFLAGS = "-I$(LIBXML2)\include" "-I$(LIBXML2_ICONV)\include"
"-I$(LIBXML2_ZLIB)\include"
+LIBXML2_LIBS = "$(LIBXML2)\lib\libxml2.lib" "$(LIBXML2_ICONV)\lib\iconv.lib"
"$(LIBXML2_ZLIB)\lib\zlib.lib"
+
+CONFIG_H = pf_config.h
+
+# not need to edit beyond here..
+
+pkg = MonetDB
+exec_prefix = $(prefix)
+
+bindir = $(exec_prefix)\bin
+sbindir = $(exec_prefix)\sbin
+libexecdir = $(exec_prefix)\libexec
+datadir = $(prefix)\share
+sysconfdir = $(prefix)\etc
+sharedstatedir = $(prefix)\com
+localstatedir = $(prefix)\var
+libdir = $(exec_prefix)\lib
+infodir = $(prefix)\info
+mandir = $(prefix)\man
+includedir = $(prefix)\include
+oldincludedir = \usr\include
+pkgdatadir = $(datadir)\$(pkg)
+pkglibdir = $(libdir)\$(pkg)
+pkgincludedir = $(includedir)\$(pkg)
+
+#-FI$(TOPDIR)\config.h
+LIBC_INCS = $(PTHREAD_INCS) $(LIBXML_INCS)
+SOCKET_LIBS = wsock32.lib
+
+COMPILE_MEL=1
+COMPILE_MX=1
+MEL="$(TOPDIR)\..\..\buildtools\mel\mel.exe"
+MX="$(TOPDIR)\..\..\buildtools\Mx\Mx.exe"
+CP=copy
+MV=copy
+DEL=del
+!IFDEF HAVE_JAVA
+CONFIGURE=$(PYTHON) "$(TOPDIR)\configure.py" -DHAVE_JAVA "$(TOPDIR)"
"$(prefix)"
+!ELSE
+CONFIGURE=$(PYTHON) "$(TOPDIR)\configure.py" "$(TOPDIR)" "$(prefix)"
+!ENDIF
+
+# Use "nmake DEBUG=1" to get a debug build (assertions enabled);
+# use "nmake NDEBUG=1" to get a release build (assertions disabled);
+# use plain "nmake" to get the default.
+!IFNDEF DEBUG
+!IFDEF NDEBUG
+CFLAGS = $(CFLAGS) -DNDEBUG
+!ELSE
+# default in case neither NDEBUG nor DEBUG are defined
+CFLAGS = $(CFLAGS)
+!ENDIF
+!ENDIF
+
+PHP_INCS = -I$(PHP_SRCDIR) -I$(PHP_SRCDIR)\main -I$(PHP_SRCDIR)\TSRM
-I$(PHP_SRCDIR)\Zend -DPHP_WIN32 -DZEND_WIN32 -DZEND_DEBUG=0 -DZTS=1
+PHP_LIBS = $(PHP_INSTDIR)\php5embed.lib
+# there's nothing special about PEAR on Windows
+HAVE_PEAR = 1
+
+{$(SRCDIR)}.mx.h:
+ $(MX) $(MXFLAGS) -x h $<
+
+.mx.h:
+ $(MX) $(MXFLAGS) -x h $<
+
+{$(SRCDIR)}.mx.c:
+ $(MX) $(MXFLAGS) -x c $<
+
+.mx.c:
+ $(MX) $(MXFLAGS) -x c $<
+
+{$(SRCDIR)}.mx.m:
+ $(MX) $(MXFLAGS) -x m $<
+
+.mx.m:
+ $(MX) $(MXFLAGS) -x m $<
+
+.m.mil:
+ $(MEL) $(INCLUDES) -mil $*.m > $@
+ type $*.tmpmil >> $@
+ if not exist .libs $(MKDIR) .libs
+ $(INSTALL) $@ .libs\$@
+
+.m.mil:
+ $(MEL) $(INCLUDES) -mil $*.m > $@
+ if not exist .libs $(MKDIR) .libs
+ $(INSTALL) $@ .libs\$@
+
+{$(SRCDIR)}.mx.tmpmil:
+ $(MX) $(MXFLAGS) -l -x mil $<
+ $(MV) $*.mil $*.tmpmil
+ $(DEL) $*.mil
+
+{$(SRCDIR)}.mx.mil:
+ $(MX) $(MXFLAGS) -l -x mil $<
+
+.mx.tmpmil:
+ $(MX) $(MXFLAGS) -l -x mil $<
+ $(MV) $*.mil $*.tmpmil
+ $(DEL) $*.mil
+
+.mx.mil:
+ $(MX) $(MXFLAGS) -l -x mil $<
+
+{$(SRCDIR)}.mx.y:
+ $(MX) $(MXFLAGS) -x y $<
+
+.mx.y:
+ $(MX) $(MXFLAGS) -x y $<
+
+{$(SRCDIR)}.mx.l:
+ $(MX) $(MXFLAGS) -x l $<
+
+.mx.l:
+ $(MX) $(MXFLAGS) -x l $<
+
+{$(SRCDIR)}.mx.yy:
+ $(MX) $(MXFLAGS) -x Y $<
+
+.mx.yy:
+ $(MX) $(MXFLAGS) -x Y $<
+
+{$(SRCDIR)}.mx.ll:
+ $(MX) $(MXFLAGS) -x L $<
+
+.mx.ll:
+ $(MX) $(MXFLAGS) -x L $<
+
+{$(SRCDIR)}.c.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) -c $<
+
+.c.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) -c $<
+
+{$(SRCDIR)}.brg.c:
+ $(BURG) -c 1000 -d -I -p PF$* -o $@ < $<
+
+.SUFFIXES: .m .mx .proto_h .mil .glue_c .brg
+.PRECIOUS: .m
Index: pf_config.h.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/NT/Attic/pf_config.h.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- pf_config.h.in 1 Mar 2007 18:56:44 -0000 1.1.2.1
+++ pf_config.h.in 2 Mar 2007 12:17:30 -0000 1.1.2.2
@@ -1,771 +1,771 @@
-/* -*-C-*- */
-
-/*
- * The contents of this file are subject to the MonetDB Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
[...1511 lines suppressed...]
+/* #undef pid_t */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+#define HAVE_GLOBALMEMORYSTATUSEX 1 /* only on >= NT 5 */
+#define HAVE_GLOBALMEMORYSTATUS 1
+
+/* Intel compiler for windows does not know __attribute__() */
+#define __attribute__(x)
+
+/* no va_copy in win32 */
+#define va_copy(x,y) ((x) = (y))
+
+typedef unsigned char uint8_t;
+
+#define MILPRINT_SUMMER_IS_DEFAULT 1
+#define MONET4 1
+
+#define HAVE_SOCKLEN_T 1
Index: configure.py
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/NT/Attic/configure.py,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -d -r1.8.2.2 -r1.8.2.3
--- configure.py 1 Mar 2007 18:56:43 -0000 1.8.2.2
+++ configure.py 2 Mar 2007 12:17:30 -0000 1.8.2.3
@@ -1,107 +1,107 @@
-#!/usr/bin/env python
-
-# The contents of this file are subject to the MonetDB Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-#
-# The Original Code is the MonetDB Database System.
-#
-# The Initial Developer of the Original Code is CWI.
-# Portions created by CWI are Copyright (C) 1997-2006 CWI.
-# All Rights Reserved.
-
-import sys
-import fileinput
-import os
-
-if sys.argv[1] == '-DHAVE_JAVA':
- del sys.argv[1]
- have_java_false = '#'
-else:
- have_java_false = ''
-
-build=os.path.abspath(sys.argv[1]);
-prefix=os.path.abspath(sys.argv[2]);
-
-source=os.path.abspath(os.path.join(build,os.pardir))
-
-subs = [
- ('@exec_prefix@', prefix),
- ('@Xexec_prefix@', prefix),
- ('@sysconfdir@', r'${prefix}\etc'),
- ('@Xsysconfdir@', r'${prefix}\etc'),
- ('@localstatedir@', r'${prefix}\var'),
- ('@Xlocalstatedir@', r'${prefix}\var'),
- ('@libdir@', r'${prefix}\lib'),
- ('@Xlibdir@', r'${prefix}\lib'),
- ('@bindir@', r'${prefix}\bin'),
- ('@Xbindir@', r'${prefix}\bin'),
- ('@mandir@', r'${prefix}\man'),
- ('@Xmandir@', r'${prefix}\man'),
- ('@includedir@', r'${prefix}\include'),
- ('@Xincludedir@', r'${prefix}\include'),
- ('@datadir@', r'${prefix}\share'),
- ('@Xdatadir@', r'${prefix}\share'),
- ('@infodir@', r'${prefix}\info'),
- ('@Xinfodir@', r'${prefix}\info'),
- ('@libexecdir@', r'${prefix}\libexec'),
- ('@Xlibexecdir@', r'${prefix}\libexec'),
- ('@PACKAGE@', r'MonetDB'),
- ('@VERSION@', r'4.13.1'),
- ('@DIRSEP@', '\\'),
- ('@PATHSEP@', ';'),
- ('@prefix@', prefix),
- ('@Xprefix@', prefix),
- ('@MONETDB_BUILD@', build),
- ('@XMONETDB_BUILD@', build),
- ('@MONETDB_SOURCE@', source),
- ('@XMONETDB_SOURCE@', source),
- ('@NO_X_CFLAGS@', ''),
- ('@PYTHON@', 'python'),
- # for these, also see rules.msc
- ('@PHP_EXTENSIONDIR@', r'lib\php4'),
- ('@XPHP_EXTENSIONDIR@', r'lib\php4'),
- ('@PHP_PEARDIR@', r'share\pear'),
- ('@XPHP_PEARDIR@', r'share\pear'),
- # conditionals for Mtest.py (see comment over there)
- ('@CROSS_COMPILING_FALSE@', '#'),
- ('@DOCTOOLS_FALSE@', '#'),
- ('@HAVE_JAVA_FALSE@', have_java_false),
- ('@HAVE_MONET5_FALSE@', ''),
- ('@HAVE_MONET_FALSE@', '#'),
- ('@HAVE_PCRE_FALSE@', ''),
- ('@HAVE_PERL_FALSE@', ''),
- ('@HAVE_PERL_DEVEL_FALSE@', ''),
- ('@HAVE_PERL_SWIG_FALSE@', ''),
- ('@HAVE_PHP_FALSE@', ''),
- ('@HAVE_PEAR_FALSE@', ''),
- ('@HAVE_PYTHON_FALSE@', '#'),
- ('@HAVE_PYTHON_DEVEL_FALSE@','#'),
- ('@HAVE_PYTHON_SWIG_FALSE@', ''),
- ('@HAVE_SWIG_FALSE@', ''),
- ('@LINK_STATIC_FALSE@', ''),
- ('@NOT_WIN32_FALSE@', ''),
- ('@PROFILING_FALSE@', ''),
- # SQL:
- ('@MONET4_FALSE@', '#'),
- ('@MONET5_FALSE@', ''),
- ('@NATIVE_WIN32_FALSE@', '#'),
-]
-
-for key, val in subs[:]:
- subs.insert(0, ('@Q'+key[1:], val.replace('\\', r'\\')))
-
-
-def substitute(line):
- for (p,v) in subs:
- line = line.replace(p, v);
- return line
-
-for line in fileinput.input(sys.argv[3:]):
- sys.stdout.write(substitute(line))
+#!/usr/bin/env python
+
+# The contents of this file are subject to the MonetDB Public License
+# Version 1.1 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is the MonetDB Database System.
+#
+# The Initial Developer of the Original Code is CWI.
+# Portions created by CWI are Copyright (C) 1997-2006 CWI.
+# All Rights Reserved.
+
+import sys
+import fileinput
+import os
+
+if sys.argv[1] == '-DHAVE_JAVA':
+ del sys.argv[1]
+ have_java_false = '#'
+else:
+ have_java_false = ''
+
+build=os.path.abspath(sys.argv[1]);
+prefix=os.path.abspath(sys.argv[2]);
+
+source=os.path.abspath(os.path.join(build,os.pardir))
+
+subs = [
+ ('@exec_prefix@', prefix),
+ ('@Xexec_prefix@', prefix),
+ ('@sysconfdir@', r'${prefix}\etc'),
+ ('@Xsysconfdir@', r'${prefix}\etc'),
+ ('@localstatedir@', r'${prefix}\var'),
+ ('@Xlocalstatedir@', r'${prefix}\var'),
+ ('@libdir@', r'${prefix}\lib'),
+ ('@Xlibdir@', r'${prefix}\lib'),
+ ('@bindir@', r'${prefix}\bin'),
+ ('@Xbindir@', r'${prefix}\bin'),
+ ('@mandir@', r'${prefix}\man'),
+ ('@Xmandir@', r'${prefix}\man'),
+ ('@includedir@', r'${prefix}\include'),
+ ('@Xincludedir@', r'${prefix}\include'),
+ ('@datadir@', r'${prefix}\share'),
+ ('@Xdatadir@', r'${prefix}\share'),
+ ('@infodir@', r'${prefix}\info'),
+ ('@Xinfodir@', r'${prefix}\info'),
+ ('@libexecdir@', r'${prefix}\libexec'),
+ ('@Xlibexecdir@', r'${prefix}\libexec'),
+ ('@PACKAGE@', r'MonetDB'),
+ ('@VERSION@', r'4.13.1'),
+ ('@DIRSEP@', '\\'),
+ ('@PATHSEP@', ';'),
+ ('@prefix@', prefix),
+ ('@Xprefix@', prefix),
+ ('@MONETDB_BUILD@', build),
+ ('@XMONETDB_BUILD@', build),
+ ('@MONETDB_SOURCE@', source),
+ ('@XMONETDB_SOURCE@', source),
+ ('@NO_X_CFLAGS@', ''),
+ ('@PYTHON@', 'python'),
+ # for these, also see rules.msc
+ ('@PHP_EXTENSIONDIR@', r'lib\php4'),
+ ('@XPHP_EXTENSIONDIR@', r'lib\php4'),
+ ('@PHP_PEARDIR@', r'share\pear'),
+ ('@XPHP_PEARDIR@', r'share\pear'),
+ # conditionals for Mtest.py (see comment over there)
+ ('@CROSS_COMPILING_FALSE@', '#'),
+ ('@DOCTOOLS_FALSE@', '#'),
+ ('@HAVE_JAVA_FALSE@', have_java_false),
+ ('@HAVE_MONET5_FALSE@', ''),
+ ('@HAVE_MONET_FALSE@', '#'),
+ ('@HAVE_PCRE_FALSE@', ''),
+ ('@HAVE_PERL_FALSE@', ''),
+ ('@HAVE_PERL_DEVEL_FALSE@', ''),
+ ('@HAVE_PERL_SWIG_FALSE@', ''),
+ ('@HAVE_PHP_FALSE@', ''),
+ ('@HAVE_PEAR_FALSE@', ''),
+ ('@HAVE_PYTHON_FALSE@', '#'),
+ ('@HAVE_PYTHON_DEVEL_FALSE@','#'),
+ ('@HAVE_PYTHON_SWIG_FALSE@', ''),
+ ('@HAVE_SWIG_FALSE@', ''),
+ ('@LINK_STATIC_FALSE@', ''),
+ ('@NOT_WIN32_FALSE@', ''),
+ ('@PROFILING_FALSE@', ''),
+ # SQL:
+ ('@MONET4_FALSE@', '#'),
+ ('@MONET5_FALSE@', ''),
+ ('@NATIVE_WIN32_FALSE@', '#'),
+]
+
+for key, val in subs[:]:
+ subs.insert(0, ('@Q'+key[1:], val.replace('\\', r'\\')))
+
+
+def substitute(line):
+ for (p,v) in subs:
+ line = line.replace(p, v);
+ return line
+
+for line in fileinput.input(sys.argv[3:]):
+ sys.stdout.write(substitute(line))
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
