Changeset: dc287ccdbcb7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dc287ccdbcb7
Added Files:
sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat.in
sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat.in
Removed Files:
sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat
sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat
Modified Files:
NT/rules.msc
sql/backends/monet5/UDF/pyapi/Makefile.ag
sql/backends/monet5/UDF/pyapi3/Makefile.ag
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Nov2019 branch.
diffs (127 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -64,18 +64,24 @@ PTHREAD_LIBS =
ODBCINST_LIBS = odbccp32.lib user32.lib $(LEGACY_STDIO_DEFINITIONS)
ODBC_LIBS = odbc32.lib
+!IFNDEF PY3VER
+PY2VER=7
+!ENDIF
!IFNDEF PYTHON2BASE
-PYTHON2BASE=C:\Python27
+PYTHON2BASE=C:\Python2$(PY2VER)
!ENDIF
!IFNDEF PYTHON2LIB
-PYTHON2LIB=python27.lib
+PYTHON2LIB=python2$(PY2VER).lib
!ENDIF
+!IFNDEF PY3VER
+PY3VER=7
+!ENDIF
!IFNDEF PYTHON3BASE
-PYTHON3BASE=C:\Python32
+PYTHON3BASE=C:\Python3$(PY3VER)
!ENDIF
!IFNDEF PYTHON3LIB
-PYTHON3LIB=python37.lib
+PYTHON3LIB=python3$(PY3VER).lib
!ENDIF
PYTHON_LIBDIR=share\MonetDB\python
@@ -416,6 +422,8 @@ CONFIGURE="$(PYTHON)" $(CONFIGURE_PY) \
"PACKAGE=$(pkg)" \
"PYTHON=$(PYTHON)" \
"PYTHON_LIBDIR=$(PYTHON_LIBDIR)" \
+ "PY2VER=$(PY2VER)" \
+ "PY3VER=$(PY3VER)" \
"PYTHON2=$(PYTHON2)" \
"PYTHON3=$(PYTHON3)" \
"TOPDIR=$(TOPDIR)" \
diff --git a/sql/backends/monet5/UDF/pyapi/Makefile.ag
b/sql/backends/monet5/UDF/pyapi/Makefile.ag
--- a/sql/backends/monet5/UDF/pyapi/Makefile.ag
+++ b/sql/backends/monet5/UDF/pyapi/Makefile.ag
@@ -47,7 +47,7 @@ scripts_bat = {
COND = NATIVE_WIN32
EXT = bat
DIR = prefix
- SOURCES = pyapi_locatepython2.bat
+ SOURCES = pyapi_locatepython2.bat.in
}
EXTRA_DIST_DIR = Tests
diff --git a/sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat
b/sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat.in
rename from sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat
rename to sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat.in
--- a/sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat
+++ b/sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat.in
@@ -7,7 +7,7 @@
@echo off
setlocal ENABLEEXTENSIONS
-set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\2.7\InstallPath"
+set
KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\2.@PY2VER@\InstallPath"
set VALUE_NAME=""
FOR /F "usebackq skip=2 tokens=1,2,*" %%A IN (`REG QUERY %KEY_NAME% /v
%VALUE_NAME% 2^>nul`) DO (
@@ -28,6 +28,6 @@ IF defined LOCALPYTHONHOME (
set "PATH=%LOCALPYTHONHOME%;%PATH%"
)
) ELSE (
- @echo MonetDB/Python Disabled: Python 2.7 installation not found.
+ @echo MonetDB/Python Disabled: Python 2.@PY2VER@ installation not found.
endlocal
)
diff --git a/sql/backends/monet5/UDF/pyapi3/Makefile.ag
b/sql/backends/monet5/UDF/pyapi3/Makefile.ag
--- a/sql/backends/monet5/UDF/pyapi3/Makefile.ag
+++ b/sql/backends/monet5/UDF/pyapi3/Makefile.ag
@@ -50,7 +50,7 @@ scripts_bat = {
COND = NATIVE_WIN32
EXT = bat
DIR = prefix
- SOURCES = pyapi_locatepython3.bat
+ SOURCES = pyapi_locatepython3.bat.in
}
EXTRA_DIST_DIR = Tests
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
@@ -7,7 +7,7 @@
@echo off
setlocal ENABLEEXTENSIONS
-set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\3.7\InstallPath"
+set
KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\3.@PY3VER@\InstallPath"
set VALUE_NAME=""
FOR /F "usebackq skip=2 tokens=1,2,*" %%A IN (`REG QUERY %KEY_NAME% /v
%VALUE_NAME% 2^>nul`) DO (
@@ -28,6 +28,6 @@ IF defined LOCALPYTHONHOME (
set "PATH=%LOCALPYTHONHOME%;%PATH%"
)
) ELSE (
- @echo MonetDB/Python Disabled: Python 3.7 installation not found.
+ @echo MonetDB/Python Disabled: Python 3.@PY3VER@ installation not found.
endlocal
)
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3074,11 +3074,11 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
if winreg is not None:
if env['TST_BITS'] == '32bit':
if sys.maxsize > 2**32:
- regkey =
r'SOFTWARE\Wow6432Node\Python\PythonCore\3.7-32\InstallPath'
+ regkey =
r'SOFTWARE\Wow6432Node\Python\PythonCore\3.@PY3VER@-32\InstallPath'
else:
- regkey =
r'SOFTWARE\Python\PythonCore\3.7-32\InstallPath'
+ regkey =
r'SOFTWARE\Python\PythonCore\3.@PY3VER@-32\InstallPath'
else:
- regkey = r'SOFTWARE\Python\PythonCore\3.7\InstallPath'
+ regkey =
r'SOFTWARE\Python\PythonCore\3.@PY3VER@\InstallPath'
try:
with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, regkey)
as key:
instpath = winreg.QueryValue(key, None)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
