Changeset: 80c5be30c34f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/80c5be30c34f
Modified Files:
clients/odbc/winsetup/setup.rc
debian/control
Branch: default
Log Message:
Merge with Aug2024 branch.
diffs (198 lines):
diff --git a/clients/odbc/winsetup/CMakeLists.txt
b/clients/odbc/winsetup/CMakeLists.txt
--- a/clients/odbc/winsetup/CMakeLists.txt
+++ b/clients/odbc/winsetup/CMakeLists.txt
@@ -23,7 +23,8 @@ target_sources(MonetODBCs
target_include_directories(MonetODBCs
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>
+ ${CMAKE_CURRENT_BINARY_DIR}/../../../common/utils)
target_compile_definitions(MonetODBCs
PRIVATE
diff --git a/clients/odbc/winsetup/setup.c b/clients/odbc/winsetup/setup.c
--- a/clients/odbc/winsetup/setup.c
+++ b/clients/odbc/winsetup/setup.c
@@ -16,7 +16,9 @@
#endif
#include "monetdb_config.h"
+#include "monetdb_hgversion.h"
#include <windows.h>
+#include <shellapi.h>
/* indicate to sqltypes.h that windows.h has already been included and
that it doesn't have to define Windows constants */
#define ALREADY_HAVE_WINDOWS_TYPE 1
@@ -28,6 +30,12 @@
static char *DriverName = "MonetDB ODBC Driver";
static HINSTANCE instance;
+#ifdef MERCURIAL_BRANCH
+#define DOCUMENTATION "documentation-" MERCURIAL_BRANCH
+#else
+#define DOCUMENTATION "documentation"
+#endif
+
static void
ODBCLOG(const char *fmt, ...)
{
@@ -419,8 +427,10 @@ DialogProc(HWND hwndDlg, UINT uMsg, WPAR
EndDialog(hwndDlg, LOWORD(wParam));
return TRUE;
case IDC_BUTTON_HELP:
- // TODO invoke webbrowser with url to webpage decribing
this dialog.
- MessageBox(hwndDlg, "Help not yet implemented", NULL,
MB_ICONERROR);
+ // invoke webbrowser with url to webpage decribing this
setup dialog.
+ ShellExecute(hwndDlg, NULL,
+ "https://www.monetdb.org/";
DOCUMENTATION
"/user-guide/client-interfaces/libraries-drivers/odbc-driver/windows-data-source-setup/",
+ NULL, NULL, SW_SHOWNORMAL);
return TRUE;
}
default:
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -155,7 +155,7 @@ BEGIN
PUSHBUTTON "Test",IDC_BUTTON_TEST,235,262,50,14
DEFPUSHBUTTON "OK",IDOK,290,262,50,14
PUSHBUTTON "Cancel",IDCANCEL,345,262,50,14
-// PUSHBUTTON "Help",IDC_BUTTON_HELP,400,262,50,14
+ PUSHBUTTON "Help",IDC_BUTTON_HELP,400,262,50,14
END
diff --git a/common/utils/GenerateVersionHeader.cmake
b/common/utils/GenerateVersionHeader.cmake
--- a/common/utils/GenerateVersionHeader.cmake
+++ b/common/utils/GenerateVersionHeader.cmake
@@ -10,6 +10,10 @@ if(EXISTS "${DIR}/.hg_archival.txt")
else()
set(MERCURIAL_ID "${HG_NODE}")
endif()
+ if(HG_ARCHIVAL MATCHES ".*branch:.*")
+ string(REGEX REPLACE ".*branch: ([-._A-Za-z0-9]*).*" "\\1" HG_BRANCH
"${HG_ARCHIVAL}")
+ set(MERCURIAL_BRANCH "${HG_BRANCH}")
+ endif()
else()
message(WARNING "Failed to find mercurial ID")
set(MERCURIAL_ID "Unknown")
@@ -26,6 +30,13 @@ elseif(EXISTS "${DIR}/.hg")
message(WARNING "Failed to find mercurial ID")
set(MERCURIAL_ID "Unknown")
endif()
+ execute_process(COMMAND "${HG_EXECUTABLE}" "id" "-b" WORKING_DIRECTORY
"${DIR}" RESULT_VARIABLE HG_RETURN_CODE2
+ OUTPUT_VARIABLE HG_OUPUT_RES2 OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(HG_RETURN_CODE2 EQUAL 0 AND HG_OUPUT_RES2)
+ set(MERCURIAL_BRANCH "${HG_OUPUT_RES2}")
+ else()
+ message(WARNING "Failed to find mercurial branch")
+ endif()
else()
message(WARNING "Failed to find mercurial")
set(MERCURIAL_ID "Unknown")
diff --git a/common/utils/monetdb_hgversion.h.in
b/common/utils/monetdb_hgversion.h.in
--- a/common/utils/monetdb_hgversion.h.in
+++ b/common/utils/monetdb_hgversion.h.in
@@ -11,3 +11,4 @@
*/
#cmakedefine MERCURIAL_ID "@MERCURIAL_ID@"
+#cmakedefine MERCURIAL_BRANCH "@MERCURIAL_BRANCH@"
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -159,7 +159,7 @@ Depends: ${shlibs:Depends}, ${misc:Depen
libmonetdb28 (= ${source:Version}),
monetdb-server (= ${source:Version})
Replaces: libmonetdb5-server-geom (<< 11.50.0)
-Break: libmonetdb5-server-geom (<< 11.50.0)
+Breaks: libmonetdb5-server-geom (<< 11.50.0)
Description: MonetDB SQL GIS support module
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -182,7 +182,7 @@ Depends: ${shlibs:Depends}, ${misc:Depen
libmonetdb28 (= ${source:Version}),
monetdb-server (= ${source:Version})
Replaces: libmonetdb5-server-cfitsio (<< 11.50.0)
-Break: libmonetdb5-server-cfitsio (<< 11.50.0)
+Breaks: libmonetdb5-server-cfitsio (<< 11.50.0)
Description: MonetDB add on module for FITS files
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -207,7 +207,7 @@ Depends: ${shlibs:Depends}, ${misc:Depen
Recommends: monetdb-sql (= ${source:Version})
Suggests: monetdb-client (= ${source:Version})
Replaces: monetdb5-server (<< 11.50.0)
-Break: monetdb5-server (<< 11.50.0)
+Breaks: monetdb5-server (<< 11.50.0)
Description: MonetDB database server
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -230,7 +230,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
monetdb-server (= ${source:Version}), libmonetdb-dev (= ${source:Version})
Replaces: monetdb5-server-dev (<< 11.50.0)
-Break: monetdb5-server-dev (<< 11.50.0)
+Breaks: monetdb5-server-dev (<< 11.50.0)
Description: MonetDB database server development files
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -253,7 +253,7 @@ Depends: ${shlibs:Depends}, ${misc:Depen
libmonetdb-stream26 (= ${source:Version}),
monetdb-server (= ${source:Version})
Replaces: monetdb5-sql (<< 11.50.0)
-Break: monetdb5-sql (<< 11.50.0)
+Breaks: monetdb5-sql (<< 11.50.0)
Suggests: monetdb-client (= ${source:Version})
Description: MonetDB SQL support
MonetDB is a database management system that is developed from a
@@ -274,10 +274,10 @@ Package: monetdb-sql-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
monetdb-server-dev (= ${source:Version}),
- monetdb-sql (= ${source:Version})),
+ monetdb-sql (= ${source:Version}),
libmonetdbe-dev (= ${source:Version})
Replaces: monetdb5-sql-dev (<< 11.50.0)
-Break: monetdb5-sql-dev (<< 11.50.0)
+Breaks: monetdb5-sql-dev (<< 11.50.0)
Description: MonetDB SQL support
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
diff --git a/debian/monetdb-client.install b/debian/monetdb-client.install
--- a/debian/monetdb-client.install
+++ b/debian/monetdb-client.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/bin/mclient usr/bin
-debian/tmp/usr/bin/msqldump usr/bin
+debian/tmp/usr/bin/mclient* usr/bin
+debian/tmp/usr/bin/msqldump* usr/bin
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/bin/mserver5 usr/bin
+debian/tmp/usr/bin/mserver5* usr/bin
debian/tmp/usr/lib/x86_64-linux-gnu/libmonetdb5*.so.* usr/lib/x86_64-linux-gnu
debian/tmp/usr/lib/x86_64-linux-gnu/libmonetdbsql*.so* usr/lib/x86_64-linux-gnu
diff --git a/debian/monetdb5-sql-dev.install b/debian/monetdb5-sql-dev.install
--- a/debian/monetdb5-sql-dev.install
+++ b/debian/monetdb5-sql-dev.install
@@ -2,5 +2,5 @@ debian/tmp/usr/include/monetdb/opt_backe
debian/tmp/usr/include/monetdb/rel_*.h usr/include/monetdb
debian/tmp/usr/include/monetdb/sql*.h usr/include/monetdb
debian/tmp/usr/include/monetdb/store_*.h usr/include/monetdb
-debian/tmp/usr/share/monetdb/cmake/MonetDBConfigTargets*.cmake
usr/share/monetdb/cmake
+debian/tmp/usr/share/monetdb/cmake/MonetDBConfig*.cmake usr/share/monetdb/cmake
debian/tmp/usr/share/monetdb/cmake/sqlTargets*.cmake usr/share/monetdb/cmake
diff --git a/debian/monetdb5-sql.install b/debian/monetdb5-sql.install
--- a/debian/monetdb5-sql.install
+++ b/debian/monetdb5-sql.install
@@ -1,5 +1,4 @@
-debian/tmp/usr/bin/monetdbd usr/bin
-debian/tmp/usr/bin/monetdb usr/bin
+debian/tmp/usr/bin/monetdb* usr/bin
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
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
