Changeset: 3fa9ed477708 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3fa9ed477708
Modified Files:
tools/embedded/build-rpkg.sh
tools/embedded/pkg-excludes
tools/embedded/windows/pmc.sh
Branch: embedded
Log Message:
more packagin fun
diffs (56 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
@@ -14,6 +14,7 @@ echo "SUBDIRS = embedded" > tools/Makefi
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
+sed -i "/^SUBDIRS = .*/d" sql/backends/Makefile.ag
./bootstrap
# we need this directory since sql/server depends on it
@@ -24,17 +25,15 @@ rsync -av --exclude-from sourcetree/tool
# generate sql_parser.tab.c/h to remove our dependency on bison on Windows.
cd sourcetree
./configure
-make sql/server/sql_parser.tab.h
-make sql/server/sql_parser.tab.c
-cd ..
-cpsh
+cd sql/server/
+make sql_parser.tab.h
+make sql_parser.tab.c
+cd ../../../
cp sourcetree/sql/server/sql_parser.tab.* rpackage/src/tools/embedded/windows/
# bundle pcre for windows (TODO: also iconv/zlib/ ...?)
wget http://dev.monetdb.org/downloads/Windows/Libraries/libs-win64.zip
-umask 666
-unzip libs-win64.zip
-umask 644
+7z x libs-win64.zip
cp -r pcre-8.37.win64 rpackage/src/tools/embedded/windows/
mkdir -p rpackage/src/monetdb5/extras/rapi
diff --git a/tools/embedded/pkg-excludes b/tools/embedded/pkg-excludes
--- a/tools/embedded/pkg-excludes
+++ b/tools/embedded/pkg-excludes
@@ -31,7 +31,7 @@ winredist/*.dll
winredist/*.cpl
/.hg_archival.txt
.hgeol
-/MacOSX/MonetDB logo.png
+/MacOSX/
/tools/merovingian
/tools/mserver
/clients/examples
diff --git a/tools/embedded/windows/pmc.sh b/tools/embedded/windows/pmc.sh
--- a/tools/embedded/windows/pmc.sh
+++ b/tools/embedded/windows/pmc.sh
@@ -9,4 +9,6 @@ else
fi
touch config.status
cp tools/embedded/windows/sql_parser.tab.* sql/server/
+cp tools/embedded/windows/monetdb_config.h.in .
+
# TODO: add source paths to sedscript
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
