Skip to content

Commit 9bd5fc2

Browse files
danbevrvagg
danbev
authored and
rvagg
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: #20797 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 a8d2ab5 commit 9bd5fc2

File tree

3 files changed

+81
-104
lines changed

3 files changed

+81
-104
lines changed

‎common.gypi

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,29 @@
4040

4141
'conditions': [
4242
['GENERATOR=="ninja"', {
43-
'OBJ_DIR': '<(PRODUCT_DIR)/obj',
44-
'V8_BASE': '<(PRODUCT_DIR)/obj/deps/v8/src/libv8_base.a',
43+
'obj_dir': '<(PRODUCT_DIR)/obj',
44+
'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/src/libv8_base.a',
4545
}, {
46-
'OBJ_DIR%': '<(PRODUCT_DIR)/obj.target',
47-
'V8_BASE%': '<(PRODUCT_DIR)/obj.target/deps/v8/src/libv8_base.a',
46+
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
47+
'v8_base%': '<(PRODUCT_DIR)/obj.target/deps/v8/src/libv8_base.a',
4848
}],
4949
['OS == "win"', {
5050
'os_posix': 0,
5151
'v8_postmortem_support%': 'false',
52-
'OBJ_DIR': '<(PRODUCT_DIR)/obj',
53-
'V8_BASE': '<(PRODUCT_DIR)/lib/v8_libbase.lib',
52+
'obj_dir': '<(PRODUCT_DIR)/obj',
53+
'v8_base': '<(PRODUCT_DIR)/lib/v8_libbase.lib',
5454
}, {
5555
'os_posix': 1,
5656
'v8_postmortem_support%': 'true',
5757
}],
5858
['OS== "mac"', {
59-
'OBJ_DIR%': '<(PRODUCT_DIR)/obj.target',
60-
'V8_BASE': '<(PRODUCT_DIR)/libv8_base.a',
59+
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
60+
'v8_base': '<(PRODUCT_DIR)/libv8_base.a',
6161
}],
6262
['openssl_fips != ""', {
63-
'OPENSSL_PRODUCT': '<(STATIC_LIB_PREFIX)crypto<(STATIC_LIB_SUFFIX)',
63+
'openssl_product': '<(STATIC_LIB_PREFIX)crypto<(STATIC_LIB_SUFFIX)',
6464
}, {
65-
'OPENSSL_PRODUCT': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)',
65+
'openssl_product': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)',
6666
}],
6767
['OS=="mac"', {
6868
'clang%': 1,

‎node.gyp

Lines changed: 64 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
'conditions': [
216216
['OS in "linux freebsd openbsd solaris android"', {
217217
'ldflags': [
218-
'-Wl,--whole-archive,<(OBJ_DIR)/<(STATIC_LIB_PREFIX)'
218+
'-Wl,--whole-archive,<(obj_dir)/<(STATIC_LIB_PREFIX)'
219219
'<(node_core_target_name)<(STATIC_LIB_SUFFIX)',
220220
'-Wl,--no-whole-archive',
221221
],
@@ -750,10 +750,10 @@
750750
{
751751
'action_name': 'node_dtrace_provider_o',
752752
'inputs': [
753-
'<(OBJ_DIR)/<(node_lib_target_name)/src/node_dtrace.o',
753+
'<(obj_dir)/<(node_lib_target_name)/src/node_dtrace.o',
754754
],
755755
'outputs': [
756-
'<(OBJ_DIR)/<(node_lib_target_name)/src/node_dtrace_provider.o'
756+
'<(obj_dir)/<(node_lib_target_name)/src/node_dtrace_provider.o'
757757
],
758758
'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d',
759759
'<@(_inputs)', '-o', '<@(_outputs)' ]
@@ -785,7 +785,7 @@
785785
{
786786
'action_name': 'node_dtrace_ustack_constants',
787787
'inputs': [
788-
'<(V8_BASE)'
788+
'<(v8_base)'
789789
],
790790
'outputs': [
791791
'<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
@@ -803,7 +803,7 @@
803803
'<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
804804
],
805805
'outputs': [
806-
'<(OBJ_DIR)/<(node_lib_target_name)/src/node_dtrace_ustack.o'
806+
'<(obj_dir)/<(node_lib_target_name)/src/node_dtrace_ustack.o'
807807
],
808808
'conditions': [
809809
[ 'target_arch=="ia32" or target_arch=="arm"', {
@@ -893,32 +893,32 @@
893893
],
894894

895895
'variables': {
896-
'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src',
897-
'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/gen',
898-
'OBJ_TRACING_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src/tracing',
899-
'OBJ_SUFFIX': 'o',
900-
'OBJ_SEPARATOR': '/',
896+
'obj_path': '<(obj_dir)/<(node_lib_target_name)/src',
897+
'obj_gen_path': '<(obj_dir)/<(node_lib_target_name)/gen',
898+
'obj_tracing_path': '<(obj_dir)/<(node_lib_target_name)/src/tracing',
899+
'obj_suffix': 'o',
900+
'obj_separator': '/',
901901
'conditions': [
902902
['OS=="win"', {
903-
'OBJ_SUFFIX': 'obj',
903+
'obj_suffix': 'obj',
904904
}],
905905
['GENERATOR=="ninja"', {
906-
'OBJ_PATH': '<(OBJ_DIR)/src',
907-
'OBJ_GEN_PATH': '<(OBJ_DIR)/gen',
908-
'OBJ_TRACING_PATH': '<(OBJ_DIR)/src/tracing',
909-
'OBJ_SEPARATOR': '/<(node_lib_target_name).',
906+
'obj_path': '<(obj_dir)/src',
907+
'obj_gen_path': '<(obj_dir)/gen',
908+
'obj_tracing_path': '<(obj_dir)/src/tracing',
909+
'obj_separator': '/<(node_lib_target_name).',
910910
}, {
911911
'conditions': [
912912
['OS=="win"', {
913-
'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)',
914-
'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)',
915-
'OBJ_TRACING_PATH': '<(OBJ_DIR)/<(node_lib_target_name)',
913+
'obj_path': '<(obj_dir)/<(node_lib_target_name)',
914+
'obj_gen_path': '<(obj_dir)/<(node_lib_target_name)',
915+
'obj_tracing_path': '<(obj_dir)/<(node_lib_target_name)',
916916
}],
917917
['OS=="aix"', {
918-
'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src',
919-
'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/gen',
920-
'OBJ_TRACING_PATH':
921-
'<(OBJ_DIR)/<(node_lib_target_name)/src/tracing',
918+
'obj_path': '<(obj_dir)/<(node_lib_target_name)/src',
919+
'obj_gen_path': '<(obj_dir)/<(node_lib_target_name)/gen',
920+
'obj_tracing_path':
921+
'<(obj_dir)/<(node_lib_target_name)/src/tracing',
922922
}],
923923
]}
924924
]
@@ -952,60 +952,37 @@
952952
],
953953

954954
'libraries': [
955-
'<(OBJ_PATH)<(OBJ_SEPARATOR)async_wrap.<(OBJ_SUFFIX)',
956-
'<(OBJ_PATH)<(OBJ_SEPARATOR)env.<(OBJ_SUFFIX)',
957-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node.<(OBJ_SUFFIX)',
958-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_buffer.<(OBJ_SUFFIX)',
959-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_debug_options.<(OBJ_SUFFIX)',
960-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_i18n.<(OBJ_SUFFIX)',
961-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_perf.<(OBJ_SUFFIX)',
962-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_platform.<(OBJ_SUFFIX)',
963-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_url.<(OBJ_SUFFIX)',
964-
'<(OBJ_PATH)<(OBJ_SEPARATOR)util.<(OBJ_SUFFIX)',
965-
'<(OBJ_PATH)<(OBJ_SEPARATOR)string_bytes.<(OBJ_SUFFIX)',
966-
'<(OBJ_PATH)<(OBJ_SEPARATOR)string_search.<(OBJ_SUFFIX)',
967-
'<(OBJ_PATH)<(OBJ_SEPARATOR)stream_base.<(OBJ_SUFFIX)',
968-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_constants.<(OBJ_SUFFIX)',
969-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)agent.<(OBJ_SUFFIX)',
970-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_buffer.<(OBJ_SUFFIX)',
971-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_writer.<(OBJ_SUFFIX)',
972-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)trace_event.<(OBJ_SUFFIX)',
973-
'<(OBJ_GEN_PATH)<(OBJ_SEPARATOR)node_javascript.<(OBJ_SUFFIX)',
955+
'<(obj_path)<(obj_separator)async_wrap.<(obj_suffix)',
956+
'<(obj_path)<(obj_separator)handle_wrap.<(obj_suffix)',
957+
'<(obj_path)<(obj_separator)env.<(obj_suffix)',
958+
'<(obj_path)<(obj_separator)node.<(obj_suffix)',
959+
'<(obj_path)<(obj_separator)node_buffer.<(obj_suffix)',
960+
'<(obj_path)<(obj_separator)node_debug_options.<(obj_suffix)',
961+
'<(obj_path)<(obj_separator)node_i18n.<(obj_suffix)',
962+
'<(obj_path)<(obj_separator)node_perf.<(obj_suffix)',
963+
'<(obj_path)<(obj_separator)node_platform.<(obj_suffix)',
964+
'<(obj_path)<(obj_separator)node_url.<(obj_suffix)',
965+
'<(obj_path)<(obj_separator)util.<(obj_suffix)',
966+
'<(obj_path)<(obj_separator)string_bytes.<(obj_suffix)',
967+
'<(obj_path)<(obj_separator)string_search.<(obj_suffix)',
968+
'<(obj_path)<(obj_separator)stream_base.<(obj_suffix)',
969+
'<(obj_path)<(obj_separator)node_constants.<(obj_suffix)',
970+
'<(obj_tracing_path)<(obj_separator)agent.<(obj_suffix)',
971+
'<(obj_tracing_path)<(obj_separator)node_trace_buffer.<(obj_suffix)',
972+
'<(obj_tracing_path)<(obj_separator)node_trace_writer.<(obj_suffix)',
973+
'<(obj_tracing_path)<(obj_separator)trace_event.<(obj_suffix)',
974+
'<(obj_gen_path)<(obj_separator)node_javascript.<(obj_suffix)',
974975
],
975976

976977
'conditions': [
977-
['node_target_type!="static_library"', {
978-
'libraries': [
979-
'<(OBJ_PATH)<(OBJ_SEPARATOR)async_wrap.<(OBJ_SUFFIX)',
980-
'<(OBJ_PATH)<(OBJ_SEPARATOR)handle_wrap.<(OBJ_SUFFIX)',
981-
'<(OBJ_PATH)<(OBJ_SEPARATOR)env.<(OBJ_SUFFIX)',
982-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node.<(OBJ_SUFFIX)',
983-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_buffer.<(OBJ_SUFFIX)',
984-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_debug_options.<(OBJ_SUFFIX)',
985-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_i18n.<(OBJ_SUFFIX)',
986-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_perf.<(OBJ_SUFFIX)',
987-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_platform.<(OBJ_SUFFIX)',
988-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_url.<(OBJ_SUFFIX)',
989-
'<(OBJ_PATH)<(OBJ_SEPARATOR)util.<(OBJ_SUFFIX)',
990-
'<(OBJ_PATH)<(OBJ_SEPARATOR)string_bytes.<(OBJ_SUFFIX)',
991-
'<(OBJ_PATH)<(OBJ_SEPARATOR)string_search.<(OBJ_SUFFIX)',
992-
'<(OBJ_PATH)<(OBJ_SEPARATOR)stream_base.<(OBJ_SUFFIX)',
993-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_constants.<(OBJ_SUFFIX)',
994-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)agent.<(OBJ_SUFFIX)',
995-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_buffer.<(OBJ_SUFFIX)',
996-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_writer.<(OBJ_SUFFIX)',
997-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)trace_event.<(OBJ_SUFFIX)',
998-
'<(OBJ_GEN_PATH)<(OBJ_SEPARATOR)node_javascript.<(OBJ_SUFFIX)',
999-
],
1000-
}],
1001978
[ 'node_use_openssl=="true"', {
1002979
'conditions': [
1003980
['node_target_type!="static_library"', {
1004981
'libraries': [
1005-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto.<(OBJ_SUFFIX)',
1006-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_bio.<(OBJ_SUFFIX)',
1007-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_clienthello.<(OBJ_SUFFIX)',
1008-
'<(OBJ_PATH)<(OBJ_SEPARATOR)tls_wrap.<(OBJ_SUFFIX)',
982+
'<(obj_path)<(obj_separator)node_crypto.<(obj_suffix)',
983+
'<(obj_path)<(obj_separator)node_crypto_bio.<(obj_suffix)',
984+
'<(obj_path)<(obj_separator)node_crypto_clienthello.<(obj_suffix)',
985+
'<(obj_path)<(obj_separator)tls_wrap.<(obj_suffix)',
1009986
],
1010987
}],
1011988
],
@@ -1016,9 +993,9 @@
1016993
[ 'node_use_perfctr=="true"', {
1017994
'defines': [ 'HAVE_PERFCTR=1' ],
1018995
'libraries': [
1019-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_counters.<(OBJ_SUFFIX)',
1020-
'<(OBJ_PATH)<(OBJ_SEPARATOR)'
1021-
'node_win32_perfctr_provider.<(OBJ_SUFFIX)',
996+
'<(obj_path)<(obj_separator)node_counters.<(obj_suffix)',
997+
'<(obj_path)<(obj_separator)'
998+
'node_win32_perfctr_provider.<(obj_suffix)',
1022999
],
10231000
}],
10241001
['v8_enable_inspector==1', {
@@ -1029,11 +1006,11 @@
10291006
'conditions': [
10301007
['node_target_type!="static_library"', {
10311008
'libraries': [
1032-
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_agent.<(OBJ_SUFFIX)',
1033-
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_io.<(OBJ_SUFFIX)',
1034-
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_js_api.<(OBJ_SUFFIX)',
1035-
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_socket.<(OBJ_SUFFIX)',
1036-
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_socket_server.<(OBJ_SUFFIX)',
1009+
'<(obj_path)<(obj_separator)inspector_agent.<(obj_suffix)',
1010+
'<(obj_path)<(obj_separator)inspector_io.<(obj_suffix)',
1011+
'<(obj_path)<(obj_separator)inspector_js_api.<(obj_suffix)',
1012+
'<(obj_path)<(obj_separator)inspector_socket.<(obj_suffix)',
1013+
'<(obj_path)<(obj_separator)inspector_socket_server.<(obj_suffix)',
10371014
],
10381015
}],
10391016
],
@@ -1043,42 +1020,42 @@
10431020
}],
10441021
[ 'node_use_dtrace=="true" and node_target_type!="static_library"', {
10451022
'libraries': [
1046-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)',
1023+
'<(obj_path)<(obj_separator)node_dtrace.<(obj_suffix)',
10471024
],
10481025
'conditions': [
10491026
['OS!="mac" and OS!="linux"', {
10501027
'libraries': [
1051-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_provider.<(OBJ_SUFFIX)',
1052-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_ustack.<(OBJ_SUFFIX)',
1028+
'<(obj_path)<(obj_separator)node_dtrace_provider.<(obj_suffix)',
1029+
'<(obj_path)<(obj_separator)node_dtrace_ustack.<(obj_suffix)',
10531030
]
10541031
}],
10551032
['OS=="linux"', {
10561033
'libraries': [
1057-
'<(SHARED_INTERMEDIATE_DIR)<(OBJ_SEPARATOR)'
1058-
'node_dtrace_provider.<(OBJ_SUFFIX)',
1034+
'<(SHARED_INTERMEDIATE_DIR)<(obj_separator)'
1035+
'node_dtrace_provider.<(obj_suffix)',
10591036
]
10601037
}],
10611038
],
10621039
}, {
10631040
'conditions': [
10641041
[ 'node_use_etw=="true" and OS=="win"', {
10651042
'libraries': [
1066-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)',
1067-
'<(OBJ_PATH)<(OBJ_SEPARATOR)'
1068-
'node_win32_etw_provider.<(OBJ_SUFFIX)',
1043+
'<(obj_path)<(obj_separator)node_dtrace.<(obj_suffix)',
1044+
'<(obj_path)<(obj_separator)'
1045+
'node_win32_etw_provider.<(obj_suffix)',
10691046
],
10701047
}]
10711048
]
10721049
}],
10731050
[ 'OS=="win" and node_target_type!="static_library"', {
10741051
'libraries': [
1075-
'<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_win32.<(OBJ_SUFFIX)',
1052+
'<(obj_path)<(obj_separator)backtrace_win32.<(obj_suffix)',
10761053
],
10771054
}, {
10781055
'conditions': [
10791056
['node_target_type!="static_library"', {
10801057
'libraries': [
1081-
'<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_posix.<(OBJ_SUFFIX)',
1058+
'<(obj_path)<(obj_separator)backtrace_posix.<(obj_suffix)',
10821059
],
10831060
}],
10841061
],

‎node.gypi

Lines 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
}],

0 commit comments

Comments
 (0)