Merge branch 'master' into HEAD

aothms · aothms · commit 2a42a582fdca · 2020-06-07T19:46:34.000+02:00
diff --git a/README.md b/README.md
@@ -48,6 +48,8 @@ Instructions in a nutshell (**assuming Visual Studio 2015 x64 environment variab
     > build-deps.cmd
     > run-cmake.bat
 
+NB: `build-deps.cmd` need to be ran from the directory containing it, i.e. the `./win` folder.
+
 You can now open and build the solution file in Visual Studio:
 
     > ..\build-vs2015-x64\IfcOpenShell.sln
diff --git a/nix/build-all.py b/nix/build-all.py
@@ -64,7 +64,7 @@
 OCE_VERSION="0.18"
 # OCCT_VERSION="7.1.0"
 # OCCT_HASH="89aebde"
-PYTHON_VERSIONS=["2.7.16", "3.2.6", "3.3.6", "3.4.6", "3.5.3", "3.6.2", "3.7.3"]
+PYTHON_VERSIONS=["2.7.16", "3.2.6", "3.3.6", "3.4.6", "3.5.3", "3.6.2", "3.7.3", "3.8.2"]
 # OCCT_VERSION="7.2.0"
 # OCCT_HASH="88af392"
 OCCT_VERSION="7.3.0p3"
diff --git a/win/build-deps.cmd b/win/build-deps.cmd
@@ -24,6 +24,13 @@
 @echo off
 echo.
 
+for %%Q in ("%~dp0\.") DO set "batpath=%%~fQ"
+
+if NOT "%CD%" == "%batpath%" (
+    GOTO :ErrorAndPrintUsage
+)
+
+
 set PROJECT_NAME=IfcOpenShell
 call utils\cecho.cmd 15 0 "This script fetches and builds all %PROJECT_NAME% dependencies"
 echo.
@@ -562,3 +569,5 @@ echo   - https://www.visualstudio.com/
 echo  5. Run this batch script with Visual Studio environment variables set.
 echo   - https://msdn.microsoft.com/en-us/library/ms229859(v=vs.110).aspx
 echo.
+echo NB: This script needs to be ran from the directory directly containing it.
+echo.
