Skip to content

Commit

Permalink
tag release
Browse files Browse the repository at this point in the history
  • Loading branch information
stonebig committed Aug 12, 2017
1 parent 7cdf427 commit 8f7ddfe
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 12 deletions.
8 changes: 5 additions & 3 deletions generate_a_winpython_distro.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ rem *****************************
rem v2 2016-03-19 change
rem we don't use building rootdir (D:\winPython) anymore
rem we use only building basedir (D:\WinPython\basedir34Qt5)

set my_basedir=%my_root_dir_for_builds%\basedir%my_python_target%
rem set my_basedir=%my_root_dir_for_builds%\build%my_python_target%\%my_arch%

rem ***********************************************************
rem Override other scripts (simpler maintenance)
Expand All @@ -22,11 +24,11 @@ set my_buildenv=C:\winpython-64bit-3.4.3.7Qt5

set my_release_level=

if %my_python_target%==27 set my_release=4
if %my_python_target%==27 set my_release=2

if %my_python_target%==34 set my_release=5
if %my_python_target%==34 set my_release=8

if %my_python_target%==35 set my_release=3
if %my_python_target%==35 set my_release=0

if %my_python_target%==36 set my_release=0

Expand Down
8 changes: 4 additions & 4 deletions generate_winpython_distros34_qt5.bat
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ set my_release_level=
set my_flavor=Qt5


set my_arch=64
set my_arch=32
set my_preclear_build_directory=Yes

set tmp_reqdir=%my_root_dir_for_builds%\basedir%my_python_target%
Expand All @@ -24,7 +24,7 @@ set my_requirements=%tmp_reqdir%\Qt5_requirements.txt

set my_find_links=C:\WinPython\packages.srcreq

set my_source_dirs=C:\WinPython\basedir34\packages.win-amd64.Qt5
set my_source_dirs=C:\WinPython\basedir34\packages.win32.Qt5
set my_toolsdirs=C:\WinPython\basedir34\tools
set my_docsdirs=C:\WinPython\basedir34\docs

Expand All @@ -33,11 +33,11 @@ set my_install_options=--no-index --pre --trusted-host=None

call %~dp0\generate_a_winpython_distro.bat

set my_arch=32
set my_arch=64
set my_preclear_build_directory=No


set my_source_dirs=C:\WinPython\basedir34\packages.win32.Qt5
set my_source_dirs=C:\WinPython\basedir34\packages.win-amd64.Qt5
set my_toolsdirs=C:\WinPython\basedir34\tools


Expand Down
10 changes: 6 additions & 4 deletions generate_winpython_distros35_qt5.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,28 @@ set my_flavor=Qt5
set my_release=3
set my_release_level=

set my_arch=64
set my_arch=32
set my_preclear_build_directory=Yes

set tmp_reqdir=%my_root_dir_for_builds%\basedir%my_python_target%
set my_requirements=%tmp_reqdir%\Qt5_requirements.txt

set my_find_links=C:\WinPython\packages.srcreq

set my_source_dirs=C:\WinPython\basedir35\packages.win-amd64.Qt5
set my_source_dirs=C:\WinPython\basedir35\packages.win32.Qt5
set my_toolsdirs=C:\WinPython\basedir35\tools
set my_docsdirs=C:\WinPython\basedir35\docs

set my_install_options=--no-index --pre --trusted-host=None

call %~dp0\generate_a_winpython_distro.bat

set my_arch=32
set my_requirements=%tmp_reqdir%\Qt5_requirements64.txt
set my_arch=64
set my_toolsdirs=C:\WinPython\basedir35\tools64
set my_preclear_build_directory=No

set my_source_dirs=C:\WinPython\basedir35\packages.win32.Qt5
set my_source_dirs=C:\WinPython\basedir35\packages.win-amd64.Qt5


call %~dp0\generate_a_winpython_distro.bat
Expand Down
43 changes: 43 additions & 0 deletions generate_winpython_distros36_qt5.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
rem this replace running manually from spyder the make.py
rem to launch from a winpython module 'make' directory

set my_original_path=%path%
set my_buildenv=C:\winpython-64bit-3.4.3.7Qt5

set my_root_dir_for_builds=C:\Winpython
set my_python_target=36
set my_pyver=3.6

set my_flavor=Qt5

set my_release=0

set my_release_level=

set my_arch=32
set my_preclear_build_directory=Yes

set tmp_reqdir=%my_root_dir_for_builds%\basedir%my_python_target%

set my_requirements=C:\Winpython\basedir36\Qt5_requirements.txt

set my_find_links=C:\WinPython\packages.srcreq

set my_source_dirs=C:\WinPython\basedir36\packages.win32.Qt5
set my_toolsdirs=C:\WinPython\basedir36\Tools
set my_docsdirs=C:\WinPython\basedir36\docs

set my_install_options=--no-index --pre --trusted-host=None

call %~dp0\generate_a_winpython_distro.bat

set my_arch=64
set my_requirements=C:\Winpython\basedir36\Qt5_requirements64.txt
set my_toolsdirs=C:\WinPython\basedir36\Tools64

set my_preclear_build_directory=No
set my_source_dirs=C:\WinPython\basedir36\packages.win-amd64.Qt5
call %~dp0\generate_a_winpython_distro.bat


pause
2 changes: 1 addition & 1 deletion winpython/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
OTHER DEALINGS IN THE SOFTWARE.
"""

__version__ = '1.9.20170809'
__version__ = '1.9.20170812'
__license__ = __doc__
__project_url__ = 'http://winpython.github.io/'

0 comments on commit 8f7ddfe

Please sign in to comment.