From ba7bbce871f4085cf1adf36cc322ea3ed17c6fc4 Mon Sep 17 00:00:00 2001 From: Yorkie Liu Date: Sat, 2 Sep 2017 20:30:14 +0800 Subject: [PATCH 1/3] build: fix shared installing target --- tools/install.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/install.py b/tools/install.py index afebb60e994597..26ca17c6e586ff 100755 --- a/tools/install.py +++ b/tools/install.py @@ -123,6 +123,7 @@ def files(action): if 'false' == variables.get('node_shared'): if is_windows: output_file += '.exe' + action([output_prefix + output_file], 'lib/' + output_file) else: if is_windows: output_file += '.dll' @@ -132,8 +133,7 @@ def files(action): # in its source - see the _InstallableTargetInstallPath function. if sys.platform != 'darwin': output_prefix += 'lib.target/' - - action([output_prefix + output_file], 'bin/' + output_file) + action([output_prefix + output_file], 'bin/' + output_file) if 'true' == variables.get('node_use_dtrace'): action(['out/Release/node.d'], 'lib/dtrace/node.d') From f49c18c41c8897d436dd5407dc293a8cfec440fd Mon Sep 17 00:00:00 2001 From: Yorkie Liu Date: Sun, 3 Sep 2017 16:12:01 +0800 Subject: [PATCH 2/3] fix nits, merging to one statement --- tools/install.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/install.py b/tools/install.py index 26ca17c6e586ff..859ec7f52c7a28 100755 --- a/tools/install.py +++ b/tools/install.py @@ -123,7 +123,6 @@ def files(action): if 'false' == variables.get('node_shared'): if is_windows: output_file += '.exe' - action([output_prefix + output_file], 'lib/' + output_file) else: if is_windows: output_file += '.dll' @@ -133,7 +132,9 @@ def files(action): # in its source - see the _InstallableTargetInstallPath function. if sys.platform != 'darwin': output_prefix += 'lib.target/' - action([output_prefix + output_file], 'bin/' + output_file) + + action([output_prefix + output_file], ( + 'bin/' if 'false' == variables.get('node_shared') else 'lib/') + output_file) if 'true' == variables.get('node_use_dtrace'): action(['out/Release/node.d'], 'lib/dtrace/node.d') From 528cf2d165774cf24ab1f1003b4d79d9f1aaf5bd Mon Sep 17 00:00:00 2001 From: Yorkie Liu Date: Mon, 25 Sep 2017 02:01:52 +0800 Subject: [PATCH 3/3] fixup --- tools/install.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/install.py b/tools/install.py index 859ec7f52c7a28..d6793755cbc469 100755 --- a/tools/install.py +++ b/tools/install.py @@ -133,8 +133,10 @@ def files(action): if sys.platform != 'darwin': output_prefix += 'lib.target/' - action([output_prefix + output_file], ( - 'bin/' if 'false' == variables.get('node_shared') else 'lib/') + output_file) + if 'false' == variables.get('node_shared'): + action([output_prefix + output_file], 'bin/' + output_file) + else: + action([output_prefix + output_file], 'lib/' + output_file) if 'true' == variables.get('node_use_dtrace'): action(['out/Release/node.d'], 'lib/dtrace/node.d')