8000 Merge pull request #200 from stonebig/master · Aikes/winpython@52f06e3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 52f06e3

Browse files
stonebigstonebig
committed
Merge pull request winpython#200 from stonebig/master
build adaptation to Python3.5
2 parents 2c28a23 + 46d5bb5 commit 52f06e3

File tree

2 files changed

+22
-27
lines changed

2 files changed

+22
-27
lines changed

‎make.py

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -410,10 +410,13 @@ def _extract_python(self):
410410
"""Extracting Python installer, creating distribution object"""
411411
self._print("Extracting Python installer")
412412
os.mkdir(self.python_dir)
413-
utils.extract_msi(self.python_fname, targetdir=self.python_dir)
414-
os.remove(osp.join(self.python_dir, osp.basename(self.python_fname)))
415-
if not os.path.exists(osp.join(self.python_dir, 'Scripts')):
416-
os.mkdir(osp.join(self.python_dir, 'Scripts'))
413+
if self.python_fname[-3:] == 'zip': # Python3.5
414+
utils.extract_archive(self.python_fname, targetdir=self.python_dir+r'\..')
415+
else:
416+
utils.extract_msi(self.python_fname, targetdir=self.python_dir)
417+
os.remove(osp.join(self.python_dir, osp.basename(self.python_fname)))
418+
if not os.path.exists(osp.join(self.python_dir, 'Scripts')):
419+
os.mkdir(osp.join(self.python_dir, 'Scripts'))
417420
self._print_done()
418421

419422
def _add_msvc_files(self):
@@ -766,14 +769,14 @@ def make(self, remove_existing=True, requirements=None): #, find_links=None):
766769
print("WARNING: this is just a simulation!", file=sys.stderr)
767770

768771
self.python_fname = self.get_package_fname(
769-
r'python-([0-9\.rc]*)(\.amd64)?\.msi')
772+
r'python-([0-9\.rc]*)((\.|\-)amd64)?\.(msi|zip)')
770773
self.python_name = osp.basename(self.python_fname)[:-4]
771774
distname = 'win%s' % self.python_name
772775
vlst = re.match(r'winpython-([0-9\.]*)', distname
773776
).groups()[0].split('.')
774777
self.python_version = '.'.join(vlst[:2])
775778
self.python_fullversion = '.'.join(vlst[:3])
776-
779+
print(self.python_fname,self.python_name , distname, self.python_version, self.python_fullversion)
777780
# Create the WinPython base directory
778781
self._print("Creating WinPython %s base directory"
779782
% self.python_version)
@@ -941,13 +944,6 @@ def make_winpython(build_number, release_level, architecture,
941944
toolsdir2 = osp.join(basedir, 'tools' + suffix)
942945
if osp.isdir(toolsdir2):
943946
toolsdirs.append(toolsdir2)
944-
# add flavor tools
945-
if flavor != '':
946-
toolsdir3 = osp.join(basedir, flavor, 'tools')
947-
toolsdir4 = osp.join(basedir, flavor, 'tools' + suffix)
948-
for flavor_tools in [toolsdir3, toolsdir4]:
949-
if osp.isdir(flavor_tools):
950-
toolsdirs.append(flavor_tools)
951947
print('toolsdirs=', toolsdirs)
952948

953949
# Optional pre-defined toolsdirs
@@ -965,13 +961,6 @@ def make_winpython(build_number, release_level, architecture,
965961
docsdir2 = osp.join(basedir, 'docs' + suffix)
966962
if osp.isdir(docsdir2):
967963
docsdirs.append(docsdir2)
968-
# add flavor docs
969-
if flavor != '':
970-
docsdir3 = osp.join(basedir, flavor, 'docs')
971-
docsdir4 = osp.join(basedir, flavor, 'docs' + suffix)
972-
for flavor_docs in [docsdir3, docsdir4]:
973-
if osp.isdir(flavor_docs):
974-
docsdirs.append(flavor_docs)
975964
print('docsdirs=', docsdirs)
976965

977966
# install_options = ['--no-index', '--pre', '--find-links=%s' % wheeldir]
@@ -1036,12 +1025,12 @@ def make_all(build_number, release_level, pyver,
10361025
# install_options=r'--no-index --pre --trusted-host=None',
10371026
# find_links=r'D:\Winpython\basedir34\packages.srcreq')
10381027

1039-
make_all(7, release_level='build1', pyver='3.4', rootdir=r'D:\Winpython', verbose=True,
1040-
archis=(32, ), flavor='Slim',
1041-
requirements=r'D:\Winpython\basedir34\slim_requirements.txt',
1028+
make_all(1, release_level='build3', pyver='3.5', rootdir=r'D:\Winpython', verbose=True,
1029+
archis=(64, ), flavor='Slim',
1030+
requirements=r'D:\Winpython\basedir35\slim_requirements.txt',
10421031
install_options=r'--no-index --pre --trusted-host=None',
10431032
find_links=r'D:\Winpython\basedir34\packages.srcreq',
1044-
source_dirs=r'D:\WinPython\basedir34\packages.src D:\WinPython\basedir34\packages.win32.Slim',
1033+
source_dirs=r'D:\WinPython\basedir34\packages.src D:\WinPython\basedir35\packages.win-amd64',
10451034
toolsdirs=r'D:\WinPython\basedir34\Tools.Slim',
10461035
docsdirs=r'D:\WinPython\basedir34\docs.Slim'
10471036
)

‎winpython/disthelpers.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def get_msvc_dlls(msvc_version, architecture=None):
137137
filelist = []
138138

139139
# simple vs2015 situation: nothing (system dll)
140-
if msvc_version == '15.0':
140+
if msvc_version == '14.0':
141141
return filelist
142142

143143
msvc_major = msvc_version.split('.')[0]
@@ -192,13 +192,18 @@ def get_msvc_dlls(msvc_version, architecture=None):
192192
raise RuntimeError("Microsoft Visual C++ %s DLLs version %s "\
193193
"were not found" % (group, msvc_version))
194194

195-
elif msvc_major == '10':
195+
elif msvc_major == '10' or msvc_major == '15': # 15 for vs 2015
196196
namelist = [name % (msvc_major + msvc_minor) for name in
197197
(
198198
'msvcp%s.dll', 'msvcr%s.dll',
199199
'vcomp%s.dll',
200200
)]
201-
201+
if msvc_major == '15':
202+
namelist = [name % ('14' + msvc_minor) for name in
203+
(
204+
'vcruntime%s.dll', 'msvcp%s.dll', 'vccorlib%s.dll',
205+
'concrt%s.dll','vcomp%s.dll',
206+
)]
202207
windir = os.environ['windir']
203208
is_64bit_windows = osp.isdir(osp.join(windir, "SysWOW64"))
204209

@@ -218,6 +223,7 @@ def get_msvc_dlls(msvc_version, architecture=None):
218223

219224
for dllname in namelist:
220225
fname = osp.join(windir, sysdir, dllname)
226+
print('searching', fname )
221227
if osp.exists(fname):
222228
filelist.append(fname)
223229
else:

0 commit comments

Comments
 (0)
0