diff options
| -rw-r--r-- | build/msvc/build_env.bat | 12 | ||||
| -rw-r--r-- | build/msvc/build_release.bat | 18 |
2 files changed, 15 insertions, 15 deletions
diff --git a/build/msvc/build_env.bat b/build/msvc/build_env.bat index 56c811f..b150a98 100644 --- a/build/msvc/build_env.bat +++ b/build/msvc/build_env.bat @@ -1,7 +1,7 @@ -set B_WP27=2.7.10.3 -set B_WP35=3.5.2.3 -set B_WINPYTHON27=D:\wjp\WinPython-64bit-%B_WP27% -set B_WINPYTHON35=D:\wjp\WinPython-64bit-%B_WP35% +set B_WP2=2.7.10.3 +set B_WP3=3.6.3.0Qt5 +set B_WINPYTHON2=D:\wjp\WinPython-64bit-%B_WP2% +set B_WINPYTHON3=D:\wjp\WinPython-64bit-%B_WP3% set B_MATLAB_ROOT=C:\Program Files\MATLAB\R2015a set B_VC=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64 set B_BV=1_62 @@ -9,8 +9,8 @@ set B_BOOST=D:\wjp\boost_%B_BV%_0 set B_VCREDIST=D:\wjp\vs2015u3_redist\vc_redist.x64.exe -set B_README_WP27=C:\WinPython-64bit-%B_WP27%\python-%B_WP27:~0,-2%.amd64\Lib\site-packages -set B_README_WP35=C:\WinPython-64bit-%B_WP35%\python-%B_WP35:~0,-2%.amd64\Lib\site-packages +set B_README_WP2=C:\WinPython-64bit-%B_WP2%\python-%B_WP2:~0,-2%.amd64\Lib\site-packages +set B_README_WP3=C:\WinPython-64bit-%B_WP3%\python-%B_WP3:~0,-5%.amd64\Lib\site-packages set B_RELEASE_TAG=v1.8.3 set B_RELEASE=1.8.3 diff --git a/build/msvc/build_release.bat b/build/msvc/build_release.bat index a469678..c8228f0 100644 --- a/build/msvc/build_release.bat +++ b/build/msvc/build_release.bat @@ -14,7 +14,7 @@ cd release mkdir src mkdir matlab mkdir python27 -mkdir python35 +mkdir python36 cd src git clone -b %B_RELEASE_TAG% https://github.com/astra-toolbox/astra-toolbox astra-%B_RELEASE% @@ -56,7 +56,7 @@ copy %R%\COPYING COPYING.txt copy %B_VCREDIST% . mkdir astra -call "%B_WINPYTHON27%\scripts\env.bat" +call "%B_WINPYTHON2%\scripts\env.bat" copy %WINPYDIR%\lib\site-packages\astra\*.* astra copy %R%\bin\x64\Release_CUDA\AstraCuda64.lib astra copy "%CUDA_PATH%\bin\cudart64_80.dll" astra @@ -77,11 +77,11 @@ echo. echo. echo This directory contains pre-built Python modules for the ASTRA Toolbox. echo. -echo It has been built with WinPython-64bit-%B_WP27%. +echo It has been built with WinPython-64bit-%B_WP2%. echo. echo To use it, move the astra\ directory to your existing site-packages directory. echo Its exact location depends on your Python installation, but should look -echo similar to %B_README_WP27% . +echo similar to %B_README_WP2% . echo. echo Sample code can be found in the samples\ directory. ) > README.txt @@ -90,7 +90,7 @@ pause rem ------------------------------------------------------------------- -cd %R%\release\python35 +cd %R%\release\python36 mkdir astra-%B_RELEASE% cd astra-%B_RELEASE% xcopy /e /i %R%\samples\python samples @@ -100,7 +100,7 @@ copy %R%\COPYING COPYING.txt copy %B_VCREDIST% . mkdir astra -call "%B_WINPYTHON35%\scripts\env.bat" +call "%B_WINPYTHON3%\scripts\env.bat" copy %WINPYDIR%\lib\site-packages\astra\*.* astra copy %R%\bin\x64\Release_CUDA\AstraCuda64.lib astra copy "%CUDA_PATH%\bin\cudart64_80.dll" astra @@ -121,11 +121,11 @@ echo. echo. echo This directory contains pre-built Python modules for the ASTRA Toolbox. echo. -echo It has been built with WinPython-64bit-%B_WP35%. +echo It has been built with WinPython-64bit-%B_WP3%. echo. echo To use it, move the astra\ directory to your existing site-packages directory. echo Its exact location depends on your Python installation, but should look -echo similar to %B_README_WP35% . +echo similar to %B_README_WP3% . echo. echo Sample code can be found in the samples\ directory. ) > README.txt @@ -135,7 +135,7 @@ pause cd %R%\release python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%-matlab-win-x64', 'zip', 'matlab')" python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%-python27-win-x64', 'zip', 'python27')" -python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%-python35-win-x64', 'zip', 'python35')" +python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%-python36-win-x64', 'zip', 'python36')" python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%', 'zip', 'src')" pause |