Changeset: e272dbeadc70 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e272dbeadc70
Modified Files:
MonetDB.spec
NT/mksqlwxs.py
debian/libmonetdb5-server-cfitsio.install
debian/libmonetdb5-server-geom.install
debian/monetdb-python3.install
debian/monetdb-r.install
debian/monetdb5-server.install
debian/monetdb5-sql.install
monetdb5/modules/kernel/CMakeLists.txt
Branch: oscar
Log Message:
Do not attempt to package .mal and .sql files.
diffs (251 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -379,9 +379,6 @@ extensions for %{name}-SQL-server5.
%files geom-MonetDB5
%defattr(-,root,root)
-%{_libdir}/monetdb5/autoload/*_geom.mal
-%{_libdir}/monetdb5/createdb/*_geom.sql
-%{_libdir}/monetdb5/geom.mal
%{_libdir}/monetdb5/lib_geom.so
%endif
@@ -406,8 +403,7 @@ install it.
%files R
%defattr(-,root,root)
-%{_libdir}/monetdb5/rapi.*
-%{_libdir}/monetdb5/autoload/*_rapi.mal
+%{_libdir}/monetdb5/rapi.R
%{_libdir}/monetdb5/lib_rapi.so
%endif
@@ -432,8 +428,6 @@ install it.
%files python3
%defattr(-,root,root)
-%{_libdir}/monetdb5/pyapi3.*
-%{_libdir}/monetdb5/autoload/*_pyapi3.mal
%{_libdir}/monetdb5/lib_pyapi3.so
%endif
@@ -454,9 +448,6 @@ format.
%files cfitsio
%defattr(-,root,root)
-%{_libdir}/monetdb5/fits.mal
-%{_libdir}/monetdb5/autoload/*_fits.mal
-%{_libdir}/monetdb5/createdb/*_fits.sql
%{_libdir}/monetdb5/lib_fits.so
%endif
@@ -524,32 +515,6 @@ exit 0
%{_libdir}/libmonetdb5.so.*
%dir %{_libdir}/monetdb5
%dir %{_libdir}/monetdb5/autoload
-%if %{with fits}
-%exclude %{_libdir}/monetdb5/fits.mal
-%exclude %{_libdir}/monetdb5/autoload/*_fits.mal
-%endif
-%if %{with geos}
-%exclude %{_libdir}/monetdb5/geom.mal
-%endif
-%if %{with py3integration}
-%exclude %{_libdir}/monetdb5/pyapi3.mal
-%endif
-%if %{with rintegration}
-%exclude %{_libdir}/monetdb5/rapi.mal
-%endif
-%exclude %{_libdir}/monetdb5/sql*.mal
-%{_libdir}/monetdb5/*.mal
-%if %{with geos}
-%exclude %{_libdir}/monetdb5/autoload/*_geom.mal
-%endif
-%if %{with py3integration}
-%exclude %{_libdir}/monetdb5/autoload/*_pyapi3.mal
-%endif
-%if %{with rintegration}
-%exclude %{_libdir}/monetdb5/autoload/*_rapi.mal
-%endif
-%exclude %{_libdir}/monetdb5/autoload/??_sql*.mal
-%{_libdir}/monetdb5/autoload/*.mal
%{_libdir}/monetdb5/lib_capi.so
%{_libdir}/monetdb5/lib_generator.so
%{_libdir}/monetdb5/lib_udf.so
@@ -634,17 +599,8 @@ use SQL with MonetDB, you will need to i
%config(noreplace) %attr(664,monetdb,monetdb)
%{_localstatedir}/monetdb5/dbfarm/.merovingian_properties
%verify(not mtime) %attr(664,monetdb,monetdb)
%{_localstatedir}/monetdb5/dbfarm/.merovingian_lock
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/monetdbd
-%{_libdir}/monetdb5/autoload/??_sql.mal
%{_libdir}/monetdb5/lib_sql.so
%dir %{_libdir}/monetdb5/createdb
-%if %{with fits}
-%exclude %{_libdir}/monetdb5/createdb/*_fits.sql
-%endif
-%if %{with geos}
-%exclude %{_libdir}/monetdb5/createdb/*_geom.sql
-%endif
-%{_libdir}/monetdb5/createdb/*.sql
-%{_libdir}/monetdb5/sql*.mal
%doc %{_mandir}/man1/monetdb.1.gz
%doc %{_mandir}/man1/monetdbd.1.gz
%dir %{_datadir}/doc/MonetDB-SQL
@@ -863,9 +819,7 @@ install -d -m 0775 %{buildroot}%{_rundir
# .la files
rm -f %{buildroot}%{_libdir}/*.la
rm -f %{buildroot}%{_libdir}/monetdb5/*.la
-rm -f %{buildroot}%{_libdir}/monetdb5/opt_sql_append.mal
rm -f %{buildroot}%{_libdir}/monetdb5/lib_opt_sql_append.so
-rm -f %{buildroot}%{_libdir}/monetdb5/autoload/??_opt_sql_append.mal
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
for selinuxvariant in %{selinux_variants}
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -83,11 +83,6 @@ def main():
print(r' <FileSearch Id="CheckFile2" Name="gdk.h"/>')
print(r' </DirectorySearch>')
print(r' </Property>')
- print(r' <Property Id="GEOMEXISTS">')
- print(r' <DirectorySearch Id="CheckFileDir3"
Path="[INSTALLDIR]\lib\monetdb5" Depth="0">')
- print(r' <FileSearch Id="CheckFile3" Name="geom.mal"/>')
- print(r' </DirectorySearch>')
- print(r' </Property>')
print(r' <Property Id="PYAPI3EXISTS">')
print(r' <DirectorySearch Id="CheckFileDir5" Path="[INSTALLDIR]"
Depth="0">')
print(r' <FileSearch Id="CheckFile5"
Name="pyapi_locatepython3.bat"/>')
@@ -172,33 +167,14 @@ def main():
print(r' </Directory>')
print(r' <Directory Id="lib" Name="lib">')
print(r' <Directory Id="monetdb5" Name="monetdb5">')
- print(r' <Directory Id="autoload" Name="autoload">')
- id = comp(features, id, 18,
- [r'lib\monetdb5\autoload\{}'.format(x) for x in
sorted(filter(lambda x: x.endswith('.mal') 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', 'autoload'))))])
- id = comp(geom, id, 18,
- [r'lib\monetdb5\autoload\{}'.format(x) for x in
sorted(filter(lambda x: x.endswith('.mal') and ('geom' in x),
os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5', 'autoload'))))])
- id = comp(pyapi3, id, 18,
- [r'lib\monetdb5\autoload\{}'.format(x) for x in
sorted(filter(lambda x: x.endswith('_pyapi3.mal'),
os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5', 'autoload'))))])
- print(r' </Directory>')
- print(r' <Directory Id="createdb" Name="createdb">')
- id = comp(features, id, 18,
- [r'lib\monetdb5\createdb\{}'.format(x) for x in
sorted(filter(lambda x: x.endswith('.sql') and ('geom' not in x),
os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5', 'createdb'))))])
- id = comp(geom, id, 18,
- [r'lib\monetdb5\createdb\{}'.format(x) for x in
sorted(filter(lambda x: x.endswith('.sql') and ('geom' in x),
os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5', 'createdb'))))])
- print(r' </Directory>')
- id = comp(features, id, 16,
- [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.endswith('.mal') 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(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'))))])
id = comp(geom, id, 16,
- [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.endswith('.mal') and ('geom' in x), os.listdir(os.path.join(sys.argv[3],
'lib', 'monetdb5'))))])
- id = comp(geom, id, 16,
[r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('lib_') and (x.endswith('.dll') or x.endswith('.pdb')) and ('geom'
in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
id = comp(pyapi3, id, 16,
- [r'lib\monetdb5\pyapi3.mal',
- r'lib\monetdb5\lib_pyapi3.dll'])
+ [r'lib\monetdb5\lib_pyapi3.dll'])
print(r' </Directory>')
id = comp(extend, id, 14,
[r'lib\libbat.lib',
diff --git a/debian/libmonetdb5-server-cfitsio.install
b/debian/libmonetdb5-server-cfitsio.install
--- a/debian/libmonetdb5-server-cfitsio.install
+++ b/debian/libmonetdb5-server-cfitsio.install
@@ -1,4 +1,1 @@
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/*_fits.mal
usr/lib/x86_64-linux-gnu/monetdb5/autoload
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/createdb/*_fits.sql
usr/lib/x86_64-linux-gnu/monetdb5/createdb
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/fits.mal
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_fits.so
usr/lib/x86_64-linux-gnu/monetdb5
diff --git a/debian/libmonetdb5-server-geom.install
b/debian/libmonetdb5-server-geom.install
--- a/debian/libmonetdb5-server-geom.install
+++ b/debian/libmonetdb5-server-geom.install
@@ -1,4 +1,1 @@
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/*_geom.mal
usr/lib/x86_64-linux-gnu/monetdb5/autoload
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/createdb/*_geom.sql
usr/lib/x86_64-linux-gnu/monetdb5/createdb
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/geom.mal
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_geom.so
usr/lib/x86_64-linux-gnu/monetdb5
diff --git a/debian/monetdb-python3.install b/debian/monetdb-python3.install
--- a/debian/monetdb-python3.install
+++ b/debian/monetdb-python3.install
@@ -1,3 +1,1 @@
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/pyapi3.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_pyapi3.mal
usr/lib/x86_64-linux-gnu/monetdb5/autoload
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_pyapi3.so
usr/lib/x86_64-linux-gnu/monetdb5
diff --git a/debian/monetdb-r.install b/debian/monetdb-r.install
--- a/debian/monetdb-r.install
+++ b/debian/monetdb-r.install
@@ -1,4 +1,2 @@
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/rapi.mal
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/rapi.R
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_rapi.mal
usr/lib/x86_64-linux-gnu/monetdb5/autoload
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_rapi.so
usr/lib/x86_64-linux-gnu/monetdb5
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -5,24 +5,3 @@ 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
-
-# usr/lib/x86_64-linux-gnu/monetdb5/*.mal EXCEPT:
{fits,geom,gsl,opt_sql_appendpyapi,rapi,sql*,*_hge}.mal
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/[!bfgoprsu]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/ba[!m]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/b[!a]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/f[!i]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/generator.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/g[!es]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/o[!p]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/opt[!_]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/p[!y]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/r[!a]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/s[!q]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/udf.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/u[!d]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
-
-# usr/lib/x86_64-linux-gnu/monetdb5/autoload/*.mal EXCEPT:
*_{fits,geom,gsl,hge,opt_sql_append,pyapi,rapi,sql}.mal
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_batcalc.mal
usr/lib/x86_64-linux-gnu/monetdb5/autoload
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_calc.mal
usr/lib/x86_64-linux-gnu/monetdb5/autoload
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_generator.mal
usr/lib/x86_64-linux-gnu/monetdb5/autoload
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_udf.mal
usr/lib/x86_64-linux-gnu/monetdb5/autoload
diff --git a/debian/monetdb5-sql.install b/debian/monetdb5-sql.install
--- a/debian/monetdb5-sql.install
+++ b/debian/monetdb5-sql.install
@@ -1,24 +1,8 @@
debian/tmp/usr/bin/monetdbd usr/bin
debian/tmp/usr/bin/monetdb usr/bin
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_sql.mal
usr/lib/x86_64-linux-gnu/monetdb5/autoload
debian/tmp/usr/lib/systemd/system/monetdbd.service lib/systemd/system
debian/tmp/etc/logrotate.d/monetdbd etc/logrotate.d
debian/tmp/etc/tmpfiles.d/monetdbd.conf usr/lib/tmpfiles.d
-# usr/lib/x86_64-linux-gnu/monetdb5/sql*.mal EXCEPT: sql*_hge.mal
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql[!_]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql_decimal.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql_rank.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql_[!adhr]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_sql.so
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/var/monetdb5/dbfarm/.merovingian_properties var/monetdb5/dbfarm
debian/tmp/var/monetdb5/dbfarm/.merovingian_lock var/monetdb5/dbfarm
-
-# usr/lib/x86_64-linux-gnu/monetdb5/createdb/*.sql EXCEPT: *_bam.sql,
*_fits.sql, *_geom.sql, *_gsl.sql, *_hge.sql
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/createdb/??_[!abfgju]*.sql
usr/lib/x86_64-linux-gnu/monetdb5/createdb
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/createdb/??_analytics.sql
usr/lib/x86_64-linux-gnu/monetdb5/createdb
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/createdb/??_json.sql
usr/lib/x86_64-linux-gnu/monetdb5/createdb
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/createdb/??_generator.sql
usr/lib/x86_64-linux-gnu/monetdb5/createdb
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/createdb/??_udf.sql
usr/lib/x86_64-linux-gnu/monetdb5/createdb
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/createdb/??_uuid.sql
usr/lib/x86_64-linux-gnu/monetdb5/createdb
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/createdb/??_url.sql
usr/lib/x86_64-linux-gnu/monetdb5/createdb
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,7 +62,3 @@ 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
