Changeset: 23c258aeba9f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=23c258aeba9f
Modified Files:
geom/RunMtest.bat.in
geom/RunMtest.in
sql/RunMtest.bat.in
sql/RunMtest.in
Branch: default
Log Message:
enable auto-loading of SQL createdb scripts with `make check`, i.e., before
`make install`
diffs (77 lines):
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -29,6 +29,10 @@
if not exist %builddir%\monetdb%V%\autoload mkdir
%builddir%\monetdb%V%\autoload
copy /y %srcdir%\monetdb%V%\??_*.mal %builddir%\monetdb%V%\autoload
+REM enable auto-loading of SQL createdb scripts before `make install`
+if not exist %builddir%\sql\createdb mkdir %builddir%\sql\createdb
+copy /y %srcdir%\sql\??_*.sql %builddir%\sql\createdb
+
if not %V% == 4 goto skip_4
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\plain\.libs
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\plain
@@ -52,6 +56,10 @@
if not exist %buildbase%\sql\backends\monet5\autoload mkdir
%buildbase%\sql\backends\monet5\autoload
copy /y %srcdir%\..\sql\backends\monet5\??_*.mal
%buildbase%\sql\backends\monet5\autoload
+REM enable auto-loading of SQL createdb scripts before `make install`
+if not exist %buildbase%\sql\sql\createdb mkdir %buildbase%\sql\sql\createdb
+copy /y %srcdir%\..\sql\sql\??_*.sql %buildbase%\sql\sql\createdb
+
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\compiler\.libs
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\compiler
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer\.libs
diff --git a/geom/RunMtest.in b/geom/RunMtest.in
--- a/geom/RunMtest.in
+++ b/geom/RunMtest.in
@@ -46,6 +46,10 @@
cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${builddir}/$d/autoload/ 2>/dev/null
done
+# enable auto-loading of SQL createdb scripts before `make install`
+mkdir -p ${builddir}/sql/createdb
+cp -f ${srcdir}/sql/[0-9][0-9]_*.sql ${builddir}/sql/createdb/ 2>/dev/null
+
case "$V" in
4)
# where compiled monetdb4 modules are to be found
@@ -64,6 +68,9 @@
mkdir -p ${buildbase}/sql/$d/autoload
cp -f ${srcdir}/../sql/$d/[0-9][0-9]_*.mal
${buildbase}/sql/$d/autoload/ 2>/dev/null
done
+# enable auto-loading of SQL createdb scripts before `make install`
+mkdir -p ${buildbase}/sql/sql/createdb
+cp -f ${srcdir}/../sql/sql/[0-9][0-9]_*.sql ${buildbase}/sql/sql/createdb/
2>/dev/null
# where compiled monetdb5 modules are to be found
for d in compiler optimizer scheduler modules/atoms modules/kernel modules/mal
modules/mal/crackers modules/mal/rdf
do
diff --git a/sql/RunMtest.bat.in b/sql/RunMtest.bat.in
--- a/sql/RunMtest.bat.in
+++ b/sql/RunMtest.bat.in
@@ -21,6 +21,10 @@
if not exist %builddir%\backends\monet5\autoload mkdir
%builddir%\backends\monet5\autoload
copy /y %srcdir%\backends\monet5\??_*.mal %builddir%\backends\monet5\autoload
+REM enable auto-loading of SQL createdb scripts before `make install`
+if not exist %builddir%\sql\createdb mkdir %builddir%\sql\createdb
+copy /y %srcdir%\sql\??_*.sql %builddir%\sql\createdb
+
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\compiler\.libs
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\compiler
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer\.libs
diff --git a/sql/RunMtest.in b/sql/RunMtest.in
--- a/sql/RunMtest.in
+++ b/sql/RunMtest.in
@@ -33,6 +33,10 @@
cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${builddir}/$d/autoload/ 2>/dev/null
done
+# enable auto-loading of SQL createdb scripts before `make install`
+mkdir -p ${builddir}/sql/createdb
+cp -f ${srcdir}/sql/[0-9][0-9]_*.sql ${builddir}/sql/createdb/ 2>/dev/null
+
# where compiled monetdb5 modules are to be found
for d in compiler optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf
do
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
