Changeset: 357f3e8bb38f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=357f3e8bb38f
Modified Files:
CMakeLists.txt
clients/mapiclient/mclient.c
clients/mapiclient/msqldump.c
clients/mapilib/monetdb-mapi.pc.in
clients/odbc/driver/ODBCError.c
clients/odbc/driver/ODBCUtil.c
clients/odbc/driver/SQLGetInfo.c
common/stream/monetdb-stream.pc.in
gdk/gdk_utils.c
gdk/monetdb-gdk.pc.in
monetdb5/mal/mal_profiler.c
monetdb5/tools/monetdb5.pc.in
monetdb_config.h.in
sql/backends/monet5/vaults/shp/shp.h
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/proxy.c
Branch: cmake-fun
Log Message:
Use only one version variable.
diffs (truncated from 310 to 300 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,6 @@ cmake_minimum_required(VERSION 3.12 FATA
# Change these variables between releases
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION "${MONETDB_VERSION_MAJOR}.34.0")
-set(VERSION "${MONETDB_VERSION}")
set(GDK_VERSION_MAJOR "18")
set(GDK_VERSION "${GDK_VERSION_MAJOR}.1.0")
@@ -51,15 +50,6 @@ string(TOLOWER "${CMAKE_SYSTEM_NAME}" CM
string(TOLOWER "${CMAKE_C_COMPILER_ID}" CMAKE_C_COMPILER_ID_LOWER)
set("HOST"
"${CMAKE_SYSTEM_PROCESSOR_LOWER}-pc-${CMAKE_SYSTEM_NAME_LOWER}-${CMAKE_C_COMPILER_ID_LOWER}")
-# Packaging information
-set(PACKAGE "MonetDB")
-set(PACKAGE_NAME "MonetDB")
-set(PACKAGE_TARNAME "MonetDB")
-set(PACKAGE_STRING "MonetDB ${MONETDB_VERSION}")
-set(PACKAGE_URL "${MonetDB_HOMEPAGE_URL}")
-set(PACKAGE_BUGREPORT "https://bugs.monetdb.org/";)
-set(PACKAGE_VERSION "${MONETDB_VERSION}")
-
set(DFT_STRICT "NO")
# Check current version control revision
if(EXISTS "${CMAKE_SOURCE_DIR}/.hg")
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3460,7 +3460,7 @@ main(int argc, char **argv)
case 'v': {
mnstr_printf(toConsole,
"mclient, the MonetDB interactive "
- "terminal, version %s", VERSION);
+ "terminal, version %s", MONETDB_VERSION);
#ifdef MONETDB_RELEASE
mnstr_printf(toConsole, " (%s)", MONETDB_RELEASE);
#else
diff --git a/clients/mapiclient/msqldump.c b/clients/mapiclient/msqldump.c
--- a/clients/mapiclient/msqldump.c
+++ b/clients/mapiclient/msqldump.c
@@ -132,7 +132,7 @@ main(int argc, char **argv)
break;
case 'v': {
printf("msqldump, the MonetDB interactive database "
- "dump tool, version %s", VERSION);
+ "dump tool, version %s", MONETDB_VERSION);
#ifdef MONETDB_RELEASE
printf(" (%s)", MONETDB_RELEASE);
#else
@@ -212,7 +212,7 @@ main(int argc, char **argv)
*p = 0;
mnstr_printf(out,
- "-- msqldump version %s", VERSION);
+ "-- msqldump version %s", MONETDB_VERSION);
#ifdef MONETDB_RELEASE
mnstr_printf(out, " (%s)", MONETDB_RELEASE);
#else
diff --git a/clients/mapilib/monetdb-mapi.pc.in
b/clients/mapilib/monetdb-mapi.pc.in
--- a/clients/mapilib/monetdb-mapi.pc.in
+++ b/clients/mapilib/monetdb-mapi.pc.in
@@ -11,7 +11,7 @@ includedir=${includedir}
Name: monetdb-mapi
Description: MonetDB MAPI C-client libary
-Version: @PACKAGE_VERSION@
+Version: @MONETDB_VERSION@
Requires: monetdb-stream openssl
Libs: -L${libdir} -lmapi
diff --git a/clients/odbc/driver/ODBCError.c b/clients/odbc/driver/ODBCError.c
--- a/clients/odbc/driver/ODBCError.c
+++ b/clients/odbc/driver/ODBCError.c
@@ -39,7 +39,7 @@ struct tODBCError {
struct tODBCError *next; /* pointer to the next Error object or
NULL */
};
-const char ODBCErrorMsgPrefix[] = "[MonetDB][ODBC Driver " PACKAGE_VERSION "]";
+const char ODBCErrorMsgPrefix[] = "[MonetDB][ODBC Driver " MONETDB_VERSION "]";
const int ODBCErrorMsgPrefixLength = (int) sizeof(ODBCErrorMsgPrefix) - 1;
/*
diff --git a/clients/odbc/driver/ODBCUtil.c b/clients/odbc/driver/ODBCUtil.c
--- a/clients/odbc/driver/ODBCUtil.c
+++ b/clients/odbc/driver/ODBCUtil.c
@@ -39,7 +39,7 @@ BOOL WINAPI
DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved)
{
#ifdef ODBCDEBUG
- ODBCLOG("DllMain %ld (%s)\n", (long) reason, PACKAGE_STRING);
+ ODBCLOG("DllMain %ld (MonetDB %s)\n", (long) reason, MONETDB_VERSION);
#endif
(void) hinstDLL;
(void) reason;
diff --git a/clients/odbc/driver/SQLGetInfo.c b/clients/odbc/driver/SQLGetInfo.c
--- a/clients/odbc/driver/SQLGetInfo.c
+++ b/clients/odbc/driver/SQLGetInfo.c
@@ -410,7 +410,7 @@ MNDBGetInfo(ODBCDbc *dbc,
len = sizeof(SQLINTEGER);
break;
case SQL_DBMS_NAME:
- sValue = PACKAGE_NAME;
+ sValue = "MonetDB";
break;
case SQL_DBMS_VER:
snprintf(buf, sizeof(buf), "%02d.%02d.%04d",
@@ -440,7 +440,7 @@ MNDBGetInfo(ODBCDbc *dbc,
break;
case SQL_DRIVER_VER: {
int maj = 0, min = 0, pat = 0;
- sscanf(PACKAGE_VERSION, "%d.%d.%d", &maj, &min, &pat);
+ sscanf(MONETDB_VERSION, "%d.%d.%d", &maj, &min, &pat);
snprintf(buf, sizeof(buf), "%02d.%02d.%04d %s", maj, min, pat,
#ifdef MONETDB_RELEASE
MONETDB_RELEASE
diff --git a/common/stream/monetdb-stream.pc.in
b/common/stream/monetdb-stream.pc.in
--- a/common/stream/monetdb-stream.pc.in
+++ b/common/stream/monetdb-stream.pc.in
@@ -11,7 +11,7 @@ includedir=${includedir}
Name: monetdb-stream
Description: MonetDB streams libary
-Version: @PACKAGE_VERSION@
+Version: @MONETDB_VERSION@
Requires: @PKG_CURL@ @PKG_ZLIB@ @PKG_LIBLZMA@ @PKG_LZ4@ @PKG_BZIP2@
@PKG_SNAPPY@
Libs: -L${libdir} -lstream @PKG_LIBICONV@
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1549,7 +1549,7 @@ THRgettid(void)
return t;
}
-static const char *_gdk_version_string = VERSION;
+static const char *_gdk_version_string = MONETDB_VERSION;
/**
* Returns the GDK version as internally allocated string. Hence the
* string does not have to (and should not) be freed. Do not inline
diff --git a/gdk/monetdb-gdk.pc.in b/gdk/monetdb-gdk.pc.in
--- a/gdk/monetdb-gdk.pc.in
+++ b/gdk/monetdb-gdk.pc.in
@@ -11,7 +11,7 @@ includedir=${includedir}
Name: monetdb-gdk
Description: MonetDB GDK libary
-Version: @PACKAGE_VERSION@
+Version: @MONETDB_VERSION@
Requires: monetdb-stream
Libs: -L${libdir} -lbat @PKG_MATH@ @PKG_THREAD@ @PKG_DL@ @PKG_KVM@
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -155,7 +155,7 @@ renderProfilerEvent(MalBlkPtr mb, MalStk
/* TODO: This could probably be optimized somehow to avoid the
* function call to mercurial_revision().
*/
- logadd("\"version\":\""VERSION" (hg id: %s)\",%s",
mercurial_revision(), prettify);
+ logadd("\"version\":\""MONETDB_VERSION" (hg id: %s)\",%s",
mercurial_revision(), prettify);
logadd("\"source\":\"trace\",%s", prettify);
logadd("\"clk\":"LLFMT",%s", usec, prettify);
diff --git a/monetdb5/tools/monetdb5.pc.in b/monetdb5/tools/monetdb5.pc.in
--- a/monetdb5/tools/monetdb5.pc.in
+++ b/monetdb5/tools/monetdb5.pc.in
@@ -11,7 +11,7 @@ includedir=${includedir}
Name: monetdb5
Description: MonetDB5
-Version: @PACKAGE_VERSION@
+Version: @MONETDB_VERSION@
Requires: monetdb-gdk monetdb-stream @PKG_LIBXML2@
Libs: -L${libdir} -lmonetdb5 @PKG_CRYPTO@ @PKG_PCRE@
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -403,30 +403,12 @@
/* Release name or "unreleased" */
#cmakedefine MONETDB_RELEASE "@MONETDB_RELEASE@"
+/* Version number of package */
+#cmakedefine MONETDB_VERSION "@MONETDB_VERSION@"
+
/* Define if NAN cannot be used as static initializer */
#cmakedefine NAN_CANNOT_BE_USED_AS_INITIALIZER
-/* Name of package */
-#cmakedefine PACKAGE "@PACKAGE@"
-
-/* Define to the address where bug reports for this package should be sent. */
-#cmakedefine PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
-
-/* Define to the full name of this package. */
-#cmakedefine PACKAGE_NAME "@PACKAGE_NAME@"
-
-/* Define to the full name and version of this package. */
-#cmakedefine PACKAGE_STRING "@PACKAGE_STRING@"
-
-/* Define to the one symbol short name of this package. */
-#cmakedefine PACKAGE_TARNAME "@PACKAGE_TARNAME@"
-
-/* Define to the home page for this package. */
-#cmakedefine PACKAGE_URL "@PACKAGE_URL@"
-
-/* Define to the version of this package. */
-#cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@"
-
/* Path separator */
#cmakedefine PATH_SEP @PATH_SEP@
@@ -478,9 +460,6 @@
/* Compiling for static code analysis */
#cmakedefine STATIC_CODE_ANALYSIS
-/* Version number of package */
-#cmakedefine VERSION "@VERSION@"
-
/* Define on Microsoft Windows (also under Cygwin) */
#ifndef WIN32
#cmakedefine WIN32
diff --git a/sql/backends/monet5/vaults/shp/shp.h
b/sql/backends/monet5/vaults/shp/shp.h
--- a/sql/backends/monet5/vaults/shp/shp.h
+++ b/sql/backends/monet5/vaults/shp/shp.h
@@ -10,13 +10,6 @@
#define _SHP_
#include "mal.h"
#include "mal_client.h"
-/* these are redefined in gdal.h */
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_URL
-#undef PACKAGE_VERSION
#include <gdal.h>
#include <ogr_api.h>
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -174,7 +174,7 @@ command_help(int argc, char *argv[])
static void
command_version(void)
{
- printf("MonetDB Database Server Toolkit v%s", VERSION);
+ printf("MonetDB Database Server Toolkit v%s", MONETDB_VERSION);
#ifdef MONETDB_RELEASE
printf(" (%s)", MONETDB_RELEASE);
#else
diff --git a/tools/merovingian/daemon/argvcmds.c
b/tools/merovingian/daemon/argvcmds.c
--- a/tools/merovingian/daemon/argvcmds.c
+++ b/tools/merovingian/daemon/argvcmds.c
@@ -65,7 +65,7 @@ command_help(int argc, char *argv[])
int
command_version(void)
{
- printf("MonetDB Database Server v%s", VERSION);
+ printf("MonetDB Database Server v%s", MONETDB_VERSION);
/* coverity[pointless_string_compare] */
#ifdef MONETDB_RELEASE
printf(" (%s)", MONETDB_RELEASE);
diff --git a/tools/merovingian/daemon/controlrunner.c
b/tools/merovingian/daemon/controlrunner.c
--- a/tools/merovingian/daemon/controlrunner.c
+++ b/tools/merovingian/daemon/controlrunner.c
@@ -790,7 +790,7 @@ static void ctl_handle_client(
len = snprintf(buf2, sizeof(buf2), "OK\n");
send_client("=");
len = snprintf(buf2, sizeof(buf2), "%s (%s)\n",
- VERSION,
+ MONETDB_VERSION,
#ifdef MONETDB_RELEASE
MONETDB_RELEASE
#else
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -891,7 +891,7 @@ main(int argc, char *argv[])
fclose(pidfile);
{
- Mfprintf(stdout, "Merovingian %s", VERSION);
+ Mfprintf(stdout, "Merovingian %s", MONETDB_VERSION);
#ifdef MONETDB_RELEASE
Mfprintf(stdout, " (%s)", MONETDB_RELEASE);
#else
@@ -1043,7 +1043,7 @@ shutdown:
/* need to do this here, since the logging thread is shut down as
* next thing */
- Mfprintf(stdout, "Merovingian %s stopped\n", VERSION);
+ Mfprintf(stdout, "Merovingian %s stopped\n", MONETDB_VERSION);
_mero_keep_logging = 0;
if (tid != 0 && (argp = pthread_join(tid, NULL)) != 0) {
diff --git a/tools/merovingian/daemon/proxy.c b/tools/merovingian/daemon/proxy.c
--- a/tools/merovingian/daemon/proxy.c
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
