Changeset: 27d69983417e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=27d69983417e Added Files: clients/Tests/mclient-uri.SQL.bat clients/Tests/mclient-uri.SQL.sh clients/Tests/mclient-uri.stable.err clients/Tests/mclient-uri.stable.out clients/Tests/mclient-uri.stable.out.Windows sql/backends/monet5/Tests/dbextra_lock_test.py sql/backends/monet5/Tests/dbextra_lock_test.stable.err sql/backends/monet5/Tests/dbextra_lock_test.stable.out sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.err.Windows sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out.Windows sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD sql/test/BugTracker-2017/Tests/all_minus_count_star.Bug-6297.sql sql/test/BugTracker-2017/Tests/all_minus_count_star.Bug-6297.stable.err sql/test/BugTracker-2017/Tests/all_minus_count_star.Bug-6297.stable.out sql/test/BugTracker-2017/Tests/coalesc-limit.Bug-6316.sql sql/test/BugTracker-2017/Tests/coalesc-limit.Bug-6316.stable.err sql/test/BugTracker-2017/Tests/coalesc-limit.Bug-6316.stable.out sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.sql sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.err sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.sql sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.err sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.sql sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.stable.err sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_not_in_select.Bug-6290.stable.out sql/test/BugTracker-2017/Tests/crash_function_returning_sample.Bug-6291.sql sql/test/BugTracker-2017/Tests/crash_function_returning_sample.Bug-6291.stable.err sql/test/BugTracker-2017/Tests/crash_function_returning_sample.Bug-6291.stable.out sql/test/BugTracker-2017/Tests/create_table_as-missing_not_null.Bug-6329.sql sql/test/BugTracker-2017/Tests/create_table_as-missing_not_null.Bug-6329.stable.err sql/test/BugTracker-2017/Tests/create_table_as-missing_not_null.Bug-6329.stable.out sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.sql sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.stable.err sql/test/BugTracker-2017/Tests/delete_from_merge_table.Bug-3743.stable.out sql/test/BugTracker-2017/Tests/distinct_minus_count_distinct.Bug-6296.sql sql/test/BugTracker-2017/Tests/distinct_minus_count_distinct.Bug-6296.stable.err sql/test/BugTracker-2017/Tests/distinct_minus_count_distinct.Bug-6296.stable.out sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.sql sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.stable.err sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.stable.out sql/test/BugTracker-2017/Tests/lateral.Bug-6310.sql sql/test/BugTracker-2017/Tests/lateral.Bug-6310.stable.err sql/test/BugTracker-2017/Tests/lateral.Bug-6310.stable.out sql/test/BugTracker-2017/Tests/lateral02.Bug-6314.sql sql/test/BugTracker-2017/Tests/lateral02.Bug-6314.stable.err sql/test/BugTracker-2017/Tests/lateral02.Bug-6314.stable.out sql/test/BugTracker-2017/Tests/limit.bug-6322.sql sql/test/BugTracker-2017/Tests/limit_clause.Bug-6312.sql sql/test/BugTracker-2017/Tests/limit_clause.Bug-6312.stable.err sql/test/BugTracker-2017/Tests/limit_clause.Bug-6312.stable.out sql/test/BugTracker-2017/Tests/nestedoperators.Bug-6292.stable.err sql/test/BugTracker-2017/Tests/nestedoperators.Bug-6292.stable.out sql/test/BugTracker-2017/Tests/not_plus.Bug-6294.sql sql/test/BugTracker-2017/Tests/not_plus.Bug-6294.stable.err sql/test/BugTracker-2017/Tests/not_plus.Bug-6294.stable.out sql/test/BugTracker-2017/Tests/push_subslice.Bug-6322.sql sql/test/BugTracker-2017/Tests/push_subslice.Bug-6322.stable.err sql/test/BugTracker-2017/Tests/push_subslice.Bug-6322.stable.out sql/test/BugTracker-2017/Tests/simplify_math.Bug-6324.sql sql/test/BugTracker-2017/Tests/simplify_math.Bug-6324.stable.err sql/test/BugTracker-2017/Tests/simplify_math.Bug-6324.stable.out sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.sql sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.stable.err sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.stable.out sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.sql sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.stable.err sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.stable.out sql/test/Tests/copy-into-fwf.sql.in sql/test/Tests/copy-into-fwf.stable.err sql/test/Tests/copy-into-fwf.stable.out sql/test/Tests/ifexists-views.sql sql/test/Tests/ifexists-views.stable.err sql/test/Tests/ifexists-views.stable.out sql/test/Tests/mtcars sql/test/malloc_fail/Tests/setmemorylimit-fail2.stable.err sql/test/malloc_fail/Tests/setmemorylimit-fail2.stable.out Modified Files: .hgtags MonetDB.spec NT/mkgeomwxs.py NT/mkodbcwxs.py NT/mksqlwxs.py NT/monetdb_config.h.in NT/rules.msc README.rst bootstrap buildtools/autogen/setup.py buildtools/conf/monetdb.ico buildtools/conf/website.html clients/ChangeLog.Dec2016 clients/Tests/All clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/dump.c clients/mapiclient/mclient.1 clients/mapiclient/mclient.c clients/mapiclient/mhelp.c clients/mapiclient/mhelp.h clients/mapiclient/tomograph.c clients/mapilib/mapi.c clients/mapilib/mapi.rc clients/odbc/driver/SQLColumnPrivileges.c clients/odbc/driver/SQLColumns.c clients/odbc/driver/SQLExecute.c clients/odbc/driver/SQLSpecialColumns.c clients/odbc/driver/SQLTables.c clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc common/stream/stream.c common/stream/stream.h common/utils/msabaoth.c common/utils/mutils.h configure.ag debian/changelog debian/control gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_bbp.c gdk/gdk_group.c gdk/gdk_heap.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_search.c gdk/gdk_select.c gdk/gdk_utils.c gdk/libbat.rc geom/monetdb5/geom_upgrade.c libversions monetdb5/mal/mal_debugger.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_parser.c monetdb5/modules/atoms/inet.c monetdb5/modules/kernel/status.c monetdb5/modules/mal/00_language_hge.mal monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/bbp.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/inspect.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/manifold.h monetdb5/modules/mal/manual.c monetdb5/modules/mal/mdb.c monetdb5/modules/mal/oltp.c monetdb5/modules/mal/querylog.c monetdb5/modules/mal/querylog.h monetdb5/optimizer/Tests/inline06.stable.out monetdb5/optimizer/opt_costModel.c monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_evaluate.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_support.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/Tests/pyapi19.stable.err sql/backends/monet5/Tests/pyapi19.stable.out sql/backends/monet5/Tests/pyapi25.stable.err sql/backends/monet5/Tests/pyapi25.stable.err.Windows sql/backends/monet5/Tests/pyapi25.stable.out sql/backends/monet5/Tests/pyapi29.stable.err sql/backends/monet5/Tests/pyapi29.stable.out sql/backends/monet5/UDF/cudf/README sql/backends/monet5/UDF/pyapi/connection.c sql/backends/monet5/UDF/pyapi/pyapi.c sql/backends/monet5/UDF/pyapi/pyapi.mal sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_19.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_19.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_25.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_25.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_29.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_29.stable.out sql/backends/monet5/UDF/pyapi3/pyapi3.mal sql/backends/monet5/generator/Makefile.ag sql/backends/monet5/generator/generator.c sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_assert.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_rank.mal sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_upgrades.c sql/common/sql_types.c sql/include/sql_catalog.h sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.stable.out sql/scripts/25_debug.sql sql/scripts/51_sys_schema_extension.sql sql/server/rel_optimizer.c sql/server/rel_rel.c sql/server/rel_rel.h sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_updates.c sql/server/sql_parser.y sql/storage/store.c sql/test/BugDay_2005-12-19_2.9.3/Tests/subselect_cardinality.SF-1240701.1242164.stable.err sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err sql/test/BugTracker-2010/Tests/count-and-not.Bug-2663.stable.out sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out sql/test/BugTracker-2010/Tests/not-in-union-except-union.Bug-2577.stable.out sql/test/BugTracker-2016/Tests/storagemodel.sql sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows sql/test/BugTracker-2017/Tests/All sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out sql/test/BugTracker-2017/Tests/nestedoperators.Bug-6292.sql sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.err sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/Tests/All sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/check.stable.out sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/check.stable.out sql/test/emptydb-upgrade/Tests/check.stable.out.32bit sql/test/emptydb-upgrade/Tests/check.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.SQL.py sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 sql/test/orderidx/Tests/simpletable.stable.out.32bit sql/test/orderidx/Tests/smalltable.stable.out.32bit sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.sql sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.sql sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 testing/process.py tools/merovingian/ChangeLog.Jul2017 tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/forkmserver.c tools/merovingian/daemon/merovingian.c tools/merovingian/utils/control.c tools/merovingian/utils/properties.c tools/merovingian/utils/utils.c tools/merovingian/utils/utils.h tools/mserver/monet_version.c.in tools/mserver/mserver5.c vertoo.config vertoo.data Branch: comment-on Log Message:
Merge 'default' diffs (truncated from 127830 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -671,3 +671,5 @@ 54a8c9d99dc3621a02579db0c59309781caceb54 05f4e62bc67911a25f19be7fe742009ab1ee41c7 Dec2016_21 c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd Dec2016_SP4_release 05f4e62bc67911a25f19be7fe742009ab1ee41c7 Dec2016_SP4_release +8b3d3f7c487cb6e34dab1167797a61862cba2124 Dec2016_23 +8b3d3f7c487cb6e34dab1167797a61862cba2124 Dec2016_SP5_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -131,8 +131,8 @@ Vendor: MonetDB BV <[email protected]> Group: Applications/Databases License: MPLv2.0 -URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Dec2016-SP4/%{name}-%{version}.tar.bz2 +URL: https://www.monetdb.org/ +Source: https://www.monetdb.org/downloads/sources/Dec2016-SP5/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 @@ -311,6 +311,11 @@ MonetDB, you will very likely need this Summary: MonetDB - Monet Database Management System Client Programs Group: Applications/Databases Requires: %{name}-client%{?_isa} = %{version}-%{release} +%if (0%{?fedora} >= 22) +# tomograph executes these two: +Recommends: /usr/bin/gs +Recommends: /usr/bin/gnuplot +%endif %description client-tools MonetDB is a database management system that is developed from a @@ -953,6 +958,24 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Mon May 29 2017 Panagiotis Koutsourakis <[email protected]> - 11.25.23-20170529 +- Rebuilt. +- BZ#6290: Crash (and assertion failure) with a correlated subquery with + NOT IN in the select-list +- BZ#6291: crash if executes a function with sample operator +- BZ#6294: Sqlitelogictest crash +- BZ#6296: Another sqllitelogictest crash :( +- BZ#6297: 7th sqllitelogictest crash :( +- BZ#6300: Protect against missing BATs (sqlsmith) +- BZ#6314: Lateral crash report (sqlsmith) +- BZ#6315: Exist operator on type bigint missing (sqlsmith) +- BZ#6316: Coalesc and limit error (sqlsmith) +- BZ#6317: Two-column integer aggregation extremely slow +- BZ#6318: Daemon crashes if .merovignian_properties for a database + contains more than 42 entries +- BZ#6320: The daemon ignores all but the last entry in the + .merovignian_properties file when spawning mserver5 + * Tue Apr 25 2017 Sjoerd Mullender <[email protected]> - 11.25.21-20170425 - Rebuilt. - BZ#6260: Sqlitelogictest crash diff --git a/NT/mkgeomwxs.py b/NT/mkgeomwxs.py --- a/NT/mkgeomwxs.py +++ b/NT/mkgeomwxs.py @@ -46,7 +46,11 @@ def main(): print(r' <RegistrySearch Id="MonetDBRegistry" Key="Software\[Manufacturer]\MonetDB5" Name="InstallPath" Root="HKLM" Type="raw"/>') print(r' </Property>') print(r' <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>') + print(r' <Property Id="ARPPRODUCTICON" Value="monetdb.ico"/>') print(r' <Media Id="1" Cabinet="monetdb.cab" EmbedCab="yes"/>') + print(r' <Condition Message="MonetDB5-SQL needs to be installed first.">') + print(r' INSTALLDIR') + print(r' </Condition>') print(r' <Directory Id="TARGETDIR" Name="SourceDir">') print(r' <Merge Id="VCRedist" DiskId="1" Language="0" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC%s0_CRT_%s.msm"/>' % (vs, arch)) print(r' <Directory Id="%s">' % folder) @@ -82,8 +86,46 @@ def main(): print(r' <ComponentRef Id="%s"/>' % f) print(r' <MergeRef Id="VCRedist"/>') print(r' </Feature>') - print(r' <UIRef Id="WixUI_InstallDir"/>') + # the <UI> section was lifted from + # ...\SDK\wixui\WixUI_InstallDir.wxs and modified to remove the + # InstallDirDlg subsection + # see http://wixtoolset.org/documentation/manual/v3/wixui/wixui_customizations.html + print(r' <UI Id="MyWixUI_InstallDir">') + print(r' <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8"/>') + print(r' <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12"/>') + print(r' <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes"/>') + print(r' <Property Id="DefaultUIFont" Value="WixUI_Font_Normal"/>') + print(r' <Property Id="WixUI_Mode" Value="InstallDir"/>') + print(r' <DialogRef Id="BrowseDlg"/>') + print(r' <DialogRef Id="DiskCostDlg"/>') + print(r' <DialogRef Id="ErrorDlg"/>') + print(r' <DialogRef Id="FatalError"/>') + print(r' <DialogRef Id="FilesInUse"/>') + print(r' <DialogRef Id="MsiRMFilesInUse"/>') + print(r' <DialogRef Id="PrepareDlg"/>') + print(r' <DialogRef Id="ProgressDlg"/>') + print(r' <DialogRef Id="ResumeDlg"/>') + print(r' <DialogRef Id="UserExit"/>') + print(r' <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>') + print(r' <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>') + print(r' <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>') + print(r' <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish>') + print(r' <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>') + print(r' <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>') + print(r' <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">LicenseAccepted = "1"</Publish>') + print(r' <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" Order="1">NOT Installed</Publish>') + print(r' <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>') + print(r' <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>') + print(r' <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>') + print(r' <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>') + print(r' <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>') + print(r' <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>') + print(r' <Property Id="ARPNOMODIFY" Value="1"/>') + print(r' </UI>') + print(r' <UIRef Id="WixUI_Common"/>') + print(r' <UIRef Id="MyWixUI_InstallDir"/>') print(r' <UIRef Id="WixUI_ErrorProgressText"/>') + print(r' <Icon Id="monetdb.ico" SourceFile="monetdb.ico"/>') print(r' </Product>') print(r'</Wix>') diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py --- a/NT/mkodbcwxs.py +++ b/NT/mkodbcwxs.py @@ -46,6 +46,7 @@ def main(): print(r' <WixVariable Id="WixUIBannerBmp" Value="banner.bmp"/>') # print(r' <WixVariable Id="WixUIDialogBmp" Value="backgroundRipple.bmp"/>') print(r' <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>') + print(r' <Property Id="ARPPRODUCTICON" Value="monetdb.ico"/>') print(r' <Media Id="1" Cabinet="monetdb.cab" EmbedCab="yes"/>') print(r' <CustomAction Id="driverinstall" FileKey="odbcinstall" ExeCommand="/Install" Execute="deferred" Impersonate="no"/>') print(r' <CustomAction Id="driveruninstall" FileKey="odbcinstall" ExeCommand="/Uninstall" Execute="deferred" Impersonate="no"/>') diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -49,6 +49,7 @@ def main(): print(r' <RegistrySearch Id="MonetDBRegistry" Key="Software\[Manufacturer]\[ProductName]" Name="InstallPath" Root="HKLM" Type="raw"/>') print(r' </Property>') print(r' <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>') + print(r' <Property Id="ARPPRODUCTICON" Value="monetdb.ico"/>') print(r' <Media Id="1" Cabinet="monetdb.cab" EmbedCab="yes"/>') print(r' <Directory Id="TARGETDIR" Name="SourceDir">') print(r' <Merge Id="VCRedist" DiskId="1" Language="0" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC%s0_CRT_%s.msm"/>' % (vs, arch)) @@ -107,6 +108,16 @@ def main(): id = comp(features, id, 16, [r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x: x.startswith('lib_') and x.endswith('.dll') and ('geom' not in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))]) print(r' </Directory>') + id = comp(features, id, 14, + [r'lib\libmapi.lib', + r'lib\libstream.lib', + r'%s\lib\iconv.lib' % makedefs['LIBICONV'], + r'%s\lib\libbz2.lib' % makedefs['LIBBZIP2'], + r'%s\lib\libeay32.lib' % makedefs['LIBOPENSSL'], + r'%s\lib\libxml2.lib' % makedefs['LIBXML2'], + r'%s\lib\pcre.lib' % makedefs['LIBPCRE'], + r'%s\lib\ssleay32.lib' % makedefs['LIBOPENSSL'], + r'%s\lib\zdll.lib' % makedefs['LIBZLIB']]) print(r' </Directory>') print(r' <Directory Id="share" Name="share">') print(r' <Directory Id="doc" Name="doc">') @@ -134,7 +145,7 @@ def main(): args = '/STARTED-FROM-MENU -lsql -Ecp437', sid = 'mclient_bat') id = comp(features, id, 12, - [r'MSQLServer.bat'], + [r'MSQLserver.bat'], name = 'MonetDB SQL Server', sid = 'msqlserver_bat') print(r' </Directory>') diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in --- a/NT/monetdb_config.h.in +++ b/NT/monetdb_config.h.in @@ -767,23 +767,23 @@ /* Name of package */ #define PACKAGE "MonetDB" +/* Define to the version of this package. */ +#define PACKAGE_VERSION "11.28.0" + /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "[email protected]" +#define PACKAGE_BUGREPORT "https://bugs.monetdb.org/"; /* Define to the full name of this package. */ #define PACKAGE_NAME "MonetDB" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "MonetDB 11.28.0" +#define PACKAGE_STRING PACKAGE " " PACKAGE_VERSION /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "MonetDB" -/* Define to the version of this package. */ -#define PACKAGE_VERSION "11.28.0" - /* Define to the home page for this package. */ -#define PACKAGE_URL "" +#define PACKAGE_URL "https://www.monetdb.org/"; /* Path separator */ #define PATH_SEP ';' diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -2,16 +2,16 @@ The MonetDB Database System =========================== The MonetDB database is developed by the CWI database research group -(see http://www.monetdb.org/). +(see https://www.monetdb.org/). Via the MonetDB project we have brought the MonetDB system in open source, -where it is accessible at http://www.monetdb.org/Downloads/ +where it is accessible at https://www.monetdb.org/Downloads/ The MonetDB database system is a high-performance database kernel for query-intensive applications. The MonetDB source can be found at our `Mercurial server`__. There is also a `github mirror`__ that is updated once a day. -.. _MonetDB: http://dev.monetdb.org/hg/MonetDB/ +.. _MonetDB: https://dev.monetdb.org/hg/MonetDB/ __ MonetDB_ .. _github: https://github.com/MonetDB/MonetDB diff --git a/bootstrap b/bootstrap --- a/bootstrap +++ b/bootstrap @@ -14,9 +14,11 @@ PYTHONPATH=${PWD:-$(pwd)}/buildtools/aut export PYTHONPATH # cope with systems where libtool is not GNU libtool, e.g. Darwin -type -P glibtoolize > /dev/null \ - && libtoolize=glibtoolize \ - || libtoolize=libtoolize +if type -P glibtoolize > /dev/null; then + libtoolize=glibtoolize +else + libtoolize=libtoolize +fi # cope with systems where aclocal is known as aclocal-1.10 (and # automake as automake-1.10), e.g. OpenIndiana @@ -40,22 +42,26 @@ if [[ -n ${M4DIRS} ]] ; then done fi -python buildtools/autogen/autogen.py && +python buildtools/autogen/autogen.py || exit $? ( # replace the line starting with AC_CONFIG_FILES in configure.ag with # the command to substitute the configure results into the .in files, # making sure executable files remain executable. -sed -n '/^AC_CONFIG_FILES/s/.*/AC_CONFIG_FILES([/;1,/^AC_CONFIG_FILES/p' configure.ag -while read f; do [ -x $f.in ] || echo $f; done < acout.in +sed -n '/^AC_CONFIG_FILES/s/.*/AC_CONFIG_FILES([/;1,/^AC_CONFIG_FILES/p' configure.ag || exit $? +while read f; do + [ -x $f.in ] || echo $f +done < acout.in echo '])' -while read f; do [ -x $f.in ] && echo "AC_CONFIG_FILES([$f], [chmod +x $f])"; done < acout.in +while read f; do + [ -x $f.in ] && echo "AC_CONFIG_FILES([$f], [chmod +x $f])" +done < acout.in sed '1,/^AC_CONFIG_FILES/d' configure.ag -) > configure.ac && -$libtoolize -c -f && -aclocal$amv ${_m4_extra_dirs} && -autoheader && -automake$amv --add-missing --copy --foreign && -autoconf +) > configure.ac || exit $? +$libtoolize -c -f || exit $? +aclocal$amv ${_m4_extra_dirs} || exit $? +autoheader || exit $? +automake$amv --add-missing --copy --foreign || exit $? +autoconf || exit $? if [ -f buildtools/conf/install-sh -a ! -x buildtools/conf/install-sh ]; then chmod +x buildtools/conf/install-sh fi diff --git a/buildtools/autogen/setup.py b/buildtools/autogen/setup.py --- a/buildtools/autogen/setup.py +++ b/buildtools/autogen/setup.py @@ -13,7 +13,7 @@ setup(name = "autogen", description = "MonetDB autogen script", author = "MonetDB Team, CWI", author_email = "[email protected]", - url = "http://www.monetdb.org/";, + url = "https://www.monetdb.org/";, maintainer = "Sjoerd Mullender", maintainer_email = "[email protected]", license = "Mozilla Public License, v. 2.0", diff --git a/buildtools/conf/monetdb.ico b/buildtools/conf/monetdb.ico index fad690d3c111db967da3cf2e65cb6df338355064..1cd666db49c02edb3012cae55f0c257c359a9359 GIT binary patch literal 16958 zc%1E8ZD?C%6n?TUO_QNj{1`H|L#7sC>MT~BN=s3h4z+EXqRjcj!G8IHqPBBwbGuE{ zsXsRM!~Kvsrh=6Tej%c=R5w&qL{P*p7O5W_qK!Idx}|x2&b>GFCQF)|w7GAm_bI0* _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
