Changeset: ab548075267d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ab548075267d
Modified Files:
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
sql/backends/monet5/sql_time.c
Branch: default
Log Message:
Merge with Oct2020 branch.
diffs (89 lines):
diff --git a/clients/odbc/driver/CMakeLists.txt
b/clients/odbc/driver/CMakeLists.txt
--- a/clients/odbc/driver/CMakeLists.txt
+++ b/clients/odbc/driver/CMakeLists.txt
@@ -103,7 +103,7 @@ target_sources(MonetODBC
SQLTables.c
SQLTransact.c
driver.rc
- ODBC.syms)
+ ODBC.def)
target_include_directories(MonetODBC
PRIVATE
diff --git a/clients/odbc/driver/ODBC.syms b/clients/odbc/driver/ODBC.def
rename from clients/odbc/driver/ODBC.syms
rename to clients/odbc/driver/ODBC.def
--- a/clients/odbc/driver/ODBC.syms
+++ b/clients/odbc/driver/ODBC.def
@@ -1,3 +1,4 @@
+EXPORTS
DllMain
SQLAllocConnect
SQLAllocEnv
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -22,10 +22,10 @@ BEGIN
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
VALUE "FileVersion", sversion(11,40,0)
- VALUE "InternalName", "libMonetODBC\0"
+ VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
- VALUE "OriginalFilename", "libMonetODBC.dll\0"
+ VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
VALUE "ProductVersion", sversion(11,40,0)
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
@@ -13,7 +13,7 @@ target_sources(MonetODBCs
PRIVATE
setup.c
setup.rc
- setup.syms
+ setup.def
resource.h)
target_include_directories(MonetODBCs
diff --git a/clients/odbc/winsetup/install.c b/clients/odbc/winsetup/install.c
--- a/clients/odbc/winsetup/install.c
+++ b/clients/odbc/winsetup/install.c
@@ -20,8 +20,8 @@
static char *DriverName = "MonetDB ODBC Driver";
static char *DataSourceName = "MonetDB";
-static char *DriverDLL = "libMonetODBC" DLL;
-static char *DriverDLLs = "libMonetODBCs" DLL;
+static char *DriverDLL = "MonetODBC" DLL;
+static char *DriverDLLs = "MonetODBCs" DLL;
/* General error handler for installer functions */
diff --git a/clients/odbc/winsetup/setup.syms b/clients/odbc/winsetup/setup.def
rename from clients/odbc/winsetup/setup.syms
rename to clients/odbc/winsetup/setup.def
--- a/clients/odbc/winsetup/setup.syms
+++ b/clients/odbc/winsetup/setup.def
@@ -1,3 +1,4 @@
+EXPORTS
DllMain
ConfigDSN
ConfigDriver
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
@@ -84,9 +84,9 @@ BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
VALUE "FileVersion", sversion(11,40,0)
- VALUE "InternalName", "libMonetODBCs.dll"
+ VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020"
- VALUE "OriginalFilename", "libMonetODBCs.dll"
+ VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
VALUE "ProductVersion", sversion(11,40,0)
END
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
