Skip to content

Commit bb2f1f1

Browse files
committed
Merge pull request #44 from dflanigan/master
Added --make option
2 parents 0a34075 + 90497db commit bb2f1f1

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

CHANGES

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Nodeenv changelog
22
=================
33

4+
Version 0.7.1
5+
-------------
6+
- Added ``--make`` option
7+
48
Version 0.7.0
59
-------------
610
- added ``--force``. See `# 37`_

README.rst

+4
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,10 @@ environment::
154154
and add node virtual environment to this existing new_venv::
155155

156156
$ nodeenv -p
157+
158+
If you need to set the path to make used to build node::
159+
160+
$ nodeenv -m /usr/local/bin/gmake ENV
157161

158162
That's all. Now, all your node.js modules will be installed into your virtual
159163
environment::

nodeenv.py

+11-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
:license: BSD, see LICENSE for more details.
1111
"""
1212

13-
nodeenv_version = '0.7.0'
13+
nodeenv_version = '0.7.1'
1414

1515
import sys
1616
import os
@@ -166,6 +166,12 @@ def parse_args():
166166
action='store_true', default=False,
167167
help='Force installation in a pre-existing directory')
168168

169+
parser.add_option(
170+
'--make','-m',dest='make_path',
171+
metavar='MAKE_PATH',
172+
help='Path to make command',
173+
default='make')
174+
169175
options, args = parser.parse_args()
170176

171177
if not options.list and not options.python_virtualenv:
@@ -373,11 +379,13 @@ def install_node(env_dir, src_dir, opt):
373379
if opt.profile:
374380
conf_cmd.append('--profile')
375381

382+
make_cmd = opt.make_path
383+
376384
callit(conf_cmd, opt.verbose, True, node_src_dir, env)
377385
logger.info('.', extra=dict(continued=True))
378-
callit(['make'] + make_opts, opt.verbose, True, node_src_dir, env)
386+
callit([make_cmd] + make_opts, opt.verbose, True, node_src_dir, env)
379387
logger.info('.', extra=dict(continued=True))
380-
callit(['make install'], opt.verbose, True, node_src_dir, env)
388+
callit([make_cmd + ' install'], opt.verbose, True, node_src_dir, env)
381389

382390
logger.info(' done.')
383391

0 commit comments

Comments
 (0)