Update of /cvsroot/monetdb/MonetDB/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv468
Modified Files:
Tag: MonetDB_1-20
winrules.msc
Log Message:
Properly set the *_FALSE variables when the corresponding variable is
set.
This fixes the expansion of Mtest.py in particular.
Index: winrules.msc
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/NT/winrules.msc,v
retrieving revision 1.2.4.4
retrieving revision 1.2.4.5
diff -u -d -r1.2.4.4 -r1.2.4.5
--- winrules.msc 15 Oct 2007 15:04:49 -0000 1.2.4.4
+++ winrules.msc 22 Oct 2007 15:49:24 -0000 1.2.4.5
@@ -102,6 +102,49 @@
FILTER=findstr /v /l
FILTERPREF=/c:
+!IFDEF DOCTOOLS
+DOCTOOLS_FALSE=^#
+!ENDIF
+!IFDEF HAVE_JAVA
+HAVE_JAVA_FALSE=^#
+!ENDIF
+!IFDEF HAVE_MONETDB4
+HAVE_MONETDB4_FALSE=^#
+!ENDIF
+!IFDEF HAVE_MONETDB5
+HAVE_MONETDB5_FALSE=^#
+!ENDIF
+!IFDEF HAVE_PCRE
+HAVE_PCRE_FALSE=^#
+!ENDIF
+!IFDEF HAVE_PERL_DEVEL
+HAVE_PERL_DEVEL_FALSE=^#
+!ENDIF
+!IFDEF HAVE_PERL
+HAVE_PERL_FALSE=^#
+!ENDIF
+!IFDEF HAVE_PERL_SWIG
+HAVE_PERL_SWIG_FALSE=^#
+!ENDIF
+!IFDEF HAVE_PHP
+HAVE_PHP_FALSE=^#
+!ENDIF
+!IFDEF HAVE_PYTHON_DEVEL
+HAVE_PYTHON_DEVEL_FALSE=^#
+!ENDIF
+!IFDEF HAVE_PYTHON
+HAVE_PYTHON_FALSE=^#
+!ENDIF
+!IFDEF HAVE_PYTHON_SWIG
+HAVE_PYTHON_SWIG_FALSE=^#
+!ENDIF
+!IFDEF HAVE_SWIG
+HAVE_SWIG_FALSE=^#
+!ENDIF
+!IFDEF PROFILING
+PROFILING_FALSE=^#
+!ENDIF
+
CONFIGURE=$(PYTHON) "$(TOPDIR)\..\..\MonetDB\conf\configure.py"
"CLIENTS_BUILD=$(CLIENTS_BUILD)" "CLIENTS_PREFIX=$(CLIENTS_PREFIX)"
"CLIENTS_SOURCE=$(CLIENTS_SOURCE)" "DOCTOOLS_FALSE=$(DOCTOOLS_FALSE)"
"HAVE_JAVA_FALSE=$(HAVE_JAVA_FALSE)"
"HAVE_MONETDB4_FALSE=$(HAVE_MONETDB4_FALSE)"
"HAVE_MONETDB5_FALSE=$(HAVE_MONETDB5_FALSE)"
"HAVE_PCRE_FALSE=$(HAVE_PCRE_FALSE)"
"HAVE_PERL_DEVEL_FALSE=$(HAVE_PERL_DEVEL_FALSE)"
"HAVE_PERL_FALSE=$(HAVE_PERL_FALSE)"
"HAVE_PERL_SWIG_FALSE=$(HAVE_PERL_SWIG_FALSE)"
"HAVE_PHP_FALSE=$(HAVE_PHP_FALSE)"
"HAVE_PYTHON_DEVEL_FALSE=$(HAVE_PYTHON_DEVEL_FALSE)"
"HAVE_PYTHON_FALSE=$(HAVE_PYTHON_FALSE)"
"HAVE_PYTHON_SWIG_FALSE=$(HAVE_PYTHON_SWIG_FALSE)"
"HAVE_SWIG_FALSE=$(HAVE_SWIG_FALSE)" "JDBCCLIENT_JAR=$(JDBCCLIENT_JAR)"
"LIBICONV=$(LIBICONV)" "LIBXML2=$(LIBXML2)" "LIBZLIB=$(LIBZLIB)"
"MONETDB4_BUILD=$(MONETDB4_BUILD)" "MONETDB4_PREFIX=$(MONETDB4_PREFIX)"
"MONETDB4_SOURCE=$(MONETDB4_SOURCE)" "MONETDB5_BUILD=$(MONETDB5_BUILD)"
"MONETDB5_PREFIX=$(MONETDB5_P
REFIX)" "MONETDB5_SOURCE=$(MONETDB5_SOURCE)" "MONETDB_BUILD=$(MONETDB_BUILD)"
"MONETDB_PREFIX=$(MONETDB_PREFIX)" "MONETDB_SOURCE=$(MONETDB_SOURCE)"
"PACKAGE=$(pkg)" "PATHFINDER_BUILD=$(PATHFINDER_BUILD)"
"PATHFINDER_SOURCE=$(PATHFINDER_SOURCE)" "PHP_EXTENSIONDIR=$(PHP_EXTENSIONDIR)"
"prefix=$(prefix)" "PROFILING_FALSE=$(PROFILING_FALSE)" "PYTHON=$(PYTHON)"
"SQL_BUILD=$(SQL_BUILD)" "SQL_SOURCE=$(SQL_SOURCE)" "TOPDIR=$(TOPDIR)"
"VERSION=$(VERSION)"
# Use "nmake DEBUG=1" to get a debug build (assertions enabled);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
