diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2015-01-08 14:00:43 +0100 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-01-08 23:21:20 +0100 |
commit | f17f473af5e28f4ec00a518f97a84b69c426309e (patch) | |
tree | 796640291d71a73ef03ee50e023fc4798f6a6947 /tools | |
parent | 3e7a25dd95194269fd112aa5677fc5e6d4156135 (diff) | |
download | android-node-v8-f17f473af5e28f4ec00a518f97a84b69c426309e.tar.gz android-node-v8-f17f473af5e28f4ec00a518f97a84b69c426309e.tar.bz2 android-node-v8-f17f473af5e28f4ec00a518f97a84b69c426309e.zip |
build: rename binary from node to iojs
* rename the build targets
* update the test runner to use `out/{Debug,Release}/iojs`
* update the installer to install the iojs binary
* update one test that explicitly checks for the binary name
PR-URL: https://github.com/iojs/io.js/pull/262
Reviewed-By: Bert Belder <bertbelder@gmail.com>
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/install.py | 8 | ||||
-rwxr-xr-x | tools/test.py | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tools/install.py b/tools/install.py index 77e6d0cbd1..affce2265c 100755 --- a/tools/install.py +++ b/tools/install.py @@ -108,12 +108,12 @@ def npm_files(action): if os.environ.get('PORTABLE'): # This crazy hack is necessary to make the shebang execute the copy # of node relative to the same directory as the npm script. The precompiled - # binary tarballs use a prefix of "/" which gets translated to "/bin/node" + # binary tarballs use a prefix of "/" which gets translated to "/bin/iojs" # in the regular shebang modifying logic, which is incorrect since the # precompiled bundle should be able to be extracted anywhere and "just work" - shebang = '/bin/sh\n// 2>/dev/null; exec "`dirname "$0"`/node" "$0" "$@"' + shebang = '/bin/sh\n// 2>/dev/null; exec "`dirname "$0"`/iojs" "$0" "$@"' else: - shebang = os.path.join(node_prefix or '/', 'bin/node') + shebang = os.path.join(node_prefix or '/', 'bin/iojs') update_shebang(link_path, shebang) else: assert(0) # unhandled action type @@ -128,7 +128,7 @@ def subdir_files(path, dest, action): def files(action): exeext = '.exe' if sys.platform == 'win32' else '' - action(['out/Release/node' + exeext], 'bin/node' + exeext) + action(['out/Release/iojs' + exeext], 'bin/iojs' + exeext) if 'true' == variables.get('node_use_dtrace'): action(['out/Release/node.d'], 'lib/dtrace/node.d') diff --git a/tools/test.py b/tools/test.py index b24ca9ba53..563555ed95 100755 --- a/tools/test.py +++ b/tools/test.py @@ -742,20 +742,20 @@ class Context(object): def GetVm(self, arch, mode): if arch == 'none': - name = 'out/Debug/node' if mode == 'debug' else 'out/Release/node' + name = 'out/Debug/iojs' if mode == 'debug' else 'out/Release/iojs' else: - name = 'out/%s.%s/node' % (arch, mode) + name = 'out/%s.%s/iojs' % (arch, mode) # Currently GYP does not support output_dir for MSVS. # http://code.google.com/p/gyp/issues/detail?id=40 - # It will put the builds into Release/node.exe or Debug/node.exe + # It will put the builds into Release/iojs.exe or Debug/iojs.exe if utils.IsWindows(): out_dir = os.path.join(dirname(__file__), "..", "out") if not exists(out_dir): if mode == 'debug': - name = os.path.abspath('Debug/node.exe') + name = os.path.abspath('Debug/iojs.exe') else: - name = os.path.abspath('Release/node.exe') + name = os.path.abspath('Release/iojs.exe') else: name = os.path.abspath(name + '.exe') |