From dbfbb2a360979de412b9f07d779d1957bfbeece9 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 22 Jun 2018 16:13:17 +0200 Subject: Further update Windows release scripts --- build/msvc/build_python2.bat | 28 ++++++++++++++++++++++++++++ build/msvc/build_python27.bat | 28 ---------------------------- build/msvc/build_python3.bat | 27 +++++++++++++++++++++++++++ build/msvc/build_python35.bat | 27 --------------------------- 4 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 build/msvc/build_python2.bat delete mode 100644 build/msvc/build_python27.bat create mode 100644 build/msvc/build_python3.bat delete mode 100644 build/msvc/build_python35.bat (limited to 'build/msvc') diff --git a/build/msvc/build_python2.bat b/build/msvc/build_python2.bat new file mode 100644 index 0000000..4ac2141 --- /dev/null +++ b/build/msvc/build_python2.bat @@ -0,0 +1,28 @@ +@echo off + +cd /D %~dp0 +cd ..\.. +set R=%CD% + +call "%~dp0build_env.bat" + +call "%B_WINPYTHON2%\scripts\env.bat" +call "%B_VC%\vcvars64.bat" + +cd /D %R% + +msbuild astra_vc14.sln /p:Configuration=Release_CUDA /p:Platform=x64 /t:astra_vc14 + +cd python + +rd /s /q build +rd /s /q "%WINPYDIR%\lib\site-packages\astra" + +set VS90COMNTOOLS=%VS140COMNTOOLS% +set CL=/DASTRA_CUDA /DASTRA_PYTHON /EHsc +set INCLUDE=%R%\include;%R%\lib\include;%CUDA_PATH%\include +copy ..\bin\x64\Release_CUDA\AstraCuda64.lib astra.lib +python builder.py build_ext --compiler=msvc install +copy ..\bin\x64\Release_CUDA\AstraCuda64.dll "%WINPYDIR%\lib\site-packages\astra" + +pause diff --git a/build/msvc/build_python27.bat b/build/msvc/build_python27.bat deleted file mode 100644 index a9495f0..0000000 --- a/build/msvc/build_python27.bat +++ /dev/null @@ -1,28 +0,0 @@ -@echo off - -cd /D %~dp0 -cd ..\.. -set R=%CD% - -call "%~dp0build_env.bat" - -call "%B_WINPYTHON27%\scripts\env.bat" -call "%B_VC%\vcvars64.bat" - -cd /D %R% - -msbuild astra_vc14.sln /p:Configuration=Release_CUDA /p:Platform=x64 /t:astra_vc14 - -cd python - -rd /s /q build -rd /s /q "%WINPYDIR%\lib\site-packages\astra" - -set VS90COMNTOOLS=%VS140COMNTOOLS% -set CL=/DASTRA_CUDA /DASTRA_PYTHON /EHsc -set INCLUDE=%R%\include;%R%\lib\include;%CUDA_PATH%\include -copy ..\bin\x64\Release_CUDA\AstraCuda64.lib astra.lib -python builder.py build_ext --compiler=msvc install -copy ..\bin\x64\Release_CUDA\AstraCuda64.dll "%WINPYDIR%\lib\site-packages\astra" - -pause diff --git a/build/msvc/build_python3.bat b/build/msvc/build_python3.bat new file mode 100644 index 0000000..cc21f0f --- /dev/null +++ b/build/msvc/build_python3.bat @@ -0,0 +1,27 @@ +@echo off + +cd /D %~dp0 +cd ..\.. +set R=%CD% + +call "%~dp0build_env.bat" + +call "%B_WINPYTHON3%\scripts\env.bat" +call "%B_VC%\vcvars64.bat" + +cd /D %R% + +msbuild astra_vc14.sln /p:Configuration=Release_CUDA /p:Platform=x64 /t:astra_vc14 + +cd python + +rd /s /q build +rd /s /q "%WINPYDIR%\lib\site-packages\astra" + +set CL=/DASTRA_CUDA /DASTRA_PYTHON +set INCLUDE=%R%\include;%R%\lib\include;%CUDA_PATH%\include +copy ..\bin\x64\Release_CUDA\AstraCuda64.lib astra.lib +python builder.py build_ext --compiler=msvc install +copy ..\bin\x64\Release_CUDA\AstraCuda64.dll "%WINPYDIR%\lib\site-packages\astra" + +pause diff --git a/build/msvc/build_python35.bat b/build/msvc/build_python35.bat deleted file mode 100644 index 72c6ec4..0000000 --- a/build/msvc/build_python35.bat +++ /dev/null @@ -1,27 +0,0 @@ -@echo off - -cd /D %~dp0 -cd ..\.. -set R=%CD% - -call "%~dp0build_env.bat" - -call "%B_WINPYTHON35%\scripts\env.bat" -call "%B_VC%\vcvars64.bat" - -cd /D %R% - -msbuild astra_vc14.sln /p:Configuration=Release_CUDA /p:Platform=x64 /t:astra_vc14 - -cd python - -rd /s /q build -rd /s /q "%WINPYDIR%\lib\site-packages\astra" - -set CL=/DASTRA_CUDA /DASTRA_PYTHON -set INCLUDE=%R%\include;%R%\lib\include;%CUDA_PATH%\include -copy ..\bin\x64\Release_CUDA\AstraCuda64.lib astra.lib -python builder.py build_ext --compiler=msvc install -copy ..\bin\x64\Release_CUDA\AstraCuda64.dll "%WINPYDIR%\lib\site-packages\astra" - -pause -- cgit v1.2.3