Skip to content

changed osp.dirname() to osp.dirname(osp.abspath()) #12

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
stonebig merged 1 commit into from
Oct 15, 2014
Merged

changed osp.dirname() to osp.dirname(osp.abspath()) #12

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
10 changes: 5 additions & 5 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def replace_in_nsis_file(fname, data):

def build_nsis(srcname, dstname, data):
"""Build NSIS script"""
portable_dir = osp.join(osp.dirname(__file__), 'portable')
portable_dir = osp.join(osp.dirname(osp.abspath(__file__)), 'portable')
shutil.copy(osp.join(portable_dir, srcname), dstname)
data = [('!addincludedir', osp.join(portable_dir, 'include'))
] + list(data)
Expand Down Expand Up @@ -263,7 +263,7 @@ def postpath(self):
@property
def toolsdirs(self):
"""Return tools directory list"""
return [osp.join(osp.dirname(__file__), 'tools')] + self._toolsdirs
return [osp.join(osp.dirname(osp.abspath(__file__)), 'tools')] + self._toolsdirs

def get_package_fname(self, pattern):
"""Get package matching pattern in instdir"""
Expand Down Expand Up @@ -302,7 +302,7 @@ def create_launcher(self, name, icon, command=None,
args=None, workdir=None, settingspath=None):
"""Create exe launcher with NSIS"""
assert name.endswith('.exe')
portable_dir = osp.join(osp.dirname(__file__), 'portable')
portable_dir = osp.join(osp.dirname(osp.abspath(__file__)), 'portable')
icon_fname = osp.join(portable_dir, 'icons', icon)
assert osp.isfile(icon_fname)

Expand Down Expand Up @@ -365,7 +365,7 @@ def create_python_batch(self, name, script_name,
def create_installer(self):
"""Create installer with NSIS"""
self._print("Creating WinPython installer")
portable_dir = osp.join(osp.dirname(__file__), 'portable')
portable_dir = osp.join(osp.dirname(osp.abspath(__file__)), 'portable')
fname = osp.join(portable_dir, 'installer-tmp.nsi')
data = (('DISTDIR', self.winpydir),
('ARCH', self.winpy_arch),
Expand Down Expand Up @@ -867,7 +867,7 @@ def rebuild_winpython(basedir=None, verbose=False, archis=(32, 64)):
for name in os.listdir(packdir):
if name.startswith('winpython-') and name.endswith('.exe'):
os.remove(osp.join(packdir, name))
utils.build_wininst(osp.dirname(__file__), copy_to=packdir,
utils.build_wininst(osp.dirname(osp.abspath(__file__)), copy_to=packdir,
architecture=architecture, verbose=verbose)


Expand Down