diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-12-05 17:20:18 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-12-09 15:40:29 +0100 |
| commit | 1954121d82238a97f185dc0cdeaf460f5f4b6a77 (patch) | |
| tree | e17f849d11ed7c109310168f58a2269561b080a9 | |
| parent | 510f84ea64cca403d4ce85f3fdb77596ce06463a (diff) | |
| download | astra-1954121d82238a97f185dc0cdeaf460f5f4b6a77.tar.gz astra-1954121d82238a97f185dc0cdeaf460f5f4b6a77.tar.bz2 astra-1954121d82238a97f185dc0cdeaf460f5f4b6a77.tar.xz astra-1954121d82238a97f185dc0cdeaf460f5f4b6a77.zip | |
Fix build_release.bat
| -rw-r--r-- | build/msvc/build_env.bat | 4 | ||||
| -rw-r--r-- | build/msvc/build_release.bat | 16 |
2 files changed, 8 insertions, 12 deletions
diff --git a/build/msvc/build_env.bat b/build/msvc/build_env.bat index 458209a..8cb7c96 100644 --- a/build/msvc/build_env.bat +++ b/build/msvc/build_env.bat @@ -12,5 +12,5 @@ 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_RELEASE_TAG=v1.7.1 -set B_RELEASE=1.7.1beta +set B_RELEASE_TAG=v1.8 +set B_RELEASE=1.8 diff --git a/build/msvc/build_release.bat b/build/msvc/build_release.bat index 87bfb28..e88cb6e 100644 --- a/build/msvc/build_release.bat +++ b/build/msvc/build_release.bat @@ -17,9 +17,8 @@ mkdir python27 mkdir python35 cd src -git clone https://github.com/astra-toolbox/astra-toolbox astra-%B_RELEASE% +git clone -b %B_RELEASE_TAG% https://github.com/astra-toolbox/astra-toolbox astra-%B_RELEASE% cd astra-%B_RELEASE% -git checkout %B_RELEASE_TAG% rd /s /q .git pause @@ -133,13 +132,10 @@ echo Sample code can be found in the samples\ directory. pause -cd %R%\release\matlab -python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%-matlab-win-x64', 'zip', 'astra-%B_RELEASE%')" -cd %R%\release\python27 -python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%-python27-win-x64', 'zip', 'astra-%B_RELEASE%')" -cd %R%\release\python35 -python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%-python35-win-x64', 'zip', 'astra-%B_RELEASE%')" -cd %R%\release\src -python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%', 'zip', 'astra-%B_RELEASE%')" +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%', 'zip', 'src')" pause |