8000 nodejs by stonebig · Pull Request #552 · winpython/winpython · GitHub
[go: up one dir, main page]
Skip to content

nodejs #552

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
Jul 29, 2017
Merged

nodejs #552

Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ class WinPythonDistribution(object):
MINGW32_PATH = r'\tools\mingw32\bin'
R_PATH = r'\tools\R\bin'
JULIA_PATH = r'\tools\Julia\bin'
NODEJS_PATH = r'\tools\n'

def __init__(self, build_number, release_level, target, wheeldir,
toolsdirs=None, verbose=False, simulation=False,
Expand Down Expand Up @@ -154,6 +155,11 @@ def get_tool_path(relpath, checkfunc):
juliaver = utils.get_julia_version(juliapath)
installed_tools += [('Julia', juliaver)]

nodepath = get_tool_path(self.NODEJS_PATH, osp.isdir)
if nodepath is not None:
nodever = utils.get_nodejs_version(nodepath)
installed_tools += [('Nodejs', nodever)]

pandocexe = get_tool_path (r'\tools\pandoc.exe', osp.isfile)
if pandocexe is not None:
pandocver = utils.get_pandoc_version(osp.dirname(pandocexe))
Expand Down Expand Up @@ -243,6 +249,8 @@ def prepath(self):

path += [r".." + self.JULIA_PATH]

path += [r".." + self.NODEJS_PATH]

return path

@property
Expand Down
3 changes: 3 additions & 0 deletions winpython/data/packages.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,9 @@ description=Collection of low-level Python packages and modules used by Logilab
[logutils]
description=Logging utilities

[loky]
description=Robust and reusable Executor for joblib

[lxml]
description=Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.

Expand Down
4 changes: 4 additions & 0 deletions winpython/data/tools.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,7 @@ url=http://tortoisehg.bitbucket.org
[winmerge]
description=Open Source differencing and merging tool for Windows
url=http://winmerge.org

[nodejs]
description=a JavaScript runtime built on Chrome's V8 JavaScript engine
url=https://nodejs.org
3 changes: 3 additions & 0 deletions winpython/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,9 @@ def get_julia_version(path):
"""Return version of the Julia installed in *path*"""
return exec_shell_cmd('julia.exe -v', path).splitlines()[0].split(" ")[-1]

def get_nodejs_version(path):
"""Return version of the Nodejs installed in *path*"""
return exec_shell_cmd('npm version', path).split(" node: '")[1].split("'")[0]

def get_thg_version(path):
"""Return version of TortoiseHg installed in *path*"""
Expand Down
0