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

Skip to content

more pre-defined Build directories #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 17, 2016
Merged

more pre-defined Build directories #297

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def __init__(self, build_number, release_level, target, wheeldir,
self.distribution = None
self.installed_packages = []
self.simulation = simulation
self.rootdir = rootdir # addded to build from winpython
self.rootdir = rootdir # added to build from winpython
self.install_options = install_options
self.flavor = flavor

Expand Down Expand Up @@ -899,7 +899,7 @@ def _run_complement_batch_scripts(self, this_batch="run_complement.bat"):

self._print_done()

def make(self, remove_existing=True, requirements=None): #, find_links=None):
def make(self, remove_existing=True, requirements=None, my_winpydir=None): #, find_links=None):
"""Make WinPython distribution in target directory from the installers
located in wheeldir

Expand All @@ -921,7 +921,10 @@ def make(self, remove_existing=True, requirements=None): #, find_links=None):
# Create the WinPython base directory
self._print("Creating WinPython %s base directory"
% self.python_version)
self.winpydir = osp.join(self.target, distname)
if my_winpydir is None:
self.winpydir = osp.join(self.target, distname)
else:
self.winpydir = osp.join(self.target, my_winpydir)
if osp.isdir(self.winpydir) and remove_existing \
and not self.simulation:
shutil.rmtree(self.winpydir, onerror=utils.onerror)
Expand Down Expand Up @@ -1114,7 +1117,12 @@ def make_all(build_number, release_level, pyver, architecture,
rootdir=rootdir,
install_options=install_options + find_list,
flavor=flavor, docsdirs=docsdirs)
dist.make(remove_existing=remove_existing, requirements=requirements)
# define a pre-defined winpydir, instead of having to guess
my_winpydir = ('winpython-' + ('%s' % architecture) +'bit-' + pyver +
'.x.' + ('%s' %build_number) ) # + flavor + release_level)

dist.make(remove_existing=remove_existing, requirements=requirements,
my_winpydir=my_winpydir)
# ,find_links=osp.join(basedir, 'packages.srcreq'))
if create_installer and not simulation:
dist.create_installer()
Expand Down