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

Skip to content

cleanups #284

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 2 commits into from
Mar 7, 2016
Merged

cleanups #284

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec14871
simplify code
Mar 7, 2016
3e7854d
remove 'before mingwpy' legacy
Mar 7, 2016
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
Prev Previous commit
remove 'before mingwpy' legacy
  • Loading branch information
stonebig committed Mar 7, 2016
commit 3e7854d06af6dc11de8c0f65d68f298c8a8ba9c6
5 changes: 0 additions & 5 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,6 @@ def get_tool_path(relpath, checkfunc):
if get_tool_path (r'\tools\SciTE.exe', osp.isfile):
installed_tools += [('SciTE', '3.3.7')]

gccpath = get_tool_path(self.MINGW32_PATH, osp.isdir)
if gccpath is not None:
gccver = utils.get_gcc_version(gccpath)
installed_tools += [('MinGW32', gccver)]

rpath = get_tool_path(self.R_PATH, osp.isdir)
if rpath is not None:
rver = utils.get_r_version(rpath)
Expand Down
8 changes: 0 additions & 8 deletions winpython/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,6 @@ def exec_shell_cmd(args, path):
return decode_fs_string(process.stdout.read())


def get_gcc_version(path):
"""Return version of the GCC compiler installed in *path*"""
return exec_shell_cmd('gcc --version', path).splitlines()[0].split()[-1]


def get_r_version(path):
"""Return version of the R installed in *path*"""
return exec_shell_cmd('dir ..\README.R*', path).splitlines()[-3].split("-")[-1]
Expand Down Expand Up @@ -611,9 +606,6 @@ def do_script(this_script, python_exe=None, copy_to=None,


if __name__ == '__main__':
gcc = get_gcc_version(osp.join(BASE_DIR, 'tools.win32', 'mingw32', 'bin'))
print(("gcc version: %r" % gcc))

thg = get_thg_version(osp.join(BASE_DIR, 'tools', 'tortoisehg'))
print(("thg version: %r" % thg))

Expand Down