Changeset: 65aa5016912e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65aa5016912e
Modified Files:
NT/rules.msc
testing/Mtest.py.in
Branch: Jan2014
Log Message:
Removed last vestiges of jsonstore.
Will not be propagated.
diffs (26 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -426,11 +426,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_JAQL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_JSONSTORE
- $(ECHO) HAVE_JSONSTORE_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) HAVE_JSONSTORE_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF HAVE_TESTING
$(ECHO) HAVE_TESTING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -317,7 +317,6 @@ CONDITIONALS = {
'HAVE_JAVAJDBC' : "@HAVE_JAVAJDBC_FALSE@",
'HAVE_JAVAMEROCONTROL' : "@HAVE_JAVAMEROCONTROL_FALSE@",
'HAVE_JAQL' : "@HAVE_JAQL_FALSE@",
- 'HAVE_JSONSTORE' : "@HAVE_JSONSTORE_FALSE@",
'HAVE_LIBBZ2' : "@HAVE_LIBBZ2_FALSE@",
'HAVE_LIBZ' : "@HAVE_LIBZ_FALSE@",
'HAVE_MONETDB5' : "@HAVE_MONETDB5_FALSE@",
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
