Use separate BuildDepsCache.txt for x86 and x64 builds.

This commit is contained in:
Stinkfist0
2015-11-09 16:04:06 +02:00
parent 0a8791e04e
commit 8b63959509
4 changed files with 16 additions and 16 deletions
+4 -4
View File
@@ -1,5 +1,5 @@
# Dependency and build folders created by the build scripts
deps*/
build*/
install*/
/win/BuildDepsCache.txt
/deps*/
/build*/
/install*/
/win/BuildDepsCache*.txt
+2 -2
View File
@@ -289,8 +289,8 @@ set PYTHON_INSTALLER=python-%PYTHON_VERSION%%PYTHON_AMD64_POSTFIX%.msi
:: NOTE/TODO 3.5.0 doesn't use MSI any longer, but exe: set PYTHON_INSTALLER=python-%PYTHON_VERSION%%PYTHON_AMD64_POSTFIX%.exe
IF "%IFCOS_INSTALL_PYTHON%"=="TRUE" (
REM Store Python versions to BuildDepsCache.txt for run-cmake.bat
echo PY_VER_MAJOR_MINOR=%PY_VER_MAJOR_MINOR%>"%THISDIR%\BuildDepsCache.txt"
echo PYTHONPATH=%PYTHONPATH%>>"%THISDIR%\BuildDepsCache.txt"
echo PY_VER_MAJOR_MINOR=%PY_VER_MAJOR_MINOR%>"%THISDIR%\BuildDepsCache-%TARGET_ARCH%.txt"
echo PYTHONPATH=%PYTHONPATH%>>"%THISDIR%\BuildDepsCache-%TARGET_ARCH%.txt"
cd "%DEPS_DIR%"
call :DownloadFile https://www.python.org/ftp/python/%PYTHON_VERSION%/%PYTHON_INSTALLER% "%DEPS_DIR%" %PYTHON_INSTALLER%
+7 -7
View File
@@ -40,11 +40,11 @@ folder and the required IfcOpenShell-Python parts are deployed to the <PYTHONPAT
== Directory Structure ==
| build-deps.cmd - Fetches and builds all needed dependencies for IFCOS
| readme.txt - This file
| run-cmake.bat - Sets environment variables for the dependencies and runs CMake for IFCOS
| vs-cfg.cmd - Utility file used by the build scripts
| BuildDepsCache.txt - Cache file created by build-deps.cmd
| build-deps.cmd - Fetches and builds all needed dependencies for IFCOS
| readme.txt - This file
| run-cmake.bat - Sets environment variables for the dependencies and runs CMake for IFCOS
| vs-cfg.cmd - Utility file used by the build scripts
| BuildDepsCache-<ARCH>.txt - Cache file created by build-deps.cmd
|
+---sln - Contains the old Visual Studio solution and project files
\---utils - Contains various utilities for the build scripts
+---sln - Contains the old Visual Studio solution and project files
\---utils - Contains various utilities for the build scripts
+3 -3
View File
@@ -25,11 +25,11 @@ set PROJECT_NAME=IfcOpenShell
:: Enable the delayed environment variable expansion needed in vs-cfg.cmd.
setlocal EnableDelayedExpansion
:: Read Python related variables from BuildDepsCache.txt
for /f "delims== tokens=1,2" %%G in (BuildDepsCache.txt) do set %%G=%%H
call vs-cfg.cmd %1
:: Read Python related variables from BuildDepsCache.txt
for /f "delims== tokens=1,2" %%G in (BuildDepsCache-%TARGET_ARCH%.txt) do set %%G=%%H
pushd ..
set CMAKE_INSTALL_PREFIX=%CD%\installed-vs%VS_VER%-%TARGET_ARCH%
popd