use the new ways to specify a build

stonebig · stonebig · commit 6b5910758fca · 2015-11-10T22:19:34.000+01:00
diff --git a/generate_a_winpython_distro.bat b/generate_a_winpython_distro.bat
@@ -10,14 +10,19 @@ rem set my_pyver=3.4
 rem set my_release=4
 
 rem set my_release_level=build2
-rem set my_flavor=Qt5
+rem set my_flavor=Slim
 
 rem set my_arch=32
 rem set my_preclear_build_directory=Yes
 
 rem set my_requirements=d:\my_req1.txt d:\my_req2.txt d:\my_req3.txt  d:\my_req4.txt
 rem set my_find_links=%tmp_reqdir%\packages.srcreq
 
+rem set my_source_dirs=D:\WinPython\basedir34\packages.src D:\WinPython\basedir34\packages.win32.Slim
+rem set my_toolsdirs=D:\WinPython\basedir34\Tools.Slim
+rem set my_docsdirs=D:\WinPython\basedir34\docs.Slim
+
+
 rem set my_install_options=--no-index --pre
 
 set my_day=%date:/=-%
@@ -87,8 +92,8 @@ call %my_buildenv%\scripts\env.bat
 
 rem build with this 
 cd /D %~dp0
-echo python.exe  -c "from make import *;make_all(%my_release%, '%my_release_level%', pyver='%my_pyver%', rootdir=r'%my_root_dir_for_builds%', verbose=True, archis=(%my_arch%, ), flavor='%my_flavor%', requirements=r'%my_requirements%', install_options=r'%my_install_options%', find_links=r'%my_find_links%')">>%my_archive_log%
-python.exe  -c "from make import *;make_all(%my_release%, '%my_release_level%', pyver='%my_pyver%', rootdir=r'%my_root_dir_for_builds%', verbose=True, archis=(%my_arch%, ), flavor='%my_flavor%', requirements=r'%my_requirements%', install_options=r'%my_install_options%', find_links=r'%my_find_links%')">>%my_archive_log%
+echo python.exe  -c "from make import *;make_all(%my_release%, '%my_release_level%', pyver='%my_pyver%', rootdir=r'%my_root_dir_for_builds%', verbose=True, archis=(%my_arch%, ), flavor='%my_flavor%', requirements=r'%my_requirements%', install_options=r'%my_install_options%', find_links=r'%my_find_links%', source_dirs=r'%my_source_dirs%', toolsdirs=r'%my_toolsdirs%', docsdirs=r'%my_docsdirs%')">>%my_archive_log%
+python.exe  -c "from make import *;make_all(%my_release%, '%my_release_level%', pyver='%my_pyver%', rootdir=r'%my_root_dir_for_builds%', verbose=True, archis=(%my_arch%, ), flavor='%my_flavor%', requirements=r'%my_requirements%', install_options=r'%my_install_options%', find_links=r'%my_find_links%', source_dirs=r'%my_source_dirs%', toolsdirs=r'%my_toolsdirs%', docsdirs=r'%my_docsdirs%')">>%my_archive_log%
 
 echo ===============>>%my_archive_log%
 echo END OF creation>>%my_archive_log%
diff --git a/generate_winpython_distros27.bat b/generate_winpython_distros27.bat
diff --git a/generate_winpython_distros34.bat b/generate_winpython_distros34.bat
@@ -2,14 +2,14 @@ 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=D:\WinPython-64bit-3.4.3.3_b0
+set my_buildenv=D:\winpython-64bit-3.4.3.6Qt5
 
 set my_root_dir_for_builds=D:\Winpython
 set my_python_target=34
 set my_pyver=3.4
 set my_release=7
 
-set my_release_level=build1
+set my_release_level=build2
 set my_flavor=
 
 set my_arch=64
diff --git a/generate_winpython_distros34_qt5.bat b/generate_winpython_distros34_qt5.bat
@@ -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=D:\winpython-64bit-3.4.3.6Qt5
+
+set my_root_dir_for_builds=D:\WinpythonQt5
+set my_python_target=34
+set my_pyver=3.4
+set my_release=7
+
+set my_release_level=build2
+set my_flavor=Qt5
+
+
+set my_arch=64
+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 %tmp_reqdir%\Qt5_requirements2.txt %tmp_reqdir%\Qt5_requirements3.txt
+
+set my_find_links=%tmp_reqdir%\packages.srcreq
+rem set my_find_links=D:\WinPython\basedir34\packages.srcreq
+
+set my_source_dirs=D:\WinPython\basedir34\packages.src D:\WinPython\basedir34\packages.win-amd64.Qt5
+set my_toolsdirs=
+
+set my_install_options=--no-index --pre --trusted-host=None
+
+call %~dp0\generate_a_winpython_distro.bat
+
+set my_arch=32
+set my_preclear_build_directory=No
+
+
+set my_source_dirs=D:\WinPython\basedir34\packages.src D:\WinPython\basedir34\packages.win-32.Qt5
+set my_toolsdirs=
+
+
+call %~dp0\generate_a_winpython_distro.bat
+
+
+pause
