Changeset: dfaecdcd3b32 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dfaecdcd3b32
Modified Files:
MonetDB.spec
NT/mksqlwxs.py
clients/Tests/exports.stable.out
debian/monetdb5-server.install
monetdb5/modules/kernel/CMakeLists.txt
Branch: oscar
Log Message:
Reinstate microbenchmark.mal; approve removal of have_hge.
diffs (63 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -514,7 +514,7 @@ exit 0
%exclude %{_bindir}/stethoscope
%{_libdir}/libmonetdb5.so.*
%dir %{_libdir}/monetdb5
-%dir %{_libdir}/monetdb5/autoload
+%{_libdir}/monetdb5/microbenchmark.mal
%{_libdir}/monetdb5/lib_capi.so
%{_libdir}/monetdb5/lib_generator.so
%{_libdir}/monetdb5/lib_udf.so
@@ -600,7 +600,6 @@ use SQL with MonetDB, you will need to i
%verify(not mtime) %attr(664,monetdb,monetdb)
%{_localstatedir}/monetdb5/dbfarm/.merovingian_lock
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/monetdbd
%{_libdir}/monetdb5/lib_sql.so
-%dir %{_libdir}/monetdb5/createdb
%doc %{_mandir}/man1/monetdb.1.gz
%doc %{_mandir}/man1/monetdbd.1.gz
%dir %{_datadir}/doc/MonetDB-SQL
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -168,6 +168,8 @@ def main():
print(r' <Directory Id="lib" Name="lib">')
print(r' <Directory Id="monetdb5" Name="monetdb5">')
id = comp(features, id, 16,
+ [r'lib\monetdb5\microbenchmark.mal'])
+ id = comp(features, id, 16,
[r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('lib_') and x.endswith('.dll') and ('geom' not in x) and ('pyapi'
not in x) and ('opt_sql_append' not in x), os.listdir(os.path.join(sys.argv[3],
'lib', 'monetdb5'))))])
id = comp(debug, id, 16,
[r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('lib_') and x.endswith('.pdb') and ('geom' not in x) and
('opt_sql_append' not in x), os.listdir(os.path.join(sys.argv[3], 'lib',
'monetdb5'))))])
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1486,7 +1486,6 @@ int hasSameArguments(MalBlkPtr mb, Instr
int hasSameSignature(MalBlkPtr mb, InstrPtr p, InstrPtr q);
int hasSideEffects(MalBlkPtr mb, InstrPtr p, int strict);
str hashRef;
-int have_hge;
str hgeRef;
str identityRef;
str ifthenelseRef;
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -5,3 +5,5 @@ debian/tmp/usr/lib/x86_64-linux-gnu/libm
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_capi.so
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_generator.so
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_udf.so
usr/lib/x86_64-linux-gnu/monetdb5
+
+debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/benchmark.mal
usr/lib/x86_64-linux-gnu/monetdb5
diff --git a/monetdb5/modules/kernel/CMakeLists.txt
b/monetdb5/modules/kernel/CMakeLists.txt
--- a/monetdb5/modules/kernel/CMakeLists.txt
+++ b/monetdb5/modules/kernel/CMakeLists.txt
@@ -62,3 +62,7 @@ install(TARGETS
PUBLIC_HEADER
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+install(FILES
+ microbenchmark.mal
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
