Changeset: 8fa247684a11 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8fa247684a11 Added Files: tools/embedded/rpackage/configure.win Modified Files: clients/Makefile.ag tools/Makefile.ag tools/embedded/Tests/embedded-test.R tools/embedded/build-rpkg.sh tools/embedded/pkg-excludes Branch: embedded Log Message:
File exclusions to get package size down diffs (170 lines): diff --git a/clients/Makefile.ag b/clients/Makefile.ag --- a/clients/Makefile.ag +++ b/clients/Makefile.ag @@ -1,9 +1,1 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 2008-2015 MonetDB B.V. - -SUBDIRS = mapilib mapiclient HAVE_ODBC?odbc HAVE_PERL?perl php HAVE_RUBYGEM?ruby examples HAVE_PYTHON2?python2 HAVE_PYTHON3?python3 NATIVE_WIN32?NT - -EXTRA_DIST_DIR = Tests R nodejs +SUBDIRS = mapilib diff --git a/tools/Makefile.ag b/tools/Makefile.ag --- a/tools/Makefile.ag +++ b/tools/Makefile.ag @@ -1,7 +1,1 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 2008-2015 MonetDB B.V. - -SUBDIRS = HAVE_MONETDB5?mserver NOT_WIN32?merovingian HAVE_EMBEDDED?embedded +SUBDIRS = embedded diff --git a/tools/embedded/Tests/embedded-test.R b/tools/embedded/Tests/embedded-test.R --- a/tools/embedded/Tests/embedded-test.R +++ b/tools/embedded/Tests/embedded-test.R @@ -27,6 +27,3 @@ monetdb_embedded_query("COPY INTO lineit monetdb_embedded_query("SELECT * FROM lineitem LIMIT 10;") monetdb_embedded_query("SELECT COUNT(*) FROM lineitem") monetdb_embedded_query("DROP TABLE lineitem"); - - -#install.packages("~/source/monetdb-embedded/tools/reverserapi/", repos=NULL) 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 @@ -8,11 +8,21 @@ rm -rf $STAGEDIR hg archive $STAGEDIR/sourcetree cd $STAGEDIR/sourcetree + +# patch build system to only include things we need +echo "SUBDIRS = embedded" > tools/Makefile.ag +echo "SUBDIRS = mapilib" > clients/Makefile.ag +echo "SUBDIRS = mal modules optimizer scheduler tools" > monetdb5/Makefile.ag +echo "SUBDIRS = buildtools common clients gdk monetdb5 sql tools\nEXTRA_DIST = bootstrap configure configure.ac configure.ag libversions rpm.mk.in\nheaders_config = {\nDIR = includedir/monetdb\nHEADERS = h\nSOURCES = monetdb_config.h\n}\n" > Makefile.ag + ./bootstrap +# we need this directory since sql/server depends on it cd .. mv sourcetree/tools/embedded/rpackage . rsync -av --exclude-from sourcetree/tools/embedded/pkg-excludes sourcetree/ rpackage/src +mkdir -p rpackage/src/monetdb5/extras/rapi +touch rpackage/src/monetdb5/extras/rapi/placeholder R CMD build rpackage scp $RPKG lyon.ins.cwi.nl:/cwi/www/homepages/hannes/WWW/R diff --git a/tools/embedded/pkg-excludes b/tools/embedded/pkg-excludes --- a/tools/embedded/pkg-excludes +++ b/tools/embedded/pkg-excludes @@ -1,48 +1,52 @@ -sql/test -sql/benchmarks -autom4te.cache -debian/ -clients/mapiclient/Tests -clients/nodejs/Tests -clients/R/Tests -clients/Tests -geom/BugTracker/Tests -geom/sql/Tests -monetdb5/extras/mal_optimizer_template/Tests -monetdb5/extras/rapi/Tests -monetdb5/mal/Tests -monetdb5/modules/atoms/Tests -monetdb5/modules/kernel/Tests -monetdb5/modules/mal/Tests -monetdb5/optimizer/Tests -monetdb5/scheduler/Tests -monetdb5/tests -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/Tests -sql/backends/monet5/UDF/Tests -sql/backends/monet5/vaults/Tests -sql/benchmarks/arno/Tests -sql/benchmarks/arno_flt/Tests -sql/benchmarks/ATIS/Tests -sql/benchmarks/blob/Tests -sql/benchmarks/moa/Tests -sql/benchmarks/nobench/Tests -sql/benchmarks/ssbm/Tests -sql/benchmarks/tpch/fileleak/Tests -sql/benchmarks/tpch/LOCKED/Tests -sql/benchmarks/tpch/Tests -sql/benchmarks/viam/Tests -sql/benchmarks/wisconsin/Tests -sql/gis/Tests -sql/jdbc/tests/Tests -sql/odbc/samples/Tests -sql/test -tools/embedded/Tests -java/jdbc-*.pdf +/sql/test +/sql/benchmarks +/autom4te.cache +/debian/ +/clients/mapiclient/Tests +/clients/Tests +/monetdb5/mal/Tests +/monetdb5/modules/atoms/Tests +/monetdb5/modules/kernel/Tests +/monetdb5/modules/mal/Tests +/monetdb5/optimizer/Tests +/monetdb5/scheduler/Tests +/monetdb5/tests +/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/Tests +/sql/backends/monet5/UDF/Tests +/sql/backends/monet5/vaults/Tests +/sql/benchmarks/* +/sql/gis/Tests +/sql/jdbc/tests/Tests +/sql/odbc/samples/Tests +/sql/test/* +/tools/embedded/Tests BAMRecipe.pdf -clients/odbc/doc/ bam/*.png +winredist/*.dll +winredist/*.cpl +/.hg_archival.txt +.hgeol +/MacOSX/MonetDB logo.png +/tools/merovingian +/tools/mserver +/clients/examples +/clients/mapiclient +/clients/nodejs +/clients/NT +/clients/odbc +/clients/perl +/clients/php +/clients/python2 +/clients/python3 +/clients/R +/clients/ruby +/monetdb5/extras +/java/ +/testing/ +/geos/ +/NT/ diff --git a/tools/embedded/rpackage/configure.win b/tools/embedded/rpackage/configure.win new file mode 100644 --- /dev/null +++ b/tools/embedded/rpackage/configure.win @@ -0,0 +1,2 @@ +# When configure.win is run the environment variables R_HOME (which uses â/â as the file separator), R_ARCH and Use R_ARCH_BIN will be set. Use R_ARCH to decide if this is a 64-bit build (its value there is â/x64â) and to install DLLs to the correct place (${R_HOME}/libs${R_ARCH}). Use R_ARCH_BIN to find the correct place under the bin directory, e.g. ${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe. + _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
