Changeset: ad79ed6ebcf9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad79ed6ebcf9
Modified Files:
tools/embedded/build-rpkg.sh
tools/embedded/embeddedr.c
tools/embedded/encode.R
tools/embedded/pkg-excludes
Branch: embedded
Log Message:
Excluded more things from MonetDBLite
diffs (81 lines):
diff --git a/tools/embedded/build-rpkg.sh b/tools/embedded/build-rpkg.sh
--- a/tools/embedded/build-rpkg.sh
+++ b/tools/embedded/build-rpkg.sh
@@ -22,6 +22,9 @@ cd ..
mv sourcetree/tools/embedded/rpackage .
rsync -av --exclude-from sourcetree/tools/embedded/pkg-excludes sourcetree/
rpackage/src
+# binarize all MAL/SQL scripts
+R --slave -f rpackage/src/tools/embedded/encode.R --args rpackage/src/
rpackage/src/tools/embedded/include_files.h
+
# generate sql_parser.tab.c/h to remove our dependency on bison.
cd sourcetree
./configure
diff --git a/tools/embedded/embeddedr.c b/tools/embedded/embeddedr.c
--- a/tools/embedded/embeddedr.c
+++ b/tools/embedded/embeddedr.c
@@ -135,7 +135,7 @@ SEXP monetdb_append_R(SEXP connsexp, SEX
SEXP monetdb_connect_R() {
SEXP conn = PROTECT(R_MakeExternalPtr(
monetdb_connect(), R_NilValue, R_NilValue));
- R_RegisterCFinalizer(conn, monetdb_disconnect_R);
+ R_RegisterCFinalizer(conn, (void (*)(SEXP)) monetdb_disconnect_R);
UNPROTECT(1);
return conn;
}
diff --git a/tools/embedded/encode.R b/tools/embedded/encode.R
--- a/tools/embedded/encode.R
+++ b/tools/embedded/encode.R
@@ -7,10 +7,12 @@ con <- file(args[2], open="wb"); fidx <-
ct <- function(x, ...) cat(x, file=con, append=T, ...)
ct("char* include_file_data[] = {\n")
for (mf in makefiles) {
+ message("Processing ", mf)
instfiles <- stringr::str_extract_all(
readChar(mf, file.info(mf)$size), "\\w+\\.(mal|sql)")[[1]]
for (instf in file.path(dirname(mf), instfiles)) {
ct("\"\\x")
+ message("Including ", instf, " into ", args[2])
ct(readBin(instf, what="raw", n=file.info(instf)$size),
sep="\\x")
ct("\\0\",\n")
}
@@ -19,3 +21,13 @@ for (mf in makefiles) {
ct("NULL};\nchar* include_file_name[] = {\"")
ct(as.character(fidx), sep="\",\"")
ct("\",NULL};\n")
+ct("char* include_file_get(char* fname) {
+ size_t i = 0;
+ while(1) {
+ if (include_file_name[i] == NULL) break;
+ if (strncmp(fname, include_file_name[i],
strlen(include_file_name[i])) == 0)
+ return include_file_data[i];
+ i++;
+ }
+ return NULL;
+}\n")
diff --git a/tools/embedded/pkg-excludes b/tools/embedded/pkg-excludes
--- a/tools/embedded/pkg-excludes
+++ b/tools/embedded/pkg-excludes
@@ -14,11 +14,11 @@
/monetdb5/tools/Tests
/sql/backends/monet5/bam/Tests
/sql/backends/monet5/generator/Tests
-/sql/backends/monet5/gsl/Tests
-/sql/backends/monet5/LSST/Tests
+/sql/backends/monet5/gsl
+/sql/backends/monet5/LSST
/sql/backends/monet5/Tests
-/sql/backends/monet5/UDF/Tests
-/sql/backends/monet5/vaults/Tests
+/sql/backends/monet5/UDF
+/sql/backends/monet5/vaults
/sql/benchmarks/*
/sql/gis/Tests
/sql/jdbc/tests/Tests
@@ -50,5 +50,5 @@ winredist/*.cpl
/monetdb5/extras/sphinx
/java/
/testing/
-/geos/
+/geom/
/NT/
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
