From bf276a108cf7710220c3ed2a8bd0685478703c9b Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 19 Mar 2019 23:22:40 -0400 Subject: [PATCH 3/3] 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 --- configure.py | 7 +++++++ tools/install.py | 29 +++++++++++++---------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/configure.py b/configure.py index 9f780ab9bca150df7a635af00c2976c1fb8156a7..f1f2b129466334436747c3e7f95b7bb6dc245253 100755 --- a/configure.py +++ b/configure.py @@ -560,10 +560,16 @@ parser.add_option('--shared', action='store_true', dest='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', default=False, help='do not initialize v8 platform during node.js startup. ' + @@ -1106,10 +1112,11 @@ def configure_node(o): o['variables']['node_no_browser_globals'] = b(options.no_browser_globals) if options.code_cache_path: o['variables']['node_code_cache_path'] = options.code_cache_path o['variables']['node_shared'] = b(options.shared) + o['variables']['libdir'] = options.libdir node_module_version = getmoduleversion.get_version() if sys.platform == 'darwin': shlib_suffix = '%s.dylib' elif sys.platform.startswith('aix'): diff --git a/tools/install.py b/tools/install.py index 3befec213b1ce68b234f0a2602a8acd302fd8422..e7a6c67c3a72ee7745ba45049552a4e8feee5a61 100755 --- a/tools/install.py +++ b/tools/install.py @@ -120,30 +120,27 @@ def subdir_files(path, dest, action): for subdir, files in ret.items(): action(files, subdir + '/') 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') # behave similarly for systemtap -- 2.21.0