Changeset: 7798eb24441a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7798eb24441a Removed Files: tools/reverserapi/src Modified Files: tools/embedded/build-tarball.sh tools/reverserapi/configure Branch: embedded Log Message:
Build setup mc diffs (64 lines): diff --git a/tools/embedded/build-tarball.sh b/tools/embedded/build-tarball.sh --- a/tools/embedded/build-tarball.sh +++ b/tools/embedded/build-tarball.sh @@ -3,14 +3,29 @@ set -x TARBALL=/tmp/embedded.tgz STAGEDIR=/tmp/monetdb-embedded-tarball +RPKG=MonetDB_1.0.0.tar.gz rm -rf $TARBALL rm -rf $STAGEDIR + hg archive $STAGEDIR + cd $STAGEDIR ./bootstrap + tar --exclude-from=tools/embedded/tar-excludes -zcvf $TARBALL . scp $TARBALL lyon.ins.cwi.nl:/cwi/www/homepages/hannes/WWW/R +R CMD build tools/reverserapi +scp $RPKG lyon.ins.cwi.nl:/cwi/www/homepages/hannes/WWW/R + +rm -rf $TARBALL +rm -rf $STAGEDIR + +# install.packages("MonetDB", repos="http://homepages.cwi.nl/~hannes/R/", type="source") + +# OSX 10.10 check (check vanilla!) +# ubuntu 14.04.02: needs bison libssl-dev libxml2-dev +# fedora 22: bison openssl-devel libxml2-devel diff --git a/tools/reverserapi/configure b/tools/reverserapi/configure --- a/tools/reverserapi/configure +++ b/tools/reverserapi/configure @@ -1,6 +1,11 @@ #!/bin/sh +curl http://homepages.cwi.nl/~hannes/R/embedded.tgz > arch.tgz +rm -rf src +mkdir src +tar xvf arch.tgz -C src +rm arch.tgz cd src -# TODO wget/unpack MonetDB here? Once embedded-lib is in release... + CFLAGS="-I$R_INCLUDE_DIR" ./configure --prefix=$R_PACKAGE_DIR/install \ --enable-embedded --disable-fits --disable-geom --disable-rintegration --disable-gsl --disable-netcdf \ --disable-jdbc --disable-merocontrol --disable-odbc --disable-console --disable-microhttpd \ @@ -8,7 +13,6 @@ CFLAGS="-I$R_INCLUDE_DIR" ./configure -- --without-samtools --without-sphinxclient --without-geos --without-samtools --without-readline \ --enable-optimize --enable-silent-rules - # Dirty hack, normally R would call make, but we need to also do a make install to get the libs in place. # So we do it ourselves instead and then render the MonetDB makefile inert. make -j clean install diff --git a/tools/reverserapi/src b/tools/reverserapi/src deleted file mode 120000 --- a/tools/reverserapi/src +++ /dev/null @@ -1,1 +0,0 @@ -../.. \ No newline at end of file _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list