Changeset: 6f41b302032c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6f41b302032c
Modified Files:
tools/embedded/rpackage/R/monetdb.R
tools/embedded/rpackage/configure
tools/embedded/rpackage/configure.win
Branch: embedded
Log Message:
library loading updates
diffs (108 lines):
diff --git a/tools/embedded/rpackage/R/monetdb.R
b/tools/embedded/rpackage/R/monetdb.R
--- a/tools/embedded/rpackage/R/monetdb.R
+++ b/tools/embedded/rpackage/R/monetdb.R
@@ -4,8 +4,10 @@ monetdb_embedded_env <- new.env(parent=e
monetdb_embedded_env$is_started <- FALSE
monetdb_embedded_env$started_dir <- ""
+libfilename <- "libmonetdb5"
+
.onLoad <- function(libname, pkgname){
- library.dynam("MonetDBLite", pkgname, lib.loc=libname, now=T, local=F)
+ library.dynam(libfilename, pkgname, lib.loc=libname, now=T, local=F)
}
classname <- "monetdb_embedded_connection"
@@ -24,7 +26,7 @@ monetdb_embedded_startup <- function(dir
}
dir <- normalizePath(dir)
if (!monetdb_embedded_env$is_started) {
- res <- .Call("monetdb_startup_R", dir, quiet,
PACKAGE="MonetDBLite")
+ res <- .Call("monetdb_startup_R", dir, quiet,
PACKAGE=libfilename)
} else {
if (dir != monetdb_embedded_env$started_dir) {
stop("MonetDBLite cannot change database directories
(already started in ", monetdb_embedded_env$started_dir, ", restart R).")
@@ -54,7 +56,7 @@ monetdb_embedded_query <- function(conn,
}
# make sure the query is terminated
query <- paste(query, "\n;", sep="")
- res <- .Call("monetdb_query_R", conn, query, notreally,
PACKAGE="MonetDBLite")
+ res <- .Call("monetdb_query_R", conn, query, notreally,
PACKAGE=libfilename)
resp <- list()
if (is.character(res)) { # error
@@ -90,7 +92,7 @@ monetdb_embedded_append <- function(conn
if (!inherits(conn, classname)) {
stop("Need a embedded monetdb connection as parameter")
}
- .Call("monetdb_append_R", conn, schema, table, tdata,
PACKAGE="MonetDBLite")
+ .Call("monetdb_append_R", conn, schema, table, tdata,
PACKAGE=libfilename)
}
@@ -98,7 +100,7 @@ monetdb_embedded_connect <- function() {
if (!monetdb_embedded_env$is_started) {
stop("Call monetdb_embedded_startup() first")
}
- res <- .Call("monetdb_connect_R", PACKAGE="MonetDBLite")
+ res <- .Call("monetdb_connect_R", PACKAGE=libfilename)
class(res) <- classname
return(res)
}
@@ -107,12 +109,12 @@ monetdb_embedded_disconnect <- function(
if (!inherits(conn, classname)) {
stop("Need a embedded monetdb connection as parameter")
}
- .Call("monetdb_disconnect_R", conn, PACKAGE="MonetDBLite")
+ .Call("monetdb_disconnect_R", conn, PACKAGE=libfilename)
return(invisible(TRUE))
}
monetdb_embedded_shutdown <- function() {
- .Call("monetdb_shutdown_R", PACKAGE="MonetDBLite")
+ .Call("monetdb_shutdown_R", PACKAGE=libfilename)
monetdb_embedded_env$is_started <- FALSE
monetdb_embedded_env$started_dir <- ""
return(invisible(TRUE))
diff --git a/tools/embedded/rpackage/configure
b/tools/embedded/rpackage/configure
--- a/tools/embedded/rpackage/configure
+++ b/tools/embedded/rpackage/configure
@@ -10,12 +10,12 @@ CFLAGS="-I$R_INCLUDE_DIR" ./configure --
# Dirty hack, normally R would call make, but we need to also glue everything
together.
# So we do it ourselves instead and then render the MonetDB makefile inert.
-make -k -j
+make -j
echo -e "dummytarget:\n\ttrue\n" > Makefile
# and finally put the embedded library where R expects it
-RDYNLIB=$R_PACKAGE_DIR/libs/MonetDBLite.so
+RDYNLIB=$R_PACKAGE_DIR/libs/libmonetdb5.so
mkdir -p $R_PACKAGE_DIR/libs
OFILES=`find common clients/mapilib/ gdk monetdb5/mal monetdb5/modules
monetdb5/optimizer sql tools/embedded -name "*.o" | tr "\n" " "`
diff --git a/tools/embedded/rpackage/configure.win
b/tools/embedded/rpackage/configure.win
--- a/tools/embedded/rpackage/configure.win
+++ b/tools/embedded/rpackage/configure.win
@@ -11,15 +11,15 @@ cp src/tools/embedded/windows/monetdb_co
sh src/tools/embedded/windows/pmc.sh
# download/unpack some dependencies
-R --quiet -e
"download.file('http://dev.monetdb.org/Assets/R/misc/msvcr100.dll',
'src/tools/embedded/windows/msvcr100.dll')"
-R --quiet -e "setwd('src/tools/embedded/windows/'); tf <- tempfile();
download.file('http://dev.monetdb.org/Assets/R/misc/pcre-8.37.zip', tf);
unzip(tf)"
+R --quiet -e
"download.file('http://dev.monetdb.org/Assets/R/misc/msvcr100.dll',
'src/tools/embedded/windows/msvcr100.dll', mode='wb')"
+R --quiet -e "setwd('src/tools/embedded/windows/'); tf <- tempfile();
download.file('http://dev.monetdb.org/Assets/R/misc/pcre-8.37.zip', tf,
mode='wb'); unzip(tf)"
cd src
-make
+make -j
OFILES=`find common clients/mapilib/ gdk monetdb5/mal monetdb5/modules
monetdb5/optimizer sql tools/embedded -name "*.lo" | tr "\n" " "`
-rm MonetDBLite.dll
-gcc -shared -m64 -o MonetDBLite.dll $OFILES -lws2_32 -lpthread -lpsapi
-Ltools/embedded/windows/pcre-8.37/libs/x64/ -lpcre `R CMD config --ldflags`
+rm libmonetdb5.dll
+gcc -shared -m64 -o libmonetdb5.dll $OFILES -lws2_32 -lpthread -lpsapi
-Ltools/embedded/windows/pcre-8.37/libs/x64/ -lpcre `R CMD config --ldflags`
cd ../
mkdir -p $R_PACKAGE_DIR/libs/x64
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
