|
1 | | -diff --git a/node.gyp b/node.gyp |
2 | | -index 4aac64089c..8fa6ab3e81 100644 |
3 | | ---- a/node.gyp |
4 | | -+++ b/node.gyp |
5 | | -@@ -25,7 +25,7 @@ |
6 | | - 'node_v8_options%': '', |
7 | | - 'node_enable_v8_vtunejit%': 'false', |
8 | | - 'node_core_target_name%': 'node', |
9 | | -- 'node_lib_target_name%': 'libnode', |
10 | | -+ 'node_lib_target_name%': 'libnode20', |
11 | | - 'node_intermediate_lib_type%': 'static_library', |
12 | | - 'node_builtin_modules_path%': '', |
13 | | - 'linked_module_files': [ |
14 | | - |
15 | | -diff --git a/tools/install.py b/tools/install.py |
16 | | -index 17b0947aac..3e49ce2d74 100755 |
17 | | ---- a/tools/install.py |
18 | | -+++ b/tools/install.py |
| 1 | +diff --git forkSrcPrefix/tools/install.py forkDstPrefix/tools/install.py |
| 2 | +index bf54249b66c0d4e179deaae5a9fd55568e694fe0..ca1ee80b0400a8c5bbf14b44a6eaa6e8666a7a49 100755 |
| 3 | +--- forkSrcPrefix/tools/install.py |
| 4 | ++++ forkDstPrefix/tools/install.py |
19 | 5 | @@ -151,31 +151,31 @@ def files(options, action): |
20 | 6 |
|
21 | 7 | if 'true' == options.variables.get('node_shared'): |
22 | 8 | if options.is_win: |
23 | 9 | - action(options, [os.path.join(options.build_dir, 'libnode.dll')], 'bin/libnode.dll') |
24 | 10 | - action(options, [os.path.join(options.build_dir, 'libnode.lib')], 'lib/libnode.lib') |
25 | | -+ action(options, [os.path.join(options.build_dir, 'libnode20.dll')], 'bin/libnode20.dll') |
26 | | -+ action(options, [os.path.join(options.build_dir, 'libnode20.lib')], 'lib/libnode20.lib') |
| 11 | ++ action(options, [os.path.join(options.build_dir, 'libnode22.dll')], 'bin/libnode22.dll') |
| 12 | ++ action(options, [os.path.join(options.build_dir, 'libnode22.lib')], 'lib/libnode22.lib') |
27 | 13 | elif sys.platform == 'zos': |
28 | 14 | # GYP will output to lib.target; see _InstallableTargetInstallPath |
29 | 15 | # function in tools/gyp/pylib/gyp/generator/make.py |
30 | 16 | output_prefix = os.path.join(options.build_dir, 'lib.target') |
31 | 17 |
|
32 | 18 | - output_lib = 'libnode.' + options.variables.get('shlib_suffix') |
33 | | -+ output_lib = 'libnode20.' + options.variables.get('shlib_suffix') |
| 19 | ++ output_lib = 'libnode22.' + options.variables.get('shlib_suffix') |
34 | 20 | action(options, [os.path.join(output_prefix, output_lib)], os.path.join('lib', output_lib)) |
35 | 21 |
|
36 | 22 | - # create libnode.x that references libnode.so (C++ addons compat) |
37 | | -+ # create libnode20.x that references libnode20.so (C++ addons compat) |
| 23 | ++ # create libnode22.x that references libnode22.so (C++ addons compat) |
38 | 24 | os.system(os.path.dirname(os.path.realpath(__file__)) + |
39 | 25 | '/zos/modifysidedeck.sh ' + |
40 | 26 | abspath(options.install_path, 'lib', output_lib) + ' ' + |
41 | 27 | - abspath(options.install_path, 'lib/libnode.x') + ' libnode.so') |
42 | | -+ abspath(options.install_path, 'lib/libnode20.x') + ' libnode20.so') |
| 28 | ++ abspath(options.install_path, 'lib/libnode22.x') + ' libnode22.so') |
43 | 29 |
|
44 | 30 | - # install libnode.version.so |
45 | 31 | - so_name = 'libnode.' + re.sub(r'\.x$', '.so', options.variables.get('shlib_suffix')) |
46 | | -+ # install libnode20.version.so |
47 | | -+ so_name = 'libnode20.' + re.sub(r'\.x$', '.so', options.variables.get('shlib_suffix')) |
| 32 | ++ # install libnode22.version.so |
| 33 | ++ so_name = 'libnode22.' + re.sub(r'\.x$', '.so', options.variables.get('shlib_suffix')) |
48 | 34 | action(options, [os.path.join(output_prefix, so_name)], options.variables.get('libdir') + '/' + so_name) |
49 | 35 |
|
50 | 36 | - # create symlink of libnode.so -> libnode.version.so (C++ addons compat) |
51 | 37 | - link_path = abspath(options.install_path, 'lib/libnode.so') |
52 | | -+ # create symlink of libnode20.so -> libnode20.version.so (C++ addons compat) |
53 | | -+ link_path = abspath(options.install_path, 'lib/libnode20.so') |
| 38 | ++ # create symlink of libnode22.so -> libnode22.version.so (C++ addons compat) |
| 39 | ++ link_path = abspath(options.install_path, 'lib/libnode22.so') |
54 | 40 | try_symlink(options, so_name, link_path) |
55 | 41 | else: |
56 | 42 | - output_lib = 'libnode.' + options.variables.get('shlib_suffix') |
57 | | -+ output_lib = 'libnode20.' + options.variables.get('shlib_suffix') |
| 43 | ++ output_lib = 'libnode22.' + options.variables.get('shlib_suffix') |
58 | 44 | action(options, [os.path.join(options.build_dir, output_lib)], |
59 | 45 | os.path.join(options.variables.get('libdir'), output_lib)) |
60 | 46 |
|
61 | | - |
62 | | -diff --git a/vcbuild.bat b/vcbuild.bat |
63 | | -index 75f0850b01..3baa17461f 100644 |
64 | | ---- a/vcbuild.bat |
65 | | -+++ b/vcbuild.bat |
66 | | -@@ -451,8 +451,8 @@ if errorlevel 1 echo Cannot copy nodevars.bat && goto package_error |
| 47 | +diff --git forkSrcPrefix/node.gyp forkDstPrefix/node.gyp |
| 48 | +index 46baef1db3eacec9592296b583d76e3ffcf4de59..8f61828079ec06c3624f6ec83273f5144dfa2221 100644 |
| 49 | +--- forkSrcPrefix/node.gyp |
| 50 | ++++ forkDstPrefix/node.gyp |
| 51 | +@@ -27,7 +27,7 @@ |
| 52 | + 'node_v8_options%': '', |
| 53 | + 'node_enable_v8_vtunejit%': 'false', |
| 54 | + 'node_core_target_name%': 'node', |
| 55 | +- 'node_lib_target_name%': 'libnode', |
| 56 | ++ 'node_lib_target_name%': 'libnode22', |
| 57 | + 'node_intermediate_lib_type%': 'static_library', |
| 58 | + 'node_builtin_modules_path%': '', |
| 59 | + 'linked_module_files': [ |
| 60 | +diff --git forkSrcPrefix/vcbuild.bat forkDstPrefix/vcbuild.bat |
| 61 | +index 428577c5c3d1e9ab55285d7d985fc06ec0ac1dd4..002b7e6558265557ed1c76bb94f9695f7603180d 100644 |
| 62 | +--- forkSrcPrefix/vcbuild.bat |
| 63 | ++++ forkDstPrefix/vcbuild.bat |
| 64 | +@@ -458,11 +458,11 @@ if errorlevel 1 echo Cannot copy nodevars.bat && goto package_error |
67 | 65 | copy /Y ..\tools\msvs\install_tools\*.* %TARGET_NAME%\ > nul |
68 | 66 | if errorlevel 1 echo Cannot copy install_tools scripts && goto package_error |
69 | 67 | if defined dll ( |
70 | 68 | - copy /Y libnode.dll %TARGET_NAME%\ > nul |
71 | 69 | - if errorlevel 1 echo Cannot copy libnode.dll && goto package_error |
72 | | -+ copy /Y libnode20.dll %TARGET_NAME%\ > nul |
73 | | -+ if errorlevel 1 echo Cannot copy libnode20.dll && goto package_error |
| 70 | ++ copy /Y libnode22.dll %TARGET_NAME%\ > nul |
| 71 | ++ if errorlevel 1 echo Cannot copy libnode22.dll && goto package_error |
| 72 | + |
| 73 | +- copy /Y libnode.lib %TARGET_NAME%\ > nul |
| 74 | +- if errorlevel 1 echo Cannot copy libnode.lib && goto package_error |
| 75 | ++ copy /Y libnode22.lib %TARGET_NAME%\ > nul |
| 76 | ++ if errorlevel 1 echo Cannot copy libnode22.lib && goto package_error |
74 | 77 |
|
75 | 78 | mkdir %TARGET_NAME%\Release > nul |
76 | 79 | copy /Y node.def %TARGET_NAME%\Release\ > nul |
0 commit comments