Skip to content

Commit 8f7ddfe

Browse files
author
stonebig
committed
tag release
1 parent 7cdf427 commit 8f7ddfe

File tree

5 files changed

+59
-12
lines changed

5 files changed

+59
-12
lines changed

‎generate_a_winpython_distro.bat‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ rem *****************************
1313
rem v2 2016-03-19 change
1414
rem we don't use building rootdir (D:\winPython) anymore
1515
rem we use only building basedir (D:\WinPython\basedir34Qt5)
16+
1617
set my_basedir=%my_root_dir_for_builds%\basedir%my_python_target%
18+
rem set my_basedir=%my_root_dir_for_builds%\build%my_python_target%\%my_arch%
1719

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

2325
set my_release_level=
2426

25-
if %my_python_target%==27 set my_release=4
27+
if %my_python_target%==27 set my_release=2
2628

27-
if %my_python_target%==34 set my_release=5
29+
if %my_python_target%==34 set my_release=8
2830

29-
if %my_python_target%==35 set my_release=3
31+
if %my_python_target%==35 set my_release=0
3032

3133
if %my_python_target%==36 set my_release=0
3234

‎generate_winpython_distros34_qt5.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set my_release_level=
1515
set my_flavor=Qt5
1616

1717

18-
set my_arch=64
18+
set my_arch=32
1919
set my_preclear_build_directory=Yes
2020

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

2525
set my_find_links=C:\WinPython\packages.srcreq
2626

27-
set my_source_dirs=C:\WinPython\basedir34\packages.win-amd64.Qt5
27+
set my_source_dirs=C:\WinPython\basedir34\packages.win32.Qt5
2828
set my_toolsdirs=C:\WinPython\basedir34\tools
2929
set my_docsdirs=C:\WinPython\basedir34\docs
3030

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

3434
call %~dp0\generate_a_winpython_distro.bat
3535

36-
set my_arch=32
36+
set my_arch=64
3737
set my_preclear_build_directory=No
3838

3939

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

4343

‎generate_winpython_distros35_qt5.bat‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,28 @@ set my_flavor=Qt5
1313
set my_release=3
1414
set my_release_level=
1515

16-
set my_arch=64
16+
set my_arch=32
1717
set my_preclear_build_directory=Yes
1818

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

2222
set my_find_links=C:\WinPython\packages.srcreq
2323

24-
set my_source_dirs=C:\WinPython\basedir35\packages.win-amd64.Qt5
24+
set my_source_dirs=C:\WinPython\basedir35\packages.win32.Qt5
2525
set my_toolsdirs=C:\WinPython\basedir35\tools
2626
set my_docsdirs=C:\WinPython\basedir35\docs
2727

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

3030
call %~dp0\generate_a_winpython_distro.bat
3131

32-
set my_arch=32
32+
set my_requirements=%tmp_reqdir%\Qt5_requirements64.txt
33+
set my_arch=64
34+
set my_toolsdirs=C:\WinPython\basedir35\tools64
3335
set my_preclear_build_directory=No
3436

35-
set my_source_dirs=C:\WinPython\basedir35\packages.win32.Qt5
37+
set my_source_dirs=C:\WinPython\basedir35\packages.win-amd64.Qt5
3638

3739

3840
call %~dp0\generate_a_winpython_distro.bat

‎generate_winpython_distros36_qt5.bat‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
rem this replace running manually from spyder the make.py
2+
rem to launch from a winpython module 'make' directory
3+
4+
set my_original_path=%path%
5+
set my_buildenv=C:\winpython-64bit-3.4.3.7Qt5
6+
7+
set my_root_dir_for_builds=C:\Winpython
8+
set my_python_target=36
9+
set my_pyver=3.6
10+
11+
set my_flavor=Qt5
12+
13+
set my_release=0
14+
15+
set my_release_level=
16+
17+
set my_arch=32
18+
set my_preclear_build_directory=Yes
19+
20+
set tmp_reqdir=%my_root_dir_for_builds%\basedir%my_python_target%
21+
22+
set my_requirements=C:\Winpython\basedir36\Qt5_requirements.txt
23+
24+
set my_find_links=C:\WinPython\packages.srcreq
25+
26+
set my_source_dirs=C:\WinPython\basedir36\packages.win32.Qt5
27+
set my_toolsdirs=C:\WinPython\basedir36\Tools
28+
set my_docsdirs=C:\WinPython\basedir36\docs
29+
30+
set my_install_options=--no-index --pre --trusted-host=None
31+
32+
call %~dp0\generate_a_winpython_distro.bat
33+
34+
set my_arch=64
35+
set my_requirements=C:\Winpython\basedir36\Qt5_requirements64.txt
36+
set my_toolsdirs=C:\WinPython\basedir36\Tools64
37+
38+
set my_preclear_build_directory=No
39+
set my_source_dirs=C:\WinPython\basedir36\packages.win-amd64.Qt5
40+
call %~dp0\generate_a_winpython_distro.bat
41+
42+
43+
pause

‎winpython/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
OTHER DEALINGS IN THE SOFTWARE.
2929
"""
3030

31-
__version__ = '1.9.20170809'
31+
__version__ = '1.9.20170812'
3232
__license__ = __doc__
3333
__project_url__ = 'http://winpython.github.io/'

0 commit comments

Comments
 (0)