Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2222305

Browse files
author
stonebig
committed
simplify
1 parent 769bf80 commit 2222305

File tree

2 files changed

+27
-48
lines changed

2 files changed

+27
-48
lines changed

‎generate_a_winpython_distro.bat

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
rem to launch from a winpython package directory, where 'make.py' is
2-
2+
@echo on
33
rem this is initialised per the calling .bat
44
rem set my_original_path=%path%
55
rem set my_buildenv=D:\WinPython-64bit-3.4.3.3_b0
@@ -9,8 +9,16 @@ rem set my_python_target=34
99
rem set my_pyver=3.4
1010
rem set my_release=84
1111

12-
rem Override other scripts (simpler)
13-
set my_release_level=
12+
rem ***********************************************************
13+
rem Override other scripts (simpler maintenance)
14+
15+
set my_release_level=build2
16+
17+
if %my_python_target%==34 set my_release=2
18+
19+
if %my_python_target%==35 set my_release=3
20+
21+
rem ***********************************************************
1422

1523
rem set my_flavor=Slim
1624

@@ -94,8 +102,8 @@ call %my_buildenv%\scripts\env.bat
94102

95103
rem build with this
96104
cd /D %~dp0
97-
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%
98-
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%
105+
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, 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%')">>%my_archive_log%
106+
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, 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%')">>%my_archive_log%
99107

100108
echo ===============>>%my_archive_log%
101109
echo END OF creation>>%my_archive_log%

‎make.py

Lines changed: 14 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,6 @@ def _copy_dev_docs(self):
486486
def _create_launchers(self):
487487
"""Create launchers"""
488488

489-
490489
self._print("Creating launchers")
491490
self.create_launcher('WinPython Command Prompt.exe', 'cmd.ico',
492491
command='$SYSDIR\cmd.exe',
@@ -958,6 +957,9 @@ def make(self, remove_existing=True, requirements=None): #, find_links=None):
958957
self._create_batch_scripts_initial()
959958
self._create_batch_scripts() # which set mingwpy as compiler
960959
self._run_complement_batch_scripts("run_required_first.bat")
960+
# launchers at the beginning
961+
self._create_launchers()
962+
961963

962964
# pre-patch current pip (until default python has pip 8.0.3)
963965
self.distribution.patch_standard_packages('pip')
@@ -994,8 +996,6 @@ def make(self, remove_existing=True, requirements=None): #, find_links=None):
994996

995997
self._run_complement_batch_scripts() # run_complement.bat
996998
self.distribution.patch_standard_packages()
997-
# launchers at the very end
998-
self._create_launchers()
999999

10001000
if remove_existing and not self.simulation:
10011001
self._print("Cleaning up distribution")
@@ -1047,10 +1047,10 @@ def transform_in_list(list_in, list_type=None):
10471047
return list_in
10481048

10491049

1050-
def make_winpython(build_number, release_level, architecture,
1050+
def make_all(build_number, release_level, pyver, architecture,
10511051
basedir=None, verbose=False, remove_existing=True,
10521052
create_installer=True, simulation=False, rootdir=None,
1053-
install_options=None, flavor='', requirements=None,
1053+
install_options=['--no-index'], flavor='', requirements=None,
10541054
find_links=None, source_dirs=None, toolsdirs=None,
10551055
docsdirs=None):
10561056
"""Make WinPython distribution, for a given base directory and
@@ -1062,15 +1062,20 @@ def make_winpython(build_number, release_level, architecture,
10621062
10631063
`build_number`: build number [int]
10641064
`release_level`: release level (e.g. 'beta1', '') [str]
1065+
`pyver`: python version ('3.4' or 3.5')
10651066
`architecture`: [int] (32 or 64)
1066-
`basedir`: [str] if None, WINPYTHONBASEDIR env var must be set
1067+
`basedir`: where will be created tmp_wheel dir. and Winpython-xyz dir.
10671068
(rootdir: root directory containing 'basedir27', 'basedir33', etc.)
10681069
""" + utils.ROOTDIR_DOC
1069-
basedir = basedir if basedir is not None else utils.BASE_DIR
1070+
1071+
if basedir is None:
1072+
basedir = utils.BASE_DIR
1073+
if basedir is None:
1074+
basedir = utils.get_basedir(pyver, rootdir=rootdir)
1075+
10701076
assert basedir is not None, "The *basedir* directory must be specified"
10711077
assert architecture in (32, 64)
10721078
utils.print_box("Making WinPython %dbits" % architecture)
1073-
suffix = '.win32' if architecture == 32 else '.win-amd64'
10741079

10751080
# Create Build director, where Winpython will be constructed
10761081
builddir = osp.join(basedir, 'build' + flavor)
@@ -1123,46 +1128,12 @@ def make_winpython(build_number, release_level, architecture,
11231128
return dist
11241129

11251130

1126-
def make_all(build_number, release_level, pyver,
1127-
rootdir=None, simulation=False, create_installer=True,
1128-
verbose=False, remove_existing=True, archis=(32, 64),
1129-
install_options=['--no-index'], flavor='', requirements=None,
1130-
find_links=None, source_dirs=None, toolsdirs=None, docsdirs=None):
1131-
"""Make WinPython for both 32 and 64bit architectures:
1132-
1133-
make_all(build_number, release_level, pyver, rootdir, simulation=False,
1134-
create_installer=True, verbose=False, remove_existing=True)
1135-
1136-
`build_number`: build number [int]
1137-
`release_level`: release level (e.g. 'beta1', '') [str]
1138-
`pyver`: Python version (X.Y format) [str]
1139-
`rootdir`: [str] if None, WINPYTHONROOTDIR env var must be set
1140-
(rootdir: root directory containing 'basedir27', 'basedir33', etc.)
1141-
""" + utils.ROOTDIR_DOC
1142-
1143-
basedir = utils.get_basedir(pyver, rootdir=rootdir)
1144-
1145-
for architecture in archis:
1146-
make_winpython(build_number, release_level, architecture, basedir,
1147-
verbose, remove_existing, create_installer, simulation,
1148-
rootdir=rootdir, install_options=install_options,
1149-
flavor=flavor, requirements=requirements,
1150-
find_links=find_links, source_dirs=source_dirs,
1151-
toolsdirs=toolsdirs, docsdirs=docsdirs)
1152-
1153-
11541131
if __name__ == '__main__':
11551132
# DO create only one version at a time
11561133
# You may have to manually delete previous build\winpython-.. directory
11571134

1158-
#make_all(7, release_level='build1', pyver='3.4', rootdir=r'D:\WinpythonQt5', verbose=True,
1159-
# archis=(64, ), flavor='Qt5',
1160-
# requirements=r'D:\WinpythonQt5\basedir34\requirements.txt D:\WinpythonQt5\basedir34\requirements2.txt D:\WinpythonQt5\basedir34\requirements3.txt',
1161-
# install_options=r'--no-index --pre --trusted-host=None',
1162-
# find_links=r'D:\Winpython\basedir34\packages.srcreq')
1163-
11641135
make_all(1, release_level='build3', pyver='3.4', rootdir=r'D:\Winpython', verbose=True,
1165-
archis=(64, ), flavor='Barebone',
1136+
architecture=64, flavor='Barebone',
11661137
requirements=r'D:\Winpython\basedir34\barebone_requirements.txt',
11671138
install_options=r'--no-index --pre --trusted-host=None',
11681139
find_links=r'D:\Winpython\packages.srcreq',

0 commit comments

Comments
 (0)