Changeset: a7698311f695 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a7698311f695
Modified Files:
geom/RunMtest.bat.in
geom/RunMtest.in
sql/RunMtest.bat.in
sql/RunMtest.in
Branch: Mar2011
Log Message:
RunMtest: disable auto-loading of non-available M5 modules & SQL createdb
scripts
After copying all ??_*.mal to <builddir>/*/autoload/ and
all ??_*.sql to <builddir>/sql/sql/createdb/ ,
we now conditionally remove those, again, that will not be installed to
<prefix>/*/ .
diffs (71 lines):
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -62,10 +62,13 @@
copy /y %srcdir%\..\sql\backends\monet5\??_*.mal
%buildbase%\sql\backends\monet5\autoload
if not exist %buildbase%\sql\backends\monet5\vaults\autoload mkdir
%buildbase%\sql\backends\monet5\vaults\autoload
copy /y %srcdir%\..\sql\backends\monet5\vaults\??_*.mal
%buildbase%\sql\backends\monet5\vaults\autoload
+if "@HAVE_MSEED_FALSE@"=="" del /y
%buildbase%\sql\backends\monet5\vaults\autoload\71_mseed.mal
+if "@HAVE_CFITSIO_FALSE@"=="" del /y
%buildbase%\sql\backends\monet5\vaults\autoload\72_fits.mal
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
+if "@HAVE_RAPTOR_FALSE@"="" del /y %buildbase%\sql\sql\createdb\30_rdf.sql
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer\.libs
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer
diff --git a/geom/RunMtest.in b/geom/RunMtest.in
--- a/geom/RunMtest.in
+++ b/geom/RunMtest.in
@@ -71,9 +71,14 @@
mkdir -p ${buildbase}/sql/$d/autoload
cp -f ${srcdir}/../sql/$d/[0-9][0-9]_*.mal
${buildbase}/sql/$d/autoload/ 2>/dev/null
done
+# disable auto-loading of non-available modules
+@HAVE_MSEED_FALSE@ rm -f
${buildbase}/sql/backends/monet5/vaults/autoload/71_mseed.mal
+@HAVE_CFITSIO_FALSE@ rm -f
${buildbase}/sql/backends/monet5/vaults/autoload/72_fits.mal
# 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
+# disable auto-loading of non-available SQL createdb scripts
+@HAVE_RAPTOR_FALSE@ rm -f ${buildbase}/sql/sql/createdb/30_rdf.sql
# where compiled monetdb5 modules are to be found
for d in optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf extras/xml
do
diff --git a/sql/RunMtest.bat.in b/sql/RunMtest.bat.in
--- a/sql/RunMtest.bat.in
+++ b/sql/RunMtest.bat.in
@@ -24,10 +24,13 @@
copy /y %srcdir%\backends\monet5\??_*.mal %builddir%\backends\monet5\autoload
if not exist %builddir%\backends\monet5\vaults\autoload mkdir
%builddir%\backends\monet5\vaults\autoload
copy /y %srcdir%\backends\monet5\vaults\??_*.mal
%builddir%\backends\monet5\vaults\autoload
+if "@HAVE_MSEED_FALSE@"=="" del /y
%builddir%\backends\monet5\vaults\autoload\71_mseed.mal
+if "@HAVE_CFITSIO_FALSE@"=="" del /y
%builddir%\backends\monet5\vaults\autoload\72_fits.mal
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 "@HAVE_RAPTOR_FALSE@"="" del /y %builddir%\sql\createdb\30_rdf.sql
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer\.libs
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer
diff --git a/sql/RunMtest.in b/sql/RunMtest.in
--- a/sql/RunMtest.in
+++ b/sql/RunMtest.in
@@ -32,10 +32,15 @@
mkdir -p ${builddir}/$d/autoload
cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${builddir}/$d/autoload/ 2>/dev/null
done
+# disable auto-loading of non-available modules
+@HAVE_MSEED_FALSE@ rm -f
${builddir}/backends/monet5/vaults/autoload/71_mseed.mal
+@HAVE_CFITSIO_FALSE@ rm -f
${builddir}/backends/monet5/vaults/autoload/72_fits.mal
# 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
+# disable auto-loading of non-available SQL createdb scripts
+@HAVE_RAPTOR_FALSE@ rm -f ${builddir}/sql/createdb/30_rdf.sql
# where compiled monetdb5 modules are to be found
for d in optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf extras/xml
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
