Update of /cvsroot/monetdb/MonetDB/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23769/MonetDB/NT
Modified Files:
winrules.msc
Log Message:
conditional "HAVE_MONETDB_JAVA" is no longer sufficient to determine
whether Java/JDBC test can/should be run or not;
hence, we introduce more specific conditionals
"HAVE_MONETDB_JAVAJDBC" & "HAVE_MONETDB_JAVAXRPC" also for testing
and extend monetdb-java-config with options
"--HAVE_MONETDB_JAVAJDBC" & "--HAVE_MONETDB_JAVAXRPC"
to convey the information to other packages
Index: winrules.msc
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/NT/winrules.msc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- winrules.msc 11 Dec 2007 16:26:32 -0000 1.14
+++ winrules.msc 11 Dec 2007 22:19:05 -0000 1.15
@@ -171,6 +171,12 @@
!IFDEF HAVE_MONETDB_JAVA
HAVE_MONETDB_JAVA_FALSE=^#
!ENDIF
+!IFDEF HAVE_MONETDB_JAVAJDBC
+HAVE_MONETDB_JAVAJDBC_FALSE=^#
+!ENDIF
+!IFDEF HAVE_MONETDB_JAVAXRPC
+HAVE_MONETDB_JAVAXRPC_FALSE=^#
+!ENDIF
!IFDEF HAVE_MONETDB4
HAVE_MONETDB4_FALSE=^#
!ENDIF
@@ -208,7 +214,7 @@
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_MONETDB_JAVA_FALSE=$(HAVE_MONETDB_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_B
UILD=$(MONETDB5_BUILD)" "MONETDB5_PREFIX=$(MONETDB5_PREFIX)"
"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)" "MONETDB_JAVA_BUILD=$(MONETDB_JAVA_BUILD)"
"MONETDB_JAVA_PREFIX=$(MONETDB_JAVA_PREFIX)"
"MONETDB_JAVA_SOURCE=$(MONETDB_JAVA_SOURCE)" "PYTHON_LIBDIR=$(PYTHON_LIBDIR)"
+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_MONETDB_JAVA_FALSE=$(HAVE_MONETDB_JAVA_FALSE)"
"HAVE_MONETDB_JAVAJDBC_FALSE=$(HAVE_MONETDB_JAVAJDBC_FALSE)"
"HAVE_MONETDB_JAVAXRPC_FALSE=$(HAVE_MONETDB_JAVAXRPC_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_PREFIX)" "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)" "MONETDB_JAVA_BUILD=$(MONETDB_JAVA_BUILD)"
"MONETDB_JAVA_PREFIX=$(MONETDB_JAVA_PREFIX)"
"MONETDB_JAVA_SOURCE=$(MONETDB_JAVA_SOURCE)" "PYTHON_LIBDIR=$(PYTHON_LIBDIR)"
# Use "nmake DEBUG=1" to get a debug build (assertions enabled);
# use "nmake NDEBUG=1" to get a release build (assertions disabled);
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
