Changeset: d358b2bc57f9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d358b2bc57f9
Added Files:
geom/sql/Tests/T1.modules
geom/sql/Tests/T1.reqtests
geom/sql/Tests/T1.stable.err
geom/sql/Tests/T1.stable.out
geom/sql/Tests/T10.modules
geom/sql/Tests/T10.reqtests
geom/sql/Tests/T11.modules
geom/sql/Tests/T11.reqtests
geom/sql/Tests/T12.modules
geom/sql/Tests/T12.reqtests
geom/sql/Tests/T13.modules
geom/sql/Tests/T13.reqtests
geom/sql/Tests/T13.stable.err
geom/sql/Tests/T13.stable.out
geom/sql/Tests/T14.modules
geom/sql/Tests/T14.reqtests
geom/sql/Tests/T14.stable.err
geom/sql/Tests/T14.stable.out
geom/sql/Tests/T15.modules
geom/sql/Tests/T15.reqtests
geom/sql/Tests/T15.stable.err
geom/sql/Tests/T15.stable.out
geom/sql/Tests/T16.modules
geom/sql/Tests/T16.reqtests
geom/sql/Tests/T17.modules
geom/sql/Tests/T17.reqtests
geom/sql/Tests/T17.stable.err
geom/sql/Tests/T17.stable.out
geom/sql/Tests/T18.modules
geom/sql/Tests/T18.reqtests
geom/sql/Tests/T18.stable.err
geom/sql/Tests/T18.stable.out
geom/sql/Tests/T19.modules
geom/sql/Tests/T19.reqtests
geom/sql/Tests/T19.stable.err
geom/sql/Tests/T19.stable.out
geom/sql/Tests/T2.modules
geom/sql/Tests/T2.reqtests
geom/sql/Tests/T2.stable.err
geom/sql/Tests/T2.stable.out
geom/sql/Tests/T20.modules
geom/sql/Tests/T20.reqtests
geom/sql/Tests/T20.stable.err
geom/sql/Tests/T20.stable.out
geom/sql/Tests/T21.modules
geom/sql/Tests/T21.reqtests
geom/sql/Tests/T22.modules
geom/sql/Tests/T22.reqtests
geom/sql/Tests/T22.stable.err
geom/sql/Tests/T22.stable.out
geom/sql/Tests/T23.modules
geom/sql/Tests/T23.reqtests
geom/sql/Tests/T23.stable.err
geom/sql/Tests/T23.stable.out
geom/sql/Tests/T24.modules
geom/sql/Tests/T24.reqtests
geom/sql/Tests/T24.stable.err
geom/sql/Tests/T24.stable.out
geom/sql/Tests/T25.modules
geom/sql/Tests/T25.reqtests
geom/sql/Tests/T25.stable.err
geom/sql/Tests/T25.stable.out
geom/sql/Tests/T26.modules
geom/sql/Tests/T26.reqtests
geom/sql/Tests/T27.modules
geom/sql/Tests/T27.reqtests
geom/sql/Tests/T27.stable.err
geom/sql/Tests/T27.stable.out
geom/sql/Tests/T28.modules
geom/sql/Tests/T28.reqtests
geom/sql/Tests/T28.stable.err
geom/sql/Tests/T28.stable.out
geom/sql/Tests/T29.modules
geom/sql/Tests/T29.reqtests
geom/sql/Tests/T29.stable.err
geom/sql/Tests/T29.stable.out
geom/sql/Tests/T3.modules
geom/sql/Tests/T3.reqtests
geom/sql/Tests/T3.stable.err
geom/sql/Tests/T3.stable.out
geom/sql/Tests/T30.modules
geom/sql/Tests/T30.reqtests
geom/sql/Tests/T30.stable.err
geom/sql/Tests/T30.stable.out
geom/sql/Tests/T31.modules
geom/sql/Tests/T31.reqtests
geom/sql/Tests/T31.stable.err
geom/sql/Tests/T31.stable.out
geom/sql/Tests/T32.modules
geom/sql/Tests/T32.reqtests
geom/sql/Tests/T32.stable.err
geom/sql/Tests/T32.stable.out
geom/sql/Tests/T33.modules
geom/sql/Tests/T33.reqtests
geom/sql/Tests/T34.modules
geom/sql/Tests/T34.reqtests
geom/sql/Tests/T34.stable.err
geom/sql/Tests/T34.stable.out
geom/sql/Tests/T35.modules
geom/sql/Tests/T35.reqtests
geom/sql/Tests/T35.stable.err
geom/sql/Tests/T35.stable.out
geom/sql/Tests/T36.modules
geom/sql/Tests/T36.reqtests
geom/sql/Tests/T36.sql
geom/sql/Tests/T36.stable.err
geom/sql/Tests/T36.stable.out
geom/sql/Tests/T37.modules
geom/sql/Tests/T37.reqtests
geom/sql/Tests/T38.modules
geom/sql/Tests/T38.reqtests
geom/sql/Tests/T39.modules
geom/sql/Tests/T39.reqtests
geom/sql/Tests/T4.modules
geom/sql/Tests/T4.reqtests
geom/sql/Tests/T4.stable.err
geom/sql/Tests/T4.stable.out
geom/sql/Tests/T40.modules
geom/sql/Tests/T40.reqtests
geom/sql/Tests/T41.modules
geom/sql/Tests/T41.reqtests
geom/sql/Tests/T42.modules
geom/sql/Tests/T42.reqtests
geom/sql/Tests/T43.modules
geom/sql/Tests/T43.reqtests
geom/sql/Tests/T43.stable.err
geom/sql/Tests/T43.stable.out
geom/sql/Tests/T44.modules
geom/sql/Tests/T44.reqtests
geom/sql/Tests/T45.modules
geom/sql/Tests/T45.reqtests
geom/sql/Tests/T46.modules
geom/sql/Tests/T46.reqtests
geom/sql/Tests/T47.modules
geom/sql/Tests/T47.reqtests
geom/sql/Tests/T48.modules
geom/sql/Tests/T48.reqtests
geom/sql/Tests/T49.modules
geom/sql/Tests/T49.reqtests
geom/sql/Tests/T49.stable.err
geom/sql/Tests/T49.stable.out
geom/sql/Tests/T5.modules
geom/sql/Tests/T5.reqtests
geom/sql/Tests/T50.modules
geom/sql/Tests/T50.reqtests
geom/sql/Tests/T51.modules
geom/sql/Tests/T51.reqtests
geom/sql/Tests/T52.modules
geom/sql/Tests/T52.reqtests
geom/sql/Tests/T6.modules
geom/sql/Tests/T6.reqtests
geom/sql/Tests/T7.modules
geom/sql/Tests/T7.reqtests
geom/sql/Tests/T7.stable.err
geom/sql/Tests/T7.stable.out
geom/sql/Tests/T8.modules
geom/sql/Tests/T8.reqtests
geom/sql/Tests/T9.modules
geom/sql/Tests/T9.reqtests
geom/sql/Tests/T9.stable.err
geom/sql/Tests/T9.stable.out
geom/sql/Tests/binary.sql
geom/sql/Tests/binary.stable.err
geom/sql/Tests/binary.stable.out
geom/sql/Tests/conformance_drop.modules
geom/sql/Tests/conformance_drop.sql
geom/sql/Tests/conformance_drop.stable.err
geom/sql/Tests/conformance_drop.stable.out
geom/sql/Tests/conformance_load.modules
geom/sql/Tests/conformance_load.sql
geom/sql/Tests/conformance_load.stable.err
geom/sql/Tests/conformance_load.stable.out
geom/sql/Tests/normalized.sql
geom/sql/Tests/normalized.stable.err
geom/sql/Tests/normalized.stable.out
monetdb5/modules/mal/Tests/pqueueElim.mal
monetdb5/modules/mal/Tests/pqueueElim.stable.err
monetdb5/modules/mal/Tests/pqueueElim.stable.out
Removed Files:
geom/sql/Tests/ogc_conformance.sql
geom/sql/Tests/ogc_conformance.stable.err
geom/sql/Tests/ogc_conformance.stable.out
geom/sql/Tests/ogc_destroy.sql
geom/sql/Tests/ogc_destroy.stable.err
geom/sql/Tests/ogc_destroy.stable.out
geom/sql/Tests/ogc_dropconformance.sql
geom/sql/Tests/ogc_dropconformance.stable.err
geom/sql/Tests/ogc_dropconformance.stable.out
geom/sql/Tests/ogc_geometry.sql
geom/sql/Tests/ogc_load.sql
geom/sql/Tests/ogc_load.stable.err
geom/sql/Tests/ogc_load.stable.out
geom/sql/Tests/ogc_schema.sql
geom/sql/Tests/ogc_schema.stable.err
geom/sql/Tests/ogc_schema.stable.out
geom/sql/Tests/ogc_test.sql
geom/sql/Tests/ogc_test.stable.err
geom/sql/Tests/ogc_test.stable.out
Modified Files:
MonetDB.spec
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
buildtools/ChangeLog.Jan2014
buildtools/doc/windowsbuild.rst
clients/R/MonetDB.R/DESCRIPTION
clients/R/MonetDB.R/NAMESPACE
clients/R/MonetDB.R/NEWS
clients/R/MonetDB.R/R/monetdb.R
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures_gsl.stable.out
clients/Tests/MAL-signatures_nocfitsio.stable.out
clients/Tests/MAL-signatures_sphinxclient.stable.out
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.32bit
clients/Tests/SQL-dump.stable.out.64bit.oid32
clients/Tests/SQL-dump_gsl.stable.out
clients/Tests/SQL-dump_gsl.stable.out.oid32
clients/Tests/SQL-dump_nogeom.stable.out
clients/Tests/exports.stable.out
clients/mapiclient/tomograph.c
geom/sql/Tests/All
geom/sql/Tests/T1.sql
geom/sql/Tests/T10.sql
geom/sql/Tests/T10.stable.err
geom/sql/Tests/T10.stable.out
geom/sql/Tests/T11.sql
geom/sql/Tests/T11.stable.err
geom/sql/Tests/T11.stable.out
geom/sql/Tests/T12.sql
geom/sql/Tests/T12.stable.err
geom/sql/Tests/T12.stable.out
geom/sql/Tests/T13.sql
geom/sql/Tests/T14.sql
geom/sql/Tests/T15.sql
geom/sql/Tests/T16.sql
geom/sql/Tests/T16.stable.err
geom/sql/Tests/T16.stable.out
geom/sql/Tests/T17.sql
geom/sql/Tests/T18.sql
geom/sql/Tests/T19.sql
geom/sql/Tests/T2.sql
geom/sql/Tests/T20.sql
geom/sql/Tests/T21.sql
geom/sql/Tests/T21.stable.err
geom/sql/Tests/T21.stable.out
geom/sql/Tests/T22.sql
geom/sql/Tests/T23.sql
geom/sql/Tests/T24.sql
geom/sql/Tests/T25.sql
geom/sql/Tests/T26.sql
geom/sql/Tests/T26.stable.err
geom/sql/Tests/T26.stable.out
geom/sql/Tests/T27.sql
geom/sql/Tests/T28.sql
geom/sql/Tests/T29.sql
geom/sql/Tests/T3.sql
geom/sql/Tests/T30.sql
geom/sql/Tests/T31.sql
geom/sql/Tests/T32.sql
geom/sql/Tests/T33.sql
geom/sql/Tests/T33.stable.err
geom/sql/Tests/T33.stable.out
geom/sql/Tests/T34.sql
geom/sql/Tests/T35.sql
geom/sql/Tests/T37.sql
geom/sql/Tests/T37.stable.err
geom/sql/Tests/T37.stable.out
geom/sql/Tests/T38.sql
geom/sql/Tests/T38.stable.err
geom/sql/Tests/T38.stable.out
geom/sql/Tests/T39.sql
geom/sql/Tests/T39.stable.err
geom/sql/Tests/T39.stable.out
geom/sql/Tests/T4.sql
geom/sql/Tests/T40.sql
geom/sql/Tests/T40.stable.err
geom/sql/Tests/T40.stable.out
geom/sql/Tests/T41.sql
geom/sql/Tests/T41.stable.err
geom/sql/Tests/T41.stable.out
geom/sql/Tests/T42.sql
geom/sql/Tests/T42.stable.err
geom/sql/Tests/T42.stable.out
geom/sql/Tests/T43.sql
geom/sql/Tests/T44.sql
geom/sql/Tests/T44.stable.err
geom/sql/Tests/T44.stable.out
geom/sql/Tests/T45.sql
geom/sql/Tests/T45.stable.err
geom/sql/Tests/T45.stable.out
geom/sql/Tests/T46.sql
geom/sql/Tests/T46.stable.err
geom/sql/Tests/T46.stable.out
geom/sql/Tests/T47.sql
geom/sql/Tests/T47.stable.err
geom/sql/Tests/T47.stable.out
geom/sql/Tests/T48.sql
geom/sql/Tests/T48.stable.err
geom/sql/Tests/T48.stable.out
geom/sql/Tests/T49.sql
geom/sql/Tests/T5.sql
geom/sql/Tests/T5.stable.err
geom/sql/Tests/T5.stable.out
geom/sql/Tests/T50.sql
geom/sql/Tests/T50.stable.err
geom/sql/Tests/T50.stable.out
geom/sql/Tests/T51.sql
geom/sql/Tests/T51.stable.err
geom/sql/Tests/T51.stable.out
geom/sql/Tests/T52.sql
geom/sql/Tests/T52.stable.err
geom/sql/Tests/T52.stable.out
geom/sql/Tests/T6.sql
geom/sql/Tests/T6.stable.err
geom/sql/Tests/T6.stable.out
geom/sql/Tests/T7.sql
geom/sql/Tests/T8.sql
geom/sql/Tests/T8.stable.err
geom/sql/Tests/T8.stable.out
geom/sql/Tests/T9.sql
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/Tests/pqueue.mal
monetdb5/modules/mal/Tests/pqueue.stable.out
monetdb5/modules/mal/pqueue.c
monetdb5/modules/mal/pqueue.h
monetdb5/modules/mal/pqueue.mal
monetdb5/modules/mal/tokenizer.c
sql/backends/monet5/datacell/petrinet.c
sql/server/sql_mvc.c
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check0_nogeom.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5_nogeom.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/drop3_nogeom.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select1_nogeom.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/select2_nogeom.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp1_nogeom.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp2_nogeom.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/leaks/Tests/temp3_nogeom.stable.out
Branch: multifarm
Log Message:
Merge with default branch.
diffs (truncated from 52162 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -18,6 +18,24 @@
%define release %{buildno}%{?dist}%{?oidsuf}
+# On Fedora, the geos library is available, and so we can require it
+# and build the geom modules. On RedHat Enterprise Linux and
+# derivatives (CentOS, Scientific Linux), the geos library is not
+# available. However, the geos library is available in the Extra
+# Packages for Enterprise Linux (EPEL). If the _with_epel macro is
+# set, we assume that EPEL is available, and so we enable building the
+# geom modules. The _with_epel macro can be set when using mock by
+# passing it the flag --with epel.
+%if %{?rhel:1}%{!?rhel:0}
+%if %{?_with_epel:1}%{!?_with_epel:0}
+# RedHat Enterprise Linux and derivatives with EPEL enabled
+%define with_geos 1
+%endif
+%else
+# Fedora
+%define with_geos 1
+%endif
+
Name: %{name}
Version: %{version}
Release: %{release}
@@ -33,8 +51,7 @@ BuildRequires: bison
BuildRequires: bzip2-devel
# BuildRequires: cfitsio-devel
BuildRequires: flex
-%if %{?rhel:0}%{!?rhel:1}
-# no geos library on RedHat Enterprise Linux and derivatives
+%if %{?with_geos:1}%{!?with_geos:0}
BuildRequires: geos-devel >= 2.2.0
%endif
BuildRequires: gsl-devel
@@ -50,9 +67,13 @@ BuildRequires: python3-devel
%endif
# BuildRequires: raptor-devel >= 1.4.16
BuildRequires: readline-devel
+# On RedHat Enterprise Linux and derivatives (CentOS, Scientific
+# Linux), the rubygem-activerecord package is not available (also not
+# in the Extra Packages for Enterprise Linux EPEL), so it makes no
+# sense providing our ruby packages.
+%if %{?rhel:0}%{!?rhel:1}
BuildRequires: ruby
BuildRequires: rubygems
-%if %{?rhel:0}%{!?rhel:1}
BuildRequires: rubygems-devel
%endif
BuildRequires: unixODBC-devel
@@ -63,7 +84,6 @@ BuildRequires: zlib-devel
%if 0%{?rhel} && 0%{?rhel} <= 5
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%endif
-%{!?gem_dir: %global gem_dir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)}
%description
MonetDB is a database management system that is developed from a
@@ -294,10 +314,11 @@ program.
%defattr(-,root,root)
%{perl_vendorlib}/*
+%if %{?rhel:0}%{!?rhel:1}
%package -n rubygem-monetdb-sql
Summary: MonetDB ruby interface
Group: Applications/Databases
-Requires: ruby
+Requires: ruby(release)
Obsoletes: %{name}-client-ruby
BuildArch: noarch
@@ -322,7 +343,7 @@ program.
%package -n rubygem-activerecord-monetdb-adapter
Summary: MonetDB ruby interface
Group: Applications/Databases
-Requires: ruby
+Requires: ruby(release)
Requires: rubygem-activerecord
Requires: rubygem-monetdb-sql
BuildArch: noarch
@@ -343,6 +364,7 @@ This package contains the activerecord a
# %dir %{gem_dir}/gems/activerecord-monetdb-adapter-0.1
%{gem_dir}/gems/activerecord-monetdb-adapter-0.1
%{gem_dir}/specifications/activerecord-monetdb-adapter-0.1.gemspec
+%endif
%package client-tests
Summary: MonetDB Client tests package
@@ -381,7 +403,7 @@ developer.
%{_bindir}/sqlsample.php
%{_bindir}/sqlsample.pl
-%if %{?rhel:0}%{!?rhel:1}
+%if %{?with_geos:1}%{!?with_geos:0}
%package geom-MonetDB5
Summary: MonetDB5 SQL GIS support module
Group: Applications/Databases
@@ -495,7 +517,7 @@ fi
%{_libdir}/libmonetdb5.so.*
%dir %{_libdir}/monetdb5
%dir %{_libdir}/monetdb5/autoload
-%if %{?rhel:0}%{!?rhel:1}
+%if %{?with_geos:1}%{!?with_geos:0}
%exclude %{_libdir}/monetdb5/geom.mal
%endif
%exclude %{_libdir}/monetdb5/gsl.mal
@@ -510,7 +532,7 @@ fi
%{_libdir}/monetdb5/autoload/*_opt_sql_append.mal
%{_libdir}/monetdb5/autoload/*_udf.mal
%{_libdir}/monetdb5/autoload/*_vault.mal
-%if %{?rhel:0}%{!?rhel:1}
+%if %{?with_geos:1}%{!?with_geos:0}
%exclude %{_libdir}/monetdb5/lib_geom.so
%endif
%exclude %{_libdir}/monetdb5/lib_gsl.so
@@ -605,7 +627,7 @@ systemd-tmpfiles --create %{_sysconfdir}
%{_libdir}/monetdb5/lib_sql.so
%{_libdir}/monetdb5/*.sql
%dir %{_libdir}/monetdb5/createdb
-%if %{?rhel:0}%{!?rhel:1}
+%if %{?with_geos:1}%{!?with_geos:0}
%exclude %{_libdir}/monetdb5/createdb/*_geom.sql
%endif
%exclude %{_libdir}/monetdb5/createdb/*_gsl.sql
@@ -738,7 +760,7 @@ developer, but if you do want to test, t
--enable-developer=no \
--enable-fits=no \
--enable-gdk=yes \
- --enable-geom=%{?rhel:no}%{!?rhel:yes} \
+ --enable-geom=%{?with_geos:yes}%{!?with_geos:no} \
--enable-gsl=yes \
--enable-instrument=no \
--enable-jaql=yes \
@@ -755,7 +777,7 @@ developer, but if you do want to test, t
--enable-testing=yes \
--with-ant=no \
--with-bz2=yes \
- --with-geos=%{?rhel:no}%{!?rhel:yes} \
+ --with-geos=%{?with_geos:yes}%{!?with_geos:no} \
--with-hwcounters=no \
--with-java=no \
--with-mseed=no \
@@ -765,8 +787,8 @@ developer, but if you do want to test, t
--with-python2=yes \
--with-python3=%{?rhel:no}%{!?rhel:yes} \
--with-readline=yes \
- --with-rubygem=yes \
- --with-rubygem-dir="%{gem_dir}" \
+ --with-rubygem=%{?rhel:no}%{!?rhel:yes} \
+ --with-rubygem-dir=%{?rhel:no}%{!?rhel:"%{gem_dir}"} \
--with-sphinxclient=no \
--with-unixodbc=yes \
--with-valgrind=no \
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -231,7 +231,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268"
{
- "SourcePath" =
"8:C:\\Libraries\\geos-3.3.0.win32-vs10\\bin\\geos_c.dll"
+ "SourcePath" =
"8:C:\\Libraries\\geos-3.4.2.win32-vs10\\bin\\geos_c.dll"
"TargetName" = "8:geos_c.dll"
"Tag" = "8:"
"Folder" = "8:_4D9CE65EDD774551869CFD46B59B4F9E"
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -231,7 +231,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268"
{
- "SourcePath" =
"8:C:\\Libraries\\geos-3.3.0.win64-vs10\\bin\\geos_c.dll"
+ "SourcePath" =
"8:C:\\Libraries\\geos-3.4.2.win64-vs10\\bin\\geos_c.dll"
"TargetName" = "8:geos_c.dll"
"Tag" = "8:"
"Folder" = "8:_4D9CE65EDD774551869CFD46B59B4F9E"
diff --git a/buildtools/ChangeLog.Jan2014 b/buildtools/ChangeLog.Jan2014
--- a/buildtools/ChangeLog.Jan2014
+++ b/buildtools/ChangeLog.Jan2014
@@ -1,3 +1,7 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Mon Mar 24 2014 Sjoerd Mullender <sjo...@acm.org>
+- On Windows we now build the geom module against version 3.4.2 of the
+ geos library.
+
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -372,21 +372,23 @@ in the instructions.
.. The actual commands were::
autogen.bat
- nmake /f makefile.vc MSCV_VER=1600
+ nmake /f makefile.vc MSVC_VER=1600
+
+.. On Windows64, add WIN64=YES to the nmake command line.
After this, install the library somewhere, e.g. in
-``C:\geos-3.3.0.win32``::
+``C:\geos-3.4.2.win32``::
- mkdir C:\geos-3.3.0.win32
- mkdir C:\geos-3.3.0.win32\lib
- mkdir C:\geos-3.3.0.win32\bin
- mkdir C:\geos-3.3.0.win32\include
- mkdir C:\geos-3.3.0.win32\include\geos
- copy src\geos_c_i.lib C:\geos-3.3.0.win32\lib
- copy src\geos_c.dll C:\geos-3.3.0.win32\bin
- copy src\include C:\geos-3.3.0.win32\include
- copy src\include\geos C:\geos-3.3.0.win32\include\geos
- copy capi\geos_c.h C:\geos-3.3.0.win32\include
+ mkdir C:\geos-3.4.2.win32
+ mkdir C:\geos-3.4.2.win32\lib
+ mkdir C:\geos-3.4.2.win32\bin
+ mkdir C:\geos-3.4.2.win32\include
+ mkdir C:\geos-3.4.2.win32\include\geos
+ copy src\geos_c_i.lib C:\geos-3.4.2.win32\lib
+ copy src\geos_c.dll C:\geos-3.4.2.win32\bin
+ copy include C:\geos-3.4.2.win32\include
+ copy include\geos C:\geos-3.4.2.win32\include\geos
+ copy capi\geos_c.h C:\geos-3.4.2.win32\include
__ http://geos.refractions.net/
__ http://trac.osgeo.org/geos/wiki/BuildingOnWindowsWithNMake
diff --git a/clients/R/MonetDB.R/DESCRIPTION b/clients/R/MonetDB.R/DESCRIPTION
--- a/clients/R/MonetDB.R/DESCRIPTION
+++ b/clients/R/MonetDB.R/DESCRIPTION
@@ -1,11 +1,11 @@
Package: MonetDB.R
-Version: 0.9.1
-Date: 2013-03-06
+Version: 0.9.2
+Date: 2013-03-18
Title: Connect MonetDB to R
Authors@R: c(person("Hannes Muehleisen", role = c("aut", "cre"),email =
"han...@cwi.nl"),
person("Thomas Lumley", role = "ctb"),
person("Anthony Damico", role = "ctb"))
-Depends: DBI (>= 0.2-5), digest (>= 0.6.0), methods
+Depends: DBI (>= 0.2-7), digest (>= 0.6.4), methods
Description: Allows to pull data from MonetDB into R
License: MPL (== 1.1)
URL: http://monetr.r-forge.r-project.org
diff --git a/clients/R/MonetDB.R/NAMESPACE b/clients/R/MonetDB.R/NAMESPACE
--- a/clients/R/MonetDB.R/NAMESPACE
+++ b/clients/R/MonetDB.R/NAMESPACE
@@ -7,6 +7,7 @@ export(monet.read.csv,monetdb.read.csv)
exportMethods(dbSendUpdate,dbSendUpdateAsync,dbTransaction)
export(monetdbGetTransferredBytes)
export(monetdbRtype)
+export(monetdb_queryinfo)
# shorthand for db connections
export(mc)
diff --git a/clients/R/MonetDB.R/NEWS b/clients/R/MonetDB.R/NEWS
--- a/clients/R/MonetDB.R/NEWS
+++ b/clients/R/MonetDB.R/NEWS
@@ -1,3 +1,7 @@
+0.9.2
+- monetdb_queryinfo method to find out things about an arbitrary query cheaply
+- new option monetdb.sequential
+
0.9.1
- dbGetInfo() now supported on MonetDBConnection (dplyr compatibility)
- dbTransaction(), dbCommit() and dbRollback() support
diff --git a/clients/R/MonetDB.R/R/monetdb.R b/clients/R/MonetDB.R/R/monetdb.R
--- a/clients/R/MonetDB.R/R/monetdb.R
+++ b/clients/R/MonetDB.R/R/monetdb.R
@@ -26,7 +26,7 @@ MonetR <- MonetDB <- MonetDBR <- MonetDB
setMethod("dbGetInfo", "MonetDBDriver", def=function(dbObj, ...)
list(name="MonetDBDriver",
driver.version="0.9.1",
- DBI.version="0.2-5",
+ DBI.version="0.2-7",
client.version=NA,
max.connections=NA)
)
@@ -36,6 +36,14 @@ mc <- function(dbname="demo", user="mone
dbConnect(MonetDB.R(),dbname,user,password,host,port,timeout,wait,language,...)
}
+# TODO: document, export etc
+mq <- function(db,query,...) {
+ conn <- mc(db,...)
+ res <- dbGetQuery(conn,query)
+ dbDisconnect(conn)
+ return(res)
+}
+
setMethod("dbConnect", "MonetDBDriver", def=function(drv,dbname="demo",
user="monetdb", password="monetdb", host="localhost",port=50000L,
timeout=86400L, wait=FALSE,language="sql",...,url="") {
if (substring(url,1,10) == "monetdb://") {
dbname <- url
@@ -68,17 +76,10 @@ setMethod("dbConnect", "MonetDBDriver",
continue <- FALSE
tryCatch ({
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
