Changeset: cc1b06d1d39c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc1b06d1d39c
Modified Files:
monetdb5/NT/M5server.bat
Branch: Apr2019
Log Message:
First test for Python 3, and if it fails, test for Python 2.
diffs (24 lines):
diff --git a/monetdb5/NT/M5server.bat b/monetdb5/NT/M5server.bat
--- a/monetdb5/NT/M5server.bat
+++ b/monetdb5/NT/M5server.bat
@@ -39,15 +39,15 @@ for /d %%i in ("%MONETDBDIR%"\sql_logs\*
rmdir "%MONETDBDIR%\sql_logs"
:skipmove
-set MONETDBPYTHONUDF="embedded_py=false"
+set MONETDBPYTHONUDF=embedded_py=false
-if not exist "%MONETDB%\pyapi_locatepython2.bat" goto skippython2
-call "%MONETDB%\pyapi_locatepython2.bat"
-goto skippython3
-:skippython2
if not exist "%MONETDB%\pyapi_locatepython3.bat" goto skippython3
call "%MONETDB%\pyapi_locatepython3.bat"
:skippython3
+if not "%MONETDBPYTHONUDF%" == "embedded_py=false" goto skippython2
+if not exist "%MONETDB%\pyapi_locatepython2.bat" goto skippython2
+call "%MONETDB%\pyapi_locatepython2.bat"
+:skippython2
rem start the real server
"%MONETDB%\bin\mserver5.exe" --set "prefix=%MONETDB%" --set %MONETDBPYTHONUDF%
--set "exec_prefix=%MONETDB%" %MONETDBFARM% %*
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
