Changeset: 23a4e7eb57ec for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=23a4e7eb57ec
Added Files:
sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat.in
Removed Files:
sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat
Modified Files:
monetdb5/NT/M5server.bat
sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
sql/server/rel_schema.c
sql/server/rel_select.c
Branch: cmake-fun
Log Message:
Intel compiler fixes and find python 3 interpreter properly on Windows registry
according to PEP 514.
diffs (109 lines):
diff --git a/monetdb5/NT/M5server.bat b/monetdb5/NT/M5server.bat
--- a/monetdb5/NT/M5server.bat
+++ b/monetdb5/NT/M5server.bat
@@ -23,6 +23,7 @@ if "%APPDATA%" == "" goto usevar
rem if the APPDATA variable does exist, put the database there
set MONETDBDIR=%APPDATA%\MonetDB5
set MONETDBFARM="--dbpath=%MONETDBDIR%\dbfarm\demo"
+if not exist %MONETDBDIR%\dbfarm ( mkdir %MONETDBDIR%\dbfarm )
goto skipusevar
:usevar
rem if the APPDATA variable does not exist, put the database in the
diff --git a/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
b/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
--- a/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
+++ b/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
@@ -58,7 +58,8 @@ if(HAVE_LIBPY3)
install(TARGETS pyapi3 DESTINATION ${LIBDIR}/monetdb5)
if(WIN32)
install(FILES $<TARGET_PDB_FILE:pyapi3> DESTINATION
${LIBDIR}/monetdb5 OPTIONAL)
- install(FILES pyapi_locatepython3.bat DESTINATION
${CMAKE_INSTALL_PREFIX})
+ configure_file(pyapi_locatepython3.bat.in
${CMAKE_CURRENT_BINARY_DIR}/pyapi_locatepython3.bat @ONLY)
+ install(FILES
${CMAKE_CURRENT_BINARY_DIR}/pyapi_locatepython3.bat DESTINATION
${CMAKE_INSTALL_PREFIX})
endif()
install(FILES pyapi3.mal DESTINATION ${LIBDIR}/monetdb5)
install(FILES 50_pyapi3.mal DESTINATION ${LIBDIR}/monetdb5/autoload)
diff --git a/sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat
b/sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat.in
rename from sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat
rename to sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat.in
--- a/sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat
+++ b/sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat.in
@@ -5,16 +5,34 @@
@REM Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
@echo off
-
+
setlocal ENABLEEXTENSIONS
-set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\3.7\InstallPath"
+@REM https://www.python.org/dev/peps/pep-0514/
+set
KEY_NAME1="HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\@Python3_VERSION_MAJOR@.@Python3_VERSION_MINOR@\InstallPath"
+set
KEY_NAME2="HKEY_CURRENT_USER\Software\Python\PythonCore\@Python3_VERSION_MAJOR@.@Python3_VERSION_MINOR@\InstallPath"
+set
KEY_NAME3="HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Python\PythonCore\@Python3_VERSION_MAJOR@.@Python3_VERSION_MINOR@\InstallPath"
set VALUE_NAME=""
-
-FOR /F "usebackq skip=2 tokens=1,2,*" %%A IN (`REG QUERY %KEY_NAME% /v
%VALUE_NAME% 2^>nul`) DO (
+
+FOR /F "usebackq skip=2 tokens=1,2,*" %%A IN (`REG QUERY %KEY_NAME1% /v
%VALUE_NAME% 2^>nul`) DO (
set ValueName=%%A
set ValueType=%%B
set ValueValue=%%C
)
+IF NOT defined ValueName (
+ FOR /F "usebackq skip=2 tokens=1,2,*" %%A IN (`REG QUERY %KEY_NAME2% /v
%VALUE_NAME% 2^>nul`) DO (
+ set ValueName=%%A
+ set ValueType=%%B
+ set ValueValue=%%C
+ )
+)
+IF NOT defined ValueName (
+ FOR /F "usebackq skip=2 tokens=1,2,*" %%A IN (`REG QUERY %KEY_NAME3% /v
%VALUE_NAME% 2^>nul`) DO (
+ set ValueName=%%A
+ set ValueType=%%B
+ set ValueValue=%%C
+ )
+)
+
IF defined ValueName (
set LOCALPYTHONHOME=%ValueValue%
set LOCALPYTHONPATH=%ValueValue%Lib
@@ -28,6 +46,6 @@ IF defined LOCALPYTHONHOME (
set "PATH=%LOCALPYTHONHOME%;%PATH%"
)
) ELSE (
- @echo MonetDB/Python Disabled: Python 3.7 installation not found.
+ @echo MonetDB/Python Disabled: Python
@Python3_VERSION_MAJOR@.@Python3_VERSION_MINOR@ installation not found.
endlocal
)
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -1923,7 +1923,7 @@ rel_grant_privs(mvc *sql, sql_schema *cu
return rel_grant_func(sql, cur, obj_privs, qname, typelist,
type, grantees, grant, grantor);
}
default:
- return sql_error(sql, 02, SQLSTATE(M0M03) "Grant: unknown token
%d", token);
+ return sql_error(sql, 02, SQLSTATE(M0M03) "Grant: unknown token
%d", (int32_t) token);
}
}
@@ -2108,7 +2108,7 @@ rel_revoke_privs(mvc *sql, sql_schema *c
return rel_revoke_func(sql, cur, obj_privs, qname, typelist,
type, grantees, grant, grantor);
}
default:
- return sql_error(sql, 02, SQLSTATE(M0M03) "Grant: unknown token
%d", token);
+ return sql_error(sql, 02, SQLSTATE(M0M03) "Grant: unknown token
%d", (int32_t) token);
}
}
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -367,7 +367,7 @@ query_exp_optname(sql_query *query, sql_
return rel_table_optname(sql, tq, q->data.lval->t->data.sym);
}
default:
- (void) sql_error(sql, 02, SQLSTATE(42000) "case %d %s\n",
q->token, token2string(q->token));
+ (void) sql_error(sql, 02, SQLSTATE(42000) "case %d %s\n",
(int32_t) q->token, token2string(q->token));
}
return NULL;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
