You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
86 lines
3.2 KiB
86 lines
3.2 KiB
From 11512edeb046b64be4daca76f061a3a918251ee0 Mon Sep 17 00:00:00 2001 |
|
From: Elliott Sales de Andrade <quantum.analyst@gmail.com> |
|
Date: Tue, 19 Mar 2019 23:22:40 -0400 |
|
Subject: [PATCH 2/2] Install both binaries and use libdir. |
|
|
|
This allows us to build with a shared library for other users while |
|
still providing the normal executable. |
|
|
|
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com> |
|
--- |
|
configure.py | 7 +++++++ |
|
tools/install.py | 29 +++++++++++++---------------- |
|
2 files changed, 20 insertions(+), 16 deletions(-) |
|
|
|
diff --git a/configure.py b/configure.py |
|
index 6537a62d3954d83927c698db3fb80c9fc05faba7..b9a894bec9e5fd954004bcb423822ca984066dc5 100755 |
|
--- a/configure.py |
|
+++ b/configure.py |
|
@@ -571,6 +571,12 @@ parser.add_option('--shared', |
|
help='compile shared library for embedding node in another project. ' + |
|
'(This mode is not officially supported for regular applications)') |
|
|
|
+parser.add_option('--libdir', |
|
+ action='store', |
|
+ dest='libdir', |
|
+ default='lib', |
|
+ help='a directory to install the shared library into') |
|
+ |
|
parser.add_option('--without-v8-platform', |
|
action='store_true', |
|
dest='without_v8_platform', |
|
@@ -1105,6 +1111,7 @@ def configure_node(o): |
|
o['variables']['node_no_browser_globals'] = b(options.no_browser_globals) |
|
|
|
o['variables']['node_shared'] = b(options.shared) |
|
+ o['variables']['libdir'] = options.libdir |
|
node_module_version = getmoduleversion.get_version() |
|
|
|
if options.dest_os == 'android': |
|
diff --git a/tools/install.py b/tools/install.py |
|
index 655802980a6ea94d1d4ca1dc63c8c8e905fbb83a..fe4723bf15012c8aacacb0393dc8294c049b0503 100755 |
|
--- a/tools/install.py |
|
+++ b/tools/install.py |
|
@@ -121,26 +121,23 @@ def subdir_files(path, dest, action): |
|
|
|
def files(action): |
|
is_windows = sys.platform == 'win32' |
|
- output_file = 'node' |
|
output_prefix = 'out/Release/' |
|
+ output_libprefix = output_prefix |
|
|
|
- if 'false' == variables.get('node_shared'): |
|
- if is_windows: |
|
- output_file += '.exe' |
|
+ if is_windows: |
|
+ output_bin = 'node.exe' |
|
+ output_lib = 'node.dll' |
|
else: |
|
- if is_windows: |
|
- output_file += '.dll' |
|
- else: |
|
- output_file = 'lib' + output_file + '.' + variables.get('shlib_suffix') |
|
- # GYP will output to lib.target except on OS X, this is hardcoded |
|
- # in its source - see the _InstallableTargetInstallPath function. |
|
- if sys.platform != 'darwin': |
|
- output_prefix += 'lib.target/' |
|
+ output_bin = 'node' |
|
+ output_lib = 'libnode.' + variables.get('shlib_suffix') |
|
+ # GYP will output to lib.target except on OS X, this is hardcoded |
|
+ # in its source - see the _InstallableTargetInstallPath function. |
|
+ if sys.platform != 'darwin': |
|
+ output_libprefix += 'lib.target/' |
|
|
|
- if 'false' == variables.get('node_shared'): |
|
- action([output_prefix + output_file], 'bin/' + output_file) |
|
- else: |
|
- action([output_prefix + output_file], 'lib/' + output_file) |
|
+ action([output_prefix + output_bin], 'bin/' + output_bin) |
|
+ if 'true' == variables.get('node_shared'): |
|
+ action([output_libprefix + output_lib], variables.get('libdir') + '/' + output_lib) |
|
|
|
if 'true' == variables.get('node_use_dtrace'): |
|
action(['out/Release/node.d'], 'lib/dtrace/node.d') |
|
-- |
|
2.24.1 |
|
|
|
|