Changeset: 56abe34dffc5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=56abe34dffc5
Modified Files:
pathfinder/NT/rules.msc
Branch: default
Log Message:
merge with Jun2010
diffs (70 lines):
diff -r 8898158dcf0c -r 56abe34dffc5 buildtools/conf/winrules.msc
--- a/buildtools/conf/winrules.msc Sun Jul 11 10:55:40 2010 +0200
+++ b/buildtools/conf/winrules.msc Sun Jul 11 11:34:13 2010 +0200
@@ -303,6 +303,12 @@
!IFDEF HAVE_PHP
HAVE_PHP_FALSE=^#
!ENDIF
+!IFDEF HAVE_PFTIJAH
+HAVE_PFTIJAH_FALSE=^#
+!ENDIF
+!IFDEF HAVE_PROBXML
+HAVE_PROBXML_FALSE=^#
+!ENDIF
!IFDEF HAVE_PYTHON
HAVE_PYTHON_FALSE=^#
!ENDIF
@@ -354,6 +360,8 @@
"HAVE_PERL_FALSE=$(HAVE_PERL_FALSE)" \
"HAVE_PERL_SWIG_FALSE=$(HAVE_PERL_SWIG_FALSE)" \
"HAVE_PHP_FALSE=$(HAVE_PHP_FALSE)" \
+ "HAVE_PFTIJAH_FALSE=$(HAVE_PFTIJAH_FALSE)" \
+ "HAVE_PROBXML_FALSE=$(HAVE_PROBXML_FALSE)" \
"HAVE_PYTHON_FALSE=$(HAVE_PYTHON_FALSE)" \
"HAVE_RAPTOR_FALSE=$(HAVE_RAPTOR_FALSE)" \
"HAVE_RUBYGEM_FALSE=$(HAVE_RUBYGEM_FALSE)" \
diff -r 8898158dcf0c -r 56abe34dffc5 pathfinder/NT/rules.msc
--- a/pathfinder/NT/rules.msc Sun Jul 11 10:55:40 2010 +0200
+++ b/pathfinder/NT/rules.msc Sun Jul 11 11:34:13 2010 +0200
@@ -25,6 +25,10 @@
W_CFLAGS = -WX
!ENDIF
+# also see pf_config.h.in
+HAVE_PFTIJAH = 1
+# HAVE_PROBXML =
+
!IFDEF NEED_MX
RULESMSC = $(TOPDIR)\..\..\buildtools\conf\winrules.msc
!ELSE
@@ -91,6 +95,3 @@
!ENDIF
!ENDIF
!ENDIF
-
-# also see pf_config.h.in
-HAVE_PFTIJAH=yes
diff -r 8898158dcf0c -r 56abe34dffc5
pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Windows.32bit
--- a/pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Windows.32bit
Sun Jul 11 10:55:40 2010 +0200
+++ b/pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Windows.32bit
Sun Jul 11 11:34:13 2010 +0200
@@ -15,7 +15,7 @@
DOCTOOLS=
HAVE_BUILDTOOLS=#
HAVE_CLIENTS=#
-HAVE_EXTRA_MK=#
+HAVE_EXTRA_MK=
HAVE_MONETDB4=#
HAVE_MONETDB5=#
HAVE_MONETDB5_RDF=
diff -r 8898158dcf0c -r 56abe34dffc5
pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Windows.64bit
--- a/pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Windows.64bit
Sun Jul 11 10:55:40 2010 +0200
+++ b/pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Windows.64bit
Sun Jul 11 11:34:13 2010 +0200
@@ -15,7 +15,7 @@
DOCTOOLS=
HAVE_BUILDTOOLS=#
HAVE_CLIENTS=#
-HAVE_EXTRA_MK=#
+HAVE_EXTRA_MK=
HAVE_MONETDB4=#
HAVE_MONETDB5=#
HAVE_MONETDB5_RDF=
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
