Changeset: 11e0ceabe728 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=11e0ceabe728
Added Files:
tools/embedded/build-rpkg.sh
tools/embedded/pkg-excludes
Removed Files:
tools/embedded/build-tarball.sh
tools/embedded/tar-excludes
Modified Files:
tools/reverserapi/configure
Branch: embedded
Log Message:
Fat package
diffs (64 lines):
diff --git a/tools/embedded/build-tarball.sh b/tools/embedded/build-rpkg.sh
rename from tools/embedded/build-tarball.sh
rename to tools/embedded/build-rpkg.sh
--- a/tools/embedded/build-tarball.sh
+++ b/tools/embedded/build-rpkg.sh
@@ -1,29 +1,27 @@
#!/bin/sh
set -x
-TARBALL=/tmp/embedded.tgz
-STAGEDIR=/tmp/monetdb-embedded-tarball
+STAGEDIR=/tmp/monetdb-embedded-stage
RPKG=MonetDB_1.0.0.tar.gz
rm -rf $TARBALL
rm -rf $STAGEDIR
-hg archive $STAGEDIR
+hg archive $STAGEDIR/sourcetree
-cd $STAGEDIR
+cd $STAGEDIR/sourcetree
./bootstrap
-tar --exclude-from=tools/embedded/tar-excludes -zcvf $TARBALL .
+#tar --exclude-from=tools/embedded/tar-excludes -zcvf $TARBALL .
-scp $TARBALL lyon.ins.cwi.nl:/cwi/www/homepages/hannes/WWW/R
+cd ..
+mv sourcetree/tools/reverserapi .
+rsync -av --exclude-from sourcetree/tools/embedded/pkg-excludes sourcetree/
reverserapi/src
-R CMD build tools/reverserapi
+R CMD build 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!)
diff --git a/tools/embedded/tar-excludes b/tools/embedded/pkg-excludes
rename from tools/embedded/tar-excludes
rename to tools/embedded/pkg-excludes
diff --git a/tools/reverserapi/configure b/tools/reverserapi/configure
--- a/tools/reverserapi/configure
+++ b/tools/reverserapi/configure
@@ -1,9 +1,9 @@
#!/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
+# 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
CFLAGS="-I$R_INCLUDE_DIR" ./configure --prefix=$R_PACKAGE_DIR/install \
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
