Changeset: 06e7bf6b31d2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=06e7bf6b31d2
Modified Files:
monetdb5/extras/pyapi/pyapi_locatepython.bat
Branch: pythonudf
Log Message:
Properly test if Python is present before enabling MonetDB/Python on Windows.
diffs (25 lines):
diff --git a/monetdb5/extras/pyapi/pyapi_locatepython.bat
b/monetdb5/extras/pyapi/pyapi_locatepython.bat
--- a/monetdb5/extras/pyapi/pyapi_locatepython.bat
+++ b/monetdb5/extras/pyapi/pyapi_locatepython.bat
@@ -15,10 +15,15 @@ IF defined ValueName (
) ELSE (
@echo "%KEY_NAME%\%VALUE_NAME% not found."
)
-
-endlocal & (
- set PYTHONHOME=%LOCALPYTHONHOME%
- set PYTHONPATH=%LOCALPYTHONPATH%
- set MONETDBPYTHONUDF="embedded_py=true"
- set PATH="%PYTHONHOME%;%PATH%"
+
+IF defined LOCALPYTHONHOME (
+ endlocal & (
+ set PYTHONHOME=%LOCALPYTHONHOME%
+ set PYTHONPATH=%LOCALPYTHONPATH%
+ set MONETDBPYTHONUDF="embedded_py=true"
+ set PATH="%PYTHONHOME%;%PATH%"
+ )
+) ELSE (
+ @echo MonetDB/Python Disabled: Python 2.7 installation not found.
+ endlocal
)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
