Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 237a363

Browse filesBrowse files
danbevaddaleax
danbev
authored and
addaleax
committed
build: make gyp user defined variables lowercase
I mistakenly introduced user defined variables using uppercase characters, reading the gyp documentation they state: "Predefined variables. By convention, these are named with CAPITAL_LETTERS. Predefined variables are set automatically by GYP" and also "By convention, user-defined variables are named with lowercase_letters." This commit renames the user defined variables to lowercase to follow the above mentioned convention. Backport-PR-URL: #18899 PR-URL: #16238 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 287946d commit 237a363
Copy full SHA for 237a363

File tree

Expand file treeCollapse file tree

4 files changed

+81
-81
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

4 files changed

+81
-81
lines changed
Open diff view settings
Collapse file

‎common.gypi‎

Copy file name to clipboardExpand all lines: common.gypi
+10-10Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,29 +44,29 @@
4444

4545
'conditions': [
4646
['GENERATOR=="ninja"', {
47-
'OBJ_DIR': '<(PRODUCT_DIR)/obj',
48-
'V8_BASE': '<(PRODUCT_DIR)/obj/deps/v8/src/libv8_base.a',
47+
'obj_dir': '<(PRODUCT_DIR)/obj',
48+
'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/src/libv8_base.a',
4949
}, {
50-
'OBJ_DIR%': '<(PRODUCT_DIR)/obj.target',
51-
'V8_BASE%': '<(PRODUCT_DIR)/obj.target/deps/v8/src/libv8_base.a',
50+
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
51+
'v8_base%': '<(PRODUCT_DIR)/obj.target/deps/v8/src/libv8_base.a',
5252
}],
5353
['OS == "win"', {
5454
'os_posix': 0,
5555
'v8_postmortem_support%': 'false',
56-
'OBJ_DIR': '<(PRODUCT_DIR)/obj',
57-
'V8_BASE': '<(PRODUCT_DIR)/lib/v8_libbase.lib',
56+
'obj_dir': '<(PRODUCT_DIR)/obj',
57+
'v8_base': '<(PRODUCT_DIR)/lib/v8_libbase.lib',
5858
}, {
5959
'os_posix': 1,
6060
'v8_postmortem_support%': 'true',
6161
}],
6262
['OS== "mac"', {
63-
'OBJ_DIR%': '<(PRODUCT_DIR)/obj.target',
64-
'V8_BASE': '<(PRODUCT_DIR)/libv8_base.a',
63+
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
64+
'v8_base': '<(PRODUCT_DIR)/libv8_base.a',
6565
}],
6666
['openssl_fips != ""', {
67-
'OPENSSL_PRODUCT': '<(STATIC_LIB_PREFIX)crypto<(STATIC_LIB_SUFFIX)',
67+
'openssl_product': '<(STATIC_LIB_PREFIX)crypto<(STATIC_LIB_SUFFIX)',
6868
}, {
69-
'OPENSSL_PRODUCT': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)',
69+
'openssl_product': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)',
7070
}],
7171
['OS=="mac"', {
7272
'clang%': 1,
Collapse file

‎node.gyp‎

Copy file name to clipboardExpand all lines: node.gyp
+63-63Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
'conditions': [
230230
['OS in "linux freebsd openbsd solaris android"', {
231231
'ldflags': [
232-
'-Wl,--whole-archive,<(OBJ_DIR)/<(STATIC_LIB_PREFIX)'
232+
'-Wl,--whole-archive,<(obj_dir)/<(STATIC_LIB_PREFIX)'
233233
'<(node_core_target_name)<(STATIC_LIB_SUFFIX)',
234234
'-Wl,--no-whole-archive',
235235
],
@@ -773,10 +773,10 @@
773773
{
774774
'action_name': 'node_dtrace_provider_o',
775775
'inputs': [
776-
'<(OBJ_DIR)/<(node_lib_target_name)/src/node_dtrace.o',
776+
'<(obj_dir)/<(node_lib_target_name)/src/node_dtrace.o',
777777
],
778778
'outputs': [
779-
'<(OBJ_DIR)/<(node_lib_target_name)/src/node_dtrace_provider.o'
779+
'<(obj_dir)/<(node_lib_target_name)/src/node_dtrace_provider.o'
780780
],
781781
'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d',
782782
'<@(_inputs)', '-o', '<@(_outputs)' ]
@@ -808,7 +808,7 @@
808808
{
809809
'action_name': 'node_dtrace_ustack_constants',
810810
'inputs': [
811-
'<(V8_BASE)'
811+
'<(v8_base)'
812812
],
813813
'outputs': [
814814
'<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
@@ -826,7 +826,7 @@
826826
'<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
827827
],
828828
'outputs': [
829-
'<(OBJ_DIR)/<(node_lib_target_name)/src/node_dtrace_ustack.o'
829+
'<(obj_dir)/<(node_lib_target_name)/src/node_dtrace_ustack.o'
830830
],
831831
'conditions': [
832832
[ 'target_arch=="ia32" or target_arch=="arm"', {
@@ -916,32 +916,32 @@
916916
],
917917

918918
'variables': {
919-
'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src',
920-
'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/gen',
921-
'OBJ_TRACING_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src/tracing',
922-
'OBJ_SUFFIX': 'o',
923-
'OBJ_SEPARATOR': '/',
919+
'obj_path': '<(obj_dir)/<(node_lib_target_name)/src',
920+
'obj_gen_path': '<(obj_dir)/<(node_lib_target_name)/gen',
921+
'obj_tracing_path': '<(obj_dir)/<(node_lib_target_name)/src/tracing',
922+
'obj_suffix': 'o',
923+
'obj_separator': '/',
924924
'conditions': [
925925
['OS=="win"', {
926-
'OBJ_SUFFIX': 'obj',
926+
'obj_suffix': 'obj',
927927
}],
928928
['GENERATOR=="ninja"', {
929-
'OBJ_PATH': '<(OBJ_DIR)/src',
930-
'OBJ_GEN_PATH': '<(OBJ_DIR)/gen',
931-
'OBJ_TRACING_PATH': '<(OBJ_DIR)/src/tracing',
932-
'OBJ_SEPARATOR': '/<(node_lib_target_name).',
929+
'obj_path': '<(obj_dir)/src',
930+
'obj_gen_path': '<(obj_dir)/gen',
931+
'obj_tracing_path': '<(obj_dir)/src/tracing',
932+
'obj_separator': '/<(node_lib_target_name).',
933933
}, {
934934
'conditions': [
935935
['OS=="win"', {
936-
'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)',
937-
'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)',
938-
'OBJ_TRACING_PATH': '<(OBJ_DIR)/<(node_lib_target_name)',
936+
'obj_path': '<(obj_dir)/<(node_lib_target_name)',
937+
'obj_gen_path': '<(obj_dir)/<(node_lib_target_name)',
938+
'obj_tracing_path': '<(obj_dir)/<(node_lib_target_name)',
939939
}],
940940
['OS=="aix"', {
941-
'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src',
942-
'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/gen',
943-
'OBJ_TRACING_PATH':
944-
'<(OBJ_DIR)/<(node_lib_target_name)/src/tracing',
941+
'obj_path': '<(obj_dir)/<(node_lib_target_name)/src',
942+
'obj_gen_path': '<(obj_dir)/<(node_lib_target_name)/gen',
943+
'obj_tracing_path':
944+
'<(obj_dir)/<(node_lib_target_name)/src/tracing',
945945
}],
946946
]}
947947
]
@@ -974,36 +974,36 @@
974974
],
975975

976976
'libraries': [
977-
'<(OBJ_PATH)<(OBJ_SEPARATOR)async_wrap.<(OBJ_SUFFIX)',
978-
'<(OBJ_PATH)<(OBJ_SEPARATOR)env.<(OBJ_SUFFIX)',
979-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node.<(OBJ_SUFFIX)',
980-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_buffer.<(OBJ_SUFFIX)',
981-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_debug_options.<(OBJ_SUFFIX)',
982-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_i18n.<(OBJ_SUFFIX)',
983-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_perf.<(OBJ_SUFFIX)',
984-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_platform.<(OBJ_SUFFIX)',
985-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_url.<(OBJ_SUFFIX)',
986-
'<(OBJ_PATH)<(OBJ_SEPARATOR)util.<(OBJ_SUFFIX)',
987-
'<(OBJ_PATH)<(OBJ_SEPARATOR)string_bytes.<(OBJ_SUFFIX)',
988-
'<(OBJ_PATH)<(OBJ_SEPARATOR)string_search.<(OBJ_SUFFIX)',
989-
'<(OBJ_PATH)<(OBJ_SEPARATOR)stream_base.<(OBJ_SUFFIX)',
990-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_constants.<(OBJ_SUFFIX)',
991-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)agent.<(OBJ_SUFFIX)',
992-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_buffer.<(OBJ_SUFFIX)',
993-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_writer.<(OBJ_SUFFIX)',
994-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)trace_event.<(OBJ_SUFFIX)',
995-
'<(OBJ_GEN_PATH)<(OBJ_SEPARATOR)node_javascript.<(OBJ_SUFFIX)',
977+
'<(obj_path)<(obj_separator)async_wrap.<(obj_suffix)',
978+
'<(obj_path)<(obj_separator)env.<(obj_suffix)',
979+
'<(obj_path)<(obj_separator)node.<(obj_suffix)',
980+
'<(obj_path)<(obj_separator)node_buffer.<(obj_suffix)',
981+
'<(obj_path)<(obj_separator)node_debug_options.<(obj_suffix)',
982+
'<(obj_path)<(obj_separator)node_i18n.<(obj_suffix)',
983+
'<(obj_path)<(obj_separator)node_perf.<(obj_suffix)',
984+
'<(obj_path)<(obj_separator)node_platform.<(obj_suffix)',
985+
'<(obj_path)<(obj_separator)node_url.<(obj_suffix)',
986+
'<(obj_path)<(obj_separator)util.<(obj_suffix)',
987+
'<(obj_path)<(obj_separator)string_bytes.<(obj_suffix)',
988+
'<(obj_path)<(obj_separator)string_search.<(obj_suffix)',
989+
'<(obj_path)<(obj_separator)stream_base.<(obj_suffix)',
990+
'<(obj_path)<(obj_separator)node_constants.<(obj_suffix)',
991+
'<(obj_tracing_path)<(obj_separator)agent.<(obj_suffix)',
992+
'<(obj_tracing_path)<(obj_separator)node_trace_buffer.<(obj_suffix)',
993+
'<(obj_tracing_path)<(obj_separator)node_trace_writer.<(obj_suffix)',
994+
'<(obj_tracing_path)<(obj_separator)trace_event.<(obj_suffix)',
995+
'<(obj_gen_path)<(obj_separator)node_javascript.<(obj_suffix)',
996996
],
997997

998998
'conditions': [
999999
[ 'node_use_openssl=="true"', {
10001000
'conditions': [
10011001
['node_target_type!="static_library"', {
10021002
'libraries': [
1003-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto.<(OBJ_SUFFIX)',
1004-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_bio.<(OBJ_SUFFIX)',
1005-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_clienthello.<(OBJ_SUFFIX)',
1006-
'<(OBJ_PATH)<(OBJ_SEPARATOR)tls_wrap.<(OBJ_SUFFIX)',
1003+
'<(obj_path)<(obj_separator)node_crypto.<(obj_suffix)',
1004+
'<(obj_path)<(obj_separator)node_crypto_bio.<(obj_suffix)',
1005+
'<(obj_path)<(obj_separator)node_crypto_clienthello.<(obj_suffix)',
1006+
'<(obj_path)<(obj_separator)tls_wrap.<(obj_suffix)',
10071007
],
10081008
}],
10091009
],
@@ -1014,9 +1014,9 @@
10141014
[ 'node_use_perfctr=="true"', {
10151015
'defines': [ 'HAVE_PERFCTR=1' ],
10161016
'libraries': [
1017-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_counters.<(OBJ_SUFFIX)',
1018-
'<(OBJ_PATH)<(OBJ_SEPARATOR)'
1019-
'node_win32_perfctr_provider.<(OBJ_SUFFIX)',
1017+
'<(obj_path)<(obj_separator)node_counters.<(obj_suffix)',
1018+
'<(obj_path)<(obj_separator)'
1019+
'node_win32_perfctr_provider.<(obj_suffix)',
10201020
],
10211021
}],
10221022
['v8_enable_inspector==1', {
@@ -1027,11 +1027,11 @@
10271027
'conditions': [
10281028
['node_target_type!="static_library"', {
10291029
'libraries': [
1030-
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_agent.<(OBJ_SUFFIX)',
1031-
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_io.<(OBJ_SUFFIX)',
1032-
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_js_api.<(OBJ_SUFFIX)',
1033-
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_socket.<(OBJ_SUFFIX)',
1034-
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_socket_server.<(OBJ_SUFFIX)',
1030+
'<(obj_path)<(obj_separator)inspector_agent.<(obj_suffix)',
1031+
'<(obj_path)<(obj_separator)inspector_io.<(obj_suffix)',
1032+
'<(obj_path)<(obj_separator)inspector_js_api.<(obj_suffix)',
1033+
'<(obj_path)<(obj_separator)inspector_socket.<(obj_suffix)',
1034+
'<(obj_path)<(obj_separator)inspector_socket_server.<(obj_suffix)',
10351035
],
10361036
}],
10371037
],
@@ -1041,42 +1041,42 @@
10411041
}],
10421042
[ 'node_use_dtrace=="true" and node_target_type!="static_library"', {
10431043
'libraries': [
1044-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)',
1044+
'<(obj_path)<(obj_separator)node_dtrace.<(obj_suffix)',
10451045
],
10461046
'conditions': [
10471047
['OS!="mac" and OS!="linux"', {
10481048
'libraries': [
1049-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_provider.<(OBJ_SUFFIX)',
1050-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_ustack.<(OBJ_SUFFIX)',
1049+
'<(obj_path)<(obj_separator)node_dtrace_provider.<(obj_suffix)',
1050+
'<(obj_path)<(obj_separator)node_dtrace_ustack.<(obj_suffix)',
10511051
]
10521052
}],
10531053
['OS=="linux"', {
10541054
'libraries': [
1055-
'<(SHARED_INTERMEDIATE_DIR)<(OBJ_SEPARATOR)'
1056-
'node_dtrace_provider.<(OBJ_SUFFIX)',
1055+
'<(SHARED_INTERMEDIATE_DIR)<(obj_separator)'
1056+
'node_dtrace_provider.<(obj_suffix)',
10571057
]
10581058
}],
10591059
],
10601060
}, {
10611061
'conditions': [
10621062
[ 'node_use_etw=="true" and OS=="win"', {
10631063
'libraries': [
1064-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)',
1065-
'<(OBJ_PATH)<(OBJ_SEPARATOR)'
1066-
'node_win32_etw_provider.<(OBJ_SUFFIX)',
1064+
'<(obj_path)<(obj_separator)node_dtrace.<(obj_suffix)',
1065+
'<(obj_path)<(obj_separator)'
1066+
'node_win32_etw_provider.<(obj_suffix)',
10671067
],
10681068
}]
10691069
]
10701070
}],
10711071
[ 'OS=="win" and node_target_type!="static_library"', {
10721072
'libraries': [
1073-
'<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_win32.<(OBJ_SUFFIX)',
1073+
'<(obj_path)<(obj_separator)backtrace_win32.<(obj_suffix)',
10741074
],
10751075
}, {
10761076
'conditions': [
10771077
['node_target_type!="static_library"', {
10781078
'libraries': [
1079-
'<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_posix.<(OBJ_SUFFIX)',
1079+
'<(obj_path)<(obj_separator)backtrace_posix.<(obj_suffix)',
10801080
],
10811081
}],
10821082
],
Collapse file

‎node.gypi‎

Copy file name to clipboardExpand all lines: node.gypi
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
[ 'force_load=="true"', {
100100
'xcode_settings': {
101101
'OTHER_LDFLAGS': [
102-
'-Wl,-force_load,<(V8_BASE)',
102+
'-Wl,-force_load,<(v8_base)',
103103
],
104104
},
105105
}],
@@ -154,7 +154,7 @@
154154
{
155155
'action_name': 'expfile',
156156
'inputs': [
157-
'<(OBJ_DIR)'
157+
'<(obj_dir)'
158158
],
159159
'outputs': [
160160
'<(PRODUCT_DIR)/node.exp'
@@ -186,13 +186,13 @@
186186
[ '(OS=="freebsd" or OS=="linux") and node_shared=="false"'
187187
' and coverage=="false" and force_load=="true"', {
188188
'ldflags': [ '-Wl,-z,noexecstack',
189-
'-Wl,--whole-archive <(V8_BASE)',
189+
'-Wl,--whole-archive <(v8_base)',
190190
'-Wl,--no-whole-archive' ]
191191
}],
192192
[ '(OS=="freebsd" or OS=="linux") and node_shared=="false"'
193193
' and coverage=="true" and force_load=="true"', {
194194
'ldflags': [ '-Wl,-z,noexecstack',
195-
'-Wl,--whole-archive <(V8_BASE)',
195+
'-Wl,--whole-archive <(v8_base)',
196196
'-Wl,--no-whole-archive',
197197
'--coverage',
198198
'-g',
@@ -237,15 +237,15 @@
237237
[ 'force_load=="true"', {
238238
'xcode_settings': {
239239
'OTHER_LDFLAGS': [
240-
'-Wl,-force_load,<(PRODUCT_DIR)/<(OPENSSL_PRODUCT)',
240+
'-Wl,-force_load,<(PRODUCT_DIR)/<(openssl_product)',
241241
],
242242
},
243243
'conditions': [
244244
['OS in "linux freebsd" and node_shared=="false"', {
245245
'ldflags': [
246246
'-Wl,--whole-archive,'
247-
'<(OBJ_DIR)/deps/openssl/'
248-
'<(OPENSSL_PRODUCT)',
247+
'<(obj_dir)/deps/openssl/'
248+
'<(openssl_product)',
249249
'-Wl,--no-whole-archive',
250250
],
251251
}],
Collapse file

‎test/addons/openssl-client-cert-engine/binding.gyp‎

Copy file name to clipboardExpand all lines: test/addons/openssl-client-cert-engine/binding.gyp
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
'include_dirs': ['../../../deps/openssl/openssl/include'],
1515
'link_settings': {
1616
'libraries': [
17-
'../../../../out/<(PRODUCT_DIR)/<(OPENSSL_PRODUCT)'
17+
'../../../../out/<(PRODUCT_DIR)/<(openssl_product)'
1818
]
1919
},
2020
}]

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.