Skip to content

Commit

Permalink
drop iojs support
Browse files Browse the repository at this point in the history
node.js and io.js already merged back together since v4.0. and iojs.org
redirects to nodejs.org. so, it does not make sense to offer this option
for new developers using node.js >= 4.0

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
  • Loading branch information
tchaikov committed Feb 24, 2020
1 parent c1a772d commit e953890
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 49 deletions.
10 changes: 0 additions & 10 deletions Makefile
Expand Up @@ -87,16 +87,6 @@ test5: clean
python setup.py install && \
nodeenv -p --prebuilt

test6: clean
@echo " ="
@echo " = test6: separate iojs's env"
@echo " ="
@rm -rf env && \
virtualenv --no-site-packages env && \
. env/bin/activate && \
python setup.py install && \
nodeenv -p --prebuilt --iojs

test7: clean
@echo " ="
@echo " = test7: freeze for global installation"
Expand Down
12 changes: 0 additions & 12 deletions README.rst
Expand Up @@ -226,18 +226,6 @@ use `shim` script::
$ ./env-4.3/bin/shim --version
v0.4.3


If you want to install iojs instead of nodejs then use ``--iojs``::

$ virtualenv env
$ . env/bin/activate
(env) $ nodeenv --iojs --list
1.0.0 1.0.1
(env) $ nodeenv --iojs -p --prebuilt
* Install iojs (1.0.1) ... done.
* Appending data to ~/tmp/env/bin/activate


Configuration
-------------
You can use the INI-style file ``~/.nodeenvrc`` to set default values for many options,
Expand Down
37 changes: 10 additions & 27 deletions nodeenv.py
Expand Up @@ -46,7 +46,6 @@

join = os.path.join
abspath = os.path.abspath
iojs_taken = False
src_base_url = None

is_PY3 = sys.version_info[0] >= 3
Expand Down Expand Up @@ -222,15 +221,10 @@ def parse_args(check=True):
'The default is last stable version (`latest`). '
'Use `system` to use system-wide node.')

parser.add_option(
'-i', '--iojs',
action='store_true', dest='io', default=False,
help='Use iojs instead of nodejs.')

parser.add_option(
'--mirror',
action="store", dest='mirror',
help='Set mirror server of nodejs.org or iojs.org to download from.')
help='Set mirror server of nodejs.org to download from.')

if not is_WIN:
parser.add_option(
Expand Down Expand Up @@ -527,12 +521,12 @@ def get_node_bin_url(version):
postfix = '-linux-x64-musl.tar.gz'
else:
postfix = '-%(system)s-%(arch)s.tar.gz' % sysinfo
filename = '%s-v%s%s' % (get_binary_prefix(), version, postfix)
filename = 'node-v%s%s' % (version, postfix)
return get_root_url(version) + filename


def get_node_src_url(version):
tar_name = '%s-v%s.tar.gz' % (get_binary_prefix(), version)
tar_name = 'node-v%s.tar.gz' % version
return get_root_url(version) + tar_name


Expand All @@ -546,7 +540,7 @@ def tarfile_open(*args, **kwargs):
tf.close()


def download_node_src(node_url, src_dir, opt, prefix):
def download_node_src(node_url, src_dir, opt):
"""
Download source code
"""
Expand All @@ -565,8 +559,8 @@ def download_node_src(node_url, src_dir, opt, prefix):

with ctx as archive:
node_ver = re.escape(opt.node)
rexp_string = r"%s-v%s[^/]*/(README\.md|CHANGELOG\.md|LICENSE)"\
% (prefix, node_ver)
rexp_string = r"node-v%s[^/]*/(README\.md|CHANGELOG\.md|LICENSE)"\
% node_ver
extract_list = [
member
for member in members(archive)
Expand Down Expand Up @@ -608,7 +602,6 @@ def copy_node_from_prebuilt(env_dir, src_dir, node_version):
Copy prebuilt binaries into environment
"""
logger.info('.', extra=dict(continued=True))
prefix = get_binary_prefix()
if is_WIN:
dest = join(env_dir, 'Scripts')
mkdir(dest)
Expand All @@ -620,7 +613,7 @@ def copy_node_from_prebuilt(env_dir, src_dir, node_version):
else:
dest = env_dir

src_folder_tpl = src_dir + to_utf8('/%s-v%s*' % (prefix, node_version))
src_folder_tpl = src_dir + to_utf8('/node-v%s*' % node_version)
src_folder, = glob.glob(src_folder_tpl)
copytree(src_folder, dest, True)

Expand Down Expand Up @@ -689,10 +682,6 @@ def build_node_from_src(env_dir, src_dir, node_src_dir, opt):
callit([make_cmd + ' install'], opt.verbose, True, node_src_dir, env)


def get_binary_prefix():
return to_utf8('node' if not iojs_taken else 'iojs')


def install_node(env_dir, src_dir, opt):
"""
Download source code for node.js, unpack it
Expand All @@ -708,11 +697,10 @@ def install_node(env_dir, src_dir, opt):

def install_node_wrapped(env_dir, src_dir, opt):
env_dir = abspath(env_dir)
prefix = get_binary_prefix()
node_src_dir = join(src_dir, to_utf8('%s-v%s' % (prefix, opt.node)))
node_src_dir = join(src_dir, to_utf8('node-v%s' % opt.node))
src_type = "prebuilt" if opt.prebuilt else "source"

logger.info(' * Install %s %s (%s) ' % (src_type, prefix, opt.node),
logger.info(' * Install %s node (%s) ' % (src_type, opt.node),
extra=dict(continued=True))

if opt.prebuilt:
Expand All @@ -722,7 +710,7 @@ def install_node_wrapped(env_dir, src_dir, opt):

# get src if not downloaded yet
if not os.path.exists(node_src_dir):
download_node_src(node_url, src_dir, opt, prefix)
download_node_src(node_url, src_dir, opt)

logger.info('.', extra=dict(continued=True))

Expand Down Expand Up @@ -1020,14 +1008,9 @@ def main():
logger.error('Installing system node.js on win32 is not supported!')
exit(1)

global iojs_taken
global src_base_url

src_domain = None
if opt.io:
iojs_taken = True
src_domain = "iojs.org"

if opt.mirror:
if '://' in opt.mirror:
src_base_url = opt.mirror
Expand Down

0 comments on commit e953890

Please sign in to comment.