Skip to content

Commit 67fb858

Browse files
stonebigstonebig
committed
split build process in 3 steps
apply this #789
1 parent 7454d50 commit 67fb858

6 files changed

+180
-91
lines changed

‎generate_a_winpython_distro.bat

+89-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
rem to launch from a winpython package directory, where 'make.py' is
22
@echo on
3+
4+
rem *****************************
5+
rem 2019-05-10 PATCH for build problem (asking permission to overwrite the file)
6+
rem
7+
rem *****************************
8+
del -y %userprofile%\.jupyter\jupyter_notebook_config.py
9+
10+
11+
rem ******************************
12+
13+
314
rem this is initialised per the calling .bat
415
rem set my_original_path=%path%
516
rem set my_buildenv=C:\WinPython-64bit-3.4.3.7Qt5
@@ -23,19 +34,23 @@ rem Override other scripts (simpler maintenance)
2334
set my_buildenv=C:\winpython-64bit-3.4.3.7Qt5
2435

2536
rem handle alpha
26-
if "%my_release_level%"=="" set my_release_level=
27-
28-
if %my_python_target%==27 set my_release=2
29-
30-
if %my_python_target%==34 set my_release=8
31-
32-
if %my_python_target%==35 set my_release=3
33-
34-
if %my_python_target%==36 set my_release=1
35-
36-
if %my_python_target%==37 set my_release=0
37-
38-
if %my_python_target%==38 set my_release=0
37+
if "%my_release_level%"=="" set my_release_level=b1
38+
if %my_python_target%==38 set my_release_level=
39+
40+
rem ---------
41+
rem newAge 20191022
42+
rem install with zero package, no installer, then do it from there
43+
rem change is we must help by giving my_python_target_release
44+
rem --------
45+
46+
if %my_python_target%==37 (
47+
set my_python_target_release=375
48+
set my_release=0
49+
)
50+
if %my_python_target%==38 (
51+
set my_python_target_release=380
52+
set my_release=0
53+
)
3954

4055
rem **** 2018-10-30 create_installer **
4156
if "%my_create_installer%"=="" set my_create_installer=True
@@ -121,14 +136,72 @@ set path=%my_original_path%
121136
echo call %my_buildenv%\scripts\env.bat>>%my_archive_log%
122137
call %my_buildenv%\scripts\env.bat
123138

124-
rem build with this
139+
echo ----------------------------->>%my_archive_log%
140+
echo 2.0 Create a build newage1/3 >>%my_archive_log%
141+
echo ----------------------------->>%my_archive_log%
142+
143+
rem 2019-10-22 new age step1
144+
rem we don't use requirements
145+
rem we don't create installer at first path
146+
rem we use legacy python build cd /D %~dp0
147+
148+
set my_buildenv_path=%path%
149+
150+
echo python.exe -c "from make import *;make_all(%my_release%, '%my_release_level%', pyver='%my_pyver%', basedir=r'%my_basedir%', verbose=True, architecture=%my_arch%, flavor='%my_flavor%', 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%', create_installer='False')">>%my_archive_log%
151+
python.exe -c "from make import *;make_all(%my_release%, '%my_release_level%', pyver='%my_pyver%', basedir=r'%my_basedir%', verbose=True, architecture=%my_arch%, flavor='%my_flavor%', 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%', create_installer='False')">>%my_archive_log%
152+
153+
rem old one
154+
rem echo python.exe -c "from make import *;make_all(%my_release%, '%my_release_level%', pyver='%my_pyver%', basedir=r'%my_basedir%', verbose=True, architecture=%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%', create_installer='%my_create_installer%')">>%my_archive_log%
155+
156+
157+
echo ----------------------------->>%my_archive_log%
158+
echo 2.0 Create a build newage2/3 >>%my_archive_log%
159+
echo ----------------------------->>%my_archive_log%
160+
rem 2019-10-22 new age step2
161+
rem we use final environment to install requirements
162+
set path=%my_original_path%
163+
164+
@echo on
165+
set my_WINPYDIRBASE=%my_root_dir_for_builds%\bd%my_python_target%\bu%my_flavor%\Wpy%my_arch%-%my_python_target_release%%my_release%%my_release_level%
166+
167+
set WINPYDIRBASE=%my_WINPYDIRBASE%
168+
call %my_WINPYDIRBASE%\scripts\env.bat
169+
set
170+
echo beg of step 2/3
171+
rem ok no pause
172+
173+
echo pip install -r %my_requirements% --pre --no-index --trusted-host=None --find-links=C:\WinP\packages.srcreq --upgrade
174+
pip install -r %my_requirements% --pre --no-index --trusted-host=None --find-links=C:\WinP\packages.srcreq --upgrade >>%my_archive_log%
175+
echo mid of step 2/3
176+
rem pause
177+
178+
rem finalize
179+
@echo on
180+
call %my_basedir%\run_complement_newbuild.bat %my_WINPYDIRBASE%
181+
echo end of step 2/3
182+
rem pause
183+
184+
echo ----------------------------->>%my_archive_log%
185+
echo 2.0 Create a build newage3/3 >>%my_archive_log%
186+
echo ----------------------------->>%my_archive_log%
187+
188+
rem build final changelog and binaries, using create_installer='%my_create_installer%', remove_existing=False , remove : requirements, toolsdirs and docdirs
189+
190+
set path=%my_original_path%
191+
echo cd /D %~dp0>>%my_archive_log%
125192
cd /D %~dp0
126-
echo python.exe -c "from make import *;make_all(%my_release%, '%my_release_level%', pyver='%my_pyver%', basedir=r'%my_basedir%', verbose=True, architecture=%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%', create_installer='%my_create_installer%')">>%my_archive_log%
127-
python.exe -c "from make import *;make_all(%my_release%, '%my_release_level%', pyver='%my_pyver%', basedir=r'%my_basedir%', verbose=True, architecture=%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%', create_installer='%my_create_installer%')">>%my_archive_log%
193+
194+
echo call %my_buildenv%\scripts\env.bat>>%my_archive_log%
195+
call %my_buildenv%\scripts\env.bat
196+
set
197+
198+
echo python.exe -c "from make import *;make_all(%my_release%, '%my_release_level%', pyver='%my_pyver%', basedir=r'%my_basedir%', verbose=True, architecture=%my_arch%, flavor='%my_flavor%', install_options=r'%my_install_options%', find_links=r'%my_find_links%', source_dirs=r'%my_source_dirs%', create_installer='%my_create_installer%', remove_existing=False)">>%my_archive_log%
199+
python.exe -c "from make import *;make_all(%my_release%, '%my_release_level%', pyver='%my_pyver%', basedir=r'%my_basedir%', verbose=True, architecture=%my_arch%, flavor='%my_flavor%', install_options=r'%my_install_options%', find_links=r'%my_find_links%', source_dirs=r'%my_source_dirs%', create_installer='%my_create_installer%', remove_existing=False)">>%my_archive_log%
128200

129201
echo ===============>>%my_archive_log%
130202
echo END OF creation>>%my_archive_log%
131203
echo %date% %time% >>%my_archive_log%
132204
echo ===============>>%my_archive_log%
133205

134206
set path=%my_original_path%
207+
rem pause

‎generate_winpython_distros35_qt5.bat

-45
This file was deleted.

‎generate_winpython_distros38_qt5.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set my_flavor=
1212

1313
set my_release=0
1414

15-
set my_release_level=b2b
15+
set my_release_level=
1616

1717
rem set my_create_installer=False
1818
set my_create_installer=nsis.zip

‎make.py

+15-1
Original file line numberDiff line numberDiff line change
@@ -1796,6 +1796,10 @@ def _run_complement_batch_scripts(
17961796
'launch "%s" for "%s"'
17971797
% (filepath, self.winpydir)
17981798
)
1799+
self._print(
1800+
'launch "%s" for "%s" !'
1801+
% (filepath, self.winpydir)
1802+
)
17991803
try:
18001804
retcode = subprocess.call(
18011805
'"%s" "%s"'
@@ -1809,12 +1813,22 @@ def _run_complement_batch_scripts(
18091813
-retcode,
18101814
file=sys.stderr,
18111815
)
1816+
self._print(
1817+
"Child was terminated by signal ! ",
1818+
-retcode,
1819+
file=sys.stderr,
1820+
)
18121821
except OSError as e:
18131822
print(
18141823
"Execution failed:",
18151824
e,
18161825
file=sys.stderr,
18171826
)
1827+
self._print(
1828+
"Execution failed !:",
1829+
e,
1830+
file=sys.stderr,
1831+
)
18181832
self._print_done()
18191833

18201834
def make(
@@ -1922,7 +1936,7 @@ def make(
19221936
# actions=["install","-r", req, "--no-index",
19231937
# "--trusted-host=None"]+ links,
19241938
# install_options=None)
1925-
self._run_complement_batch_scripts() # run_complement.bat
1939+
self._run_complement_batch_scripts()
19261940
self.distribution.patch_standard_packages()
19271941
if remove_existing and not self.simulation:
19281942
self._print("Cleaning up distribution")

0 commit comments

Comments
 (0)