Changeset: 096526b63d8f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=096526b63d8f Modified Files: tools/embedded/build-rpkg.sh tools/embedded/rpackage/configure.win Branch: embedded Log Message:
no longer bundling dll's in source package diffs (31 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 @@ -35,13 +35,6 @@ export R_INCLUDE_DIR=`R CMD config --cpp # # inline mal/sql scripts, we need R with the stringr package for that # python sourcetree/tools/embedded/inline.py dummytarget/libs/monetdb5/ rpackage/src/monetdb5/mal/mal_init_inline.h -# bundle pcre for windows -wget http://dev.monetdb.org/Assets/R/misc/pcre-8.37.zip -unzip pcre-8.37.zip -mv pcre-8.37 rpackage/src/tools/embedded/windows/ -wget http://dev.monetdb.org/Assets/R/misc/msvcr100.dll -mv msvcr100.dll rpackage/src/tools/embedded/windows/ - mkdir -p rpackage/src/monetdb5/extras/rapi touch rpackage/src/monetdb5/extras/rapi/placeholder 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 @@ -10,6 +10,10 @@ cp src/tools/embedded/windows/monetdb_co # pmc stands for "poor man's configure", it does something similar using the sedscript 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)" + cd src make OFILES=`find common clients/mapilib/ gdk monetdb5/mal monetdb5/modules monetdb5/optimizer sql tools/embedded -name "*.lo" | tr "\n" " "` _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
