Changeset: f1415baa672c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f1415baa672c Modified Files: tools/embedded/build-rpkg.sh Branch: embedded Log Message:
Build fixes diffs (19 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 @@ -29,13 +29,13 @@ export R_PACKAGE_DIR=$STAGEDIR/dummytarg mkdir $R_PACKAGE_DIR # install a build in the dummytarget dir to collect mal/sql scripts # need these two files so the dummy build goes through, they are generated later -touch sourcetree/monetdb5/mal/mal_init_inline.h # sourcetree/sql/backends/monet5/createdb_inline.h +echo "char* mal_init_inline = NULL;" > sourcetree/monetdb5/mal/mal_init_inline.h # sourcetree/sql/backends/monet5/createdb_inline.h # run dummy build ./rpackage/configure # steal the sql parser files cp sourcetree/sql/server/sql_parser.tab.* rpackage/src/sql/server/ # inline mal/sql scripts, we need R with the stringr package for that -python sourcetree/tools/embedded/inline.py --args dummytarget/libs/monetdb5/ rpackage/src/monetdb5/mal/mal_init_inline.h +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 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
