10000 Merge pull request #728 from stonebig/master · winpython/winpython@6cc0797 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6cc0797

Browse files
stonebigstonebig
authored
Merge pull request #728 from stonebig/master
move to 7zip "installer" by default
2 parents dc63f05 + 8aed6f8 commit 6cc0797

File tree

4 files changed

+22
-6
lines changed

4 files changed

+22
-6
lines changed

‎generate_a_winpython_distro.bat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@ if %my_python_target%==34 set my_release=8
3131

3232
if %my_python_target%==35 set my_release=3
3333

34-
if %my_python_target%==36 set my_release=0
34+
if %my_python_target%==36 set my_release=1
3535

3636
if %my_python_target%==37 set my_release=0
3737

38+
if %my_python_target%==38 set my_release=0
39+
3840
rem **** 2018-10-30 create_installer **
3941
if "%my_create_installer%"=="" set my_create_installer=True
4042
rem ***********************************************************

‎generate_winpython_distros36_qt5.bat

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ set my_release=0
1414

1515
set my_release_level=
1616

17+
rem set my_create_installer=False
18+
set my_create_installer=nsis.zip
19+
set my_create_installer=7zip
20+
1721
set my_install_options=--no-index --pre --trusted-host=None
1822
set my_find_links=C:\Winp\packages.srcreq
1923
set my_docsdirs=C:\Winp\bd36\docs
@@ -25,15 +29,15 @@ set tmp_reqdir=%my_root_dir_for_builds%\bd%my_python_target%
2529
set my_requirements=C:\Winp\bd36\Qt5_requirements.txt
2630

2731

28-
set my_source_dirs=C:\Winp\bd36\packages.win32.Qt5
32+
set my_source_dirs=C:\Winp\bd36\packages.win32
2933
set my_toolsdirs=C:\Winp\bd36\Tools
3034

3135
set my_preclear_build_directory=Yes
3236
call %~dp0\generate_a_winpython_distro.bat
3337

3438
set my_arch=64
3539
set my_requirements=C:\Winp\bd36\Qt5_requirements64.txt
36-
set my_source_dirs=C:\Winp\bd36\packages.win-amd64.Qt5
40+
set my_source_dirs=C:\Winp\bd36\packages.win-amd64
3741
set my_toolsdirs=C:\Winp\bd36\Tools64
3842

3943
set my_preclear_build_directory=No

‎generate_winpython_distros37_qt5.bat

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ set my_release=0
1414

1515
set my_release_level=
1616

17+
rem set my_create_installer=False
18+
set my_create_installer=nsis.zip
19+
set my_create_installer=7zip
20+
1721
set my_install_options=--no-index --pre --trusted-host=None
1822
set my_find_links=C:\Winp\packages.srcreq
1923
set my_docsdirs=C:\Winp\bd37\docs
@@ -23,15 +27,15 @@ set tmp_reqdir=%my_root_dir_for_builds%\bd%my_python_target%
2327

2428
set my_arch=32
2529
set my_requirements=C:\Winp\bd37\Qt5_requirements.txt
26-
set my_source_dirs=C:\Winp\bd37\packages.win32.Qt5
30+
set my_source_dirs=C:\Winp\bd37\packages.win32
2731
set my_toolsdirs=C:\Winp\bd37\Tools
2832

2933
set my_preclear_build_directory=Yes
3034
call %~dp0\generate_a_winpython_distro.bat
3135

3236
set my_arch=64
3337
set my_requirements=C:\Winp\bd37\Qt5_requirements64.txt
34-
set my_source_dirs=C:\Winp\bd37\packages.win-amd64.Qt5
38+
set my_source_dirs=C:\Winp\bd37\packages.win-amd64
3539
set my_toolsdirs=C:\Winp\bd37\Tools64
3640

3741
set my_preclear_build_directory=No

‎portable/installer_7zip.bat

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
rem Copyright © 2018 WinPython team
1+
rem Copyright @ 2018 WinPython team
22
rem Licensed under the terms of the MIT License
33
rem (see winpython/__init__.py for details)
44

@@ -40,6 +40,12 @@ set OutputBaseFilename=%ID%%ARCH%-%VERSION%%RELEASELEVEL%
4040

4141
rem 7-zip uncompress the directory compressed %DISTDIR% (no option to change it in gui)
4242

43+
rem ================================================================
44+
rem 2019-03-16 copy license at source (due to 7zip limitations)
45+
46+
copy/Y %PORTABLE_DIR%\license.txt %DISTDIR%\license.txt
47+
48+
rem ================================================================
4349

4450
echo %time%
4551

0 commit comments

Comments
 (0)
0