move to 7zip "installer" by default

stonebig · stonebig · commit 8aed6f8d9535 · 2019-03-16T19:56:56.000+01:00
diff --git a/generate_a_winpython_distro.bat b/generate_a_winpython_distro.bat
@@ -31,10 +31,12 @@ if %my_python_target%==34 set my_release=8
 
 if %my_python_target%==35 set my_release=3
 
-if %my_python_target%==36 set my_release=0
+if %my_python_target%==36 set my_release=1
 
 if %my_python_target%==37 set my_release=0
 
+if %my_python_target%==38 set my_release=0
+
 rem **** 2018-10-30 create_installer **
 if "%my_create_installer%"=="" set my_create_installer=True
 rem ***********************************************************
diff --git a/generate_winpython_distros36_qt5.bat b/generate_winpython_distros36_qt5.bat
@@ -14,6 +14,10 @@ set my_release=0
 
 set my_release_level=
 
+rem set my_create_installer=False
+set my_create_installer=nsis.zip
+set my_create_installer=7zip
+
 set my_install_options=--no-index --pre --trusted-host=None
 set my_find_links=C:\Winp\packages.srcreq
 set my_docsdirs=C:\Winp\bd36\docs
@@ -25,15 +29,15 @@ set tmp_reqdir=%my_root_dir_for_builds%\bd%my_python_target%
 set my_requirements=C:\Winp\bd36\Qt5_requirements.txt
 
 
-set my_source_dirs=C:\Winp\bd36\packages.win32.Qt5
+set my_source_dirs=C:\Winp\bd36\packages.win32
 set my_toolsdirs=C:\Winp\bd36\Tools
 
 set my_preclear_build_directory=Yes
 call %~dp0\generate_a_winpython_distro.bat
 
 set my_arch=64
 set my_requirements=C:\Winp\bd36\Qt5_requirements64.txt
-set my_source_dirs=C:\Winp\bd36\packages.win-amd64.Qt5
+set my_source_dirs=C:\Winp\bd36\packages.win-amd64
 set my_toolsdirs=C:\Winp\bd36\Tools64
 
 set my_preclear_build_directory=No
diff --git a/generate_winpython_distros37_qt5.bat b/generate_winpython_distros37_qt5.bat
@@ -14,6 +14,10 @@ set my_release=0
 
 set my_release_level=
 
+rem set my_create_installer=False
+set my_create_installer=nsis.zip
+set my_create_installer=7zip
+
 set my_install_options=--no-index --pre --trusted-host=None
 set my_find_links=C:\Winp\packages.srcreq
 set my_docsdirs=C:\Winp\bd37\docs
@@ -23,15 +27,15 @@ set tmp_reqdir=%my_root_dir_for_builds%\bd%my_python_target%
 
 set my_arch=32
 set my_requirements=C:\Winp\bd37\Qt5_requirements.txt
-set my_source_dirs=C:\Winp\bd37\packages.win32.Qt5
+set my_source_dirs=C:\Winp\bd37\packages.win32
 set my_toolsdirs=C:\Winp\bd37\Tools
 
 set my_preclear_build_directory=Yes
 call %~dp0\generate_a_winpython_distro.bat
 
 set my_arch=64
 set my_requirements=C:\Winp\bd37\Qt5_requirements64.txt
-set my_source_dirs=C:\Winp\bd37\packages.win-amd64.Qt5
+set my_source_dirs=C:\Winp\bd37\packages.win-amd64
 set my_toolsdirs=C:\Winp\bd37\Tools64
 
 set my_preclear_build_directory=No
diff --git a/portable/installer_7zip.bat b/portable/installer_7zip.bat
@@ -1,4 +1,4 @@
-﻿rem Copyright Â© 2018 WinPython team
+﻿rem Copyright @ 2018 WinPython team
 rem Licensed under the terms of the MIT License
 rem (see winpython/__init__.py for details)
 
@@ -40,6 +40,12 @@ set OutputBaseFilename=%ID%%ARCH%-%VERSION%%RELEASELEVEL%
 
 rem 7-zip uncompress the directory compressed %DISTDIR% (no option to change it in gui)
 
+rem ================================================================
+rem  2019-03-16 copy license at source (due to 7zip limitations)
+
+copy/Y %PORTABLE_DIR%\license.txt %DISTDIR%\license.txt
+
+rem ================================================================
 
 echo %time%
 
