Skip to content

Commit 3fbfa1e

Browse files
danbevdanbev
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.
1 parent e2015b5 commit 3fbfa1e

File tree

3 files changed

+59
-59
lines changed

3 files changed

+59
-59
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': 'libcrypto.a',
63+
'openssl_product': 'libcrypto.a',
6464
}, {
65-
'OPENSSL_PRODUCT': 'libopenssl.a',
65+
'openssl_product': 'libopenssl.a',
6666
}],
6767
['OS=="mac"', {
6868
'clang%': 1,

‎node.gyp‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -497,10 +497,10 @@
497497
{
498498
'action_name': 'node_dtrace_provider_o',
499499
'inputs': [
500-
'<(OBJ_DIR)/node/src/node_dtrace.o',
500+
'<(obj_dir)/node/src/node_dtrace.o',
501501
],
502502
'outputs': [
503-
'<(OBJ_DIR)/node/src/node_dtrace_provider.o'
503+
'<(obj_dir)/node/src/node_dtrace_provider.o'
504504
],
505505
'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d',
506506
'<@(_inputs)', '-o', '<@(_outputs)' ]
@@ -532,7 +532,7 @@
532532
{
533533
'action_name': 'node_dtrace_ustack_constants',
534534
'inputs': [
535-
'<(V8_BASE)'
535+
'<(v8_base)'
536536
],
537537
'outputs': [
538538
'<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
@@ -550,7 +550,7 @@
550550
'<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
551551
],
552552
'outputs': [
553-
'<(OBJ_DIR)/node/src/node_dtrace_ustack.o'
553+
'<(obj_dir)/node/src/node_dtrace_ustack.o'
554554
],
555555
'conditions': [
556556
[ 'target_arch=="ia32" or target_arch=="arm"', {
@@ -611,31 +611,31 @@
611611
],
612612

613613
'variables': {
614-
'OBJ_PATH': '<(OBJ_DIR)/node/src',
615-
'OBJ_GEN_PATH': '<(OBJ_DIR)/node/gen',
616-
'OBJ_TRACING_PATH': '<(OBJ_DIR)/node/src/tracing',
617-
'OBJ_SUFFIX': 'o',
618-
'OBJ_SEPARATOR': '/',
614+
'obj_path': '<(obj_dir)/node/src',
615+
'obj_gen_path': '<(obj_dir)/node/gen',
616+
'obj_tracing_path': '<(obj_dir)/node/src/tracing',
617+
'obj_suffix': 'o',
618+
'obj_separator': '/',
619619
'conditions': [
620620
['OS=="win"', {
621-
'OBJ_SUFFIX': 'obj',
621+
'obj_suffix': 'obj',
622622
}],
623623
['GENERATOR=="ninja"', {
624-
'OBJ_PATH': '<(OBJ_DIR)/src',
625-
'OBJ_GEN_PATH': '<(OBJ_DIR)/gen',
626-
'OBJ_TRACING_PATH': '<(OBJ_DIR)/src/tracing',
627-
'OBJ_SEPARATOR': '/node.',
624+
'obj_path': '<(obj_dir)/src',
625+
'obj_gen_path': '<(obj_dir)/gen',
626+
'obj_tracing_path': '<(obj_dir)/src/tracing',
627+
'obj_separator': '/node.',
628628
}, {
629629
'conditions': [
630630
['OS=="win"', {
631-
'OBJ_PATH': '<(OBJ_DIR)/node',
632-
'OBJ_GEN_PATH': '<(OBJ_DIR)/node',
633-
'OBJ_TRACING_PATH': '<(OBJ_DIR)/node',
631+
'obj_path': '<(obj_dir)/node',
632+
'obj_gen_path': '<(obj_dir)/node',
633+
'obj_tracing_path': '<(obj_dir)/node',
634634
}],
635635
['OS=="aix"', {
636-
'OBJ_PATH': '<(OBJ_DIR)/node_base/src',
637-
'OBJ_GEN_PATH': '<(OBJ_DIR)/node_base/gen',
638-
'OBJ_TRACING_PATH': '<(OBJ_DIR)/node_base/src/tracing',
636+
'obj_path': '<(obj_dir)/node_base/src',
637+
'obj_gen_path': '<(obj_dir)/node_base/gen',
638+
'obj_tracing_path': '<(obj_dir)/node_base/src/tracing',
639639
}],
640640
]}
641641
]
@@ -675,24 +675,24 @@
675675
'conditions': [
676676
['node_target_type!="static_library"', {
677677
'libraries': [
678-
'<(OBJ_GEN_PATH)<(OBJ_SEPARATOR)node_javascript.<(OBJ_SUFFIX)',
679-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_debug_options.<(OBJ_SUFFIX)',
680-
'<(OBJ_PATH)<(OBJ_SEPARATOR)async-wrap.<(OBJ_SUFFIX)',
681-
'<(OBJ_PATH)<(OBJ_SEPARATOR)env.<(OBJ_SUFFIX)',
682-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node.<(OBJ_SUFFIX)',
683-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_buffer.<(OBJ_SUFFIX)',
684-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_i18n.<(OBJ_SUFFIX)',
685-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_perf.<(OBJ_SUFFIX)',
686-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_url.<(OBJ_SUFFIX)',
687-
'<(OBJ_PATH)<(OBJ_SEPARATOR)util.<(OBJ_SUFFIX)',
688-
'<(OBJ_PATH)<(OBJ_SEPARATOR)string_bytes.<(OBJ_SUFFIX)',
689-
'<(OBJ_PATH)<(OBJ_SEPARATOR)string_search.<(OBJ_SUFFIX)',
690-
'<(OBJ_PATH)<(OBJ_SEPARATOR)stream_base.<(OBJ_SUFFIX)',
691-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_constants.<(OBJ_SUFFIX)',
692-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)agent.<(OBJ_SUFFIX)',
693-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_buffer.<(OBJ_SUFFIX)',
694-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_writer.<(OBJ_SUFFIX)',
695-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)trace_event.<(OBJ_SUFFIX)',
678+
'<(obj_gen_path)<(obj_separator)node_javascript.<(obj_suffix)',
679+
'<(obj_path)<(obj_separator)node_debug_options.<(obj_suffix)',
680+
'<(obj_path)<(obj_separator)async-wrap.<(obj_suffix)',
681+
'<(obj_path)<(obj_separator)env.<(obj_suffix)',
682+
'<(obj_path)<(obj_separator)node.<(obj_suffix)',
683+
'<(obj_path)<(obj_separator)node_buffer.<(obj_suffix)',
684+
'<(obj_path)<(obj_separator)node_i18n.<(obj_suffix)',
685+
'<(obj_path)<(obj_separator)node_perf.<(obj_suffix)',
686+
'<(obj_path)<(obj_separator)node_url.<(obj_suffix)',
687+
'<(obj_path)<(obj_separator)util.<(obj_suffix)',
688+
'<(obj_path)<(obj_separator)string_bytes.<(obj_suffix)',
689+
'<(obj_path)<(obj_separator)string_search.<(obj_suffix)',
690+
'<(obj_path)<(obj_separator)stream_base.<(obj_suffix)',
691+
'<(obj_path)<(obj_separator)node_constants.<(obj_suffix)',
692+
'<(obj_tracing_path)<(obj_separator)agent.<(obj_suffix)',
693+
'<(obj_tracing_path)<(obj_separator)node_trace_buffer.<(obj_suffix)',
694+
'<(obj_tracing_path)<(obj_separator)node_trace_writer.<(obj_suffix)',
695+
'<(obj_tracing_path)<(obj_separator)trace_event.<(obj_suffix)',
696696
],
697697
}],
698698
['v8_enable_inspector==1', {
@@ -730,11 +730,11 @@
730730
}],
731731
[ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', {
732732
'copies': [{
733-
'destination': '<(OBJ_DIR)/cctest/src',
733+
'destination': '<(obj_dir)/cctest/src',
734734
'files': [
735-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_ustack.<(OBJ_SUFFIX)',
736-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_provider.<(OBJ_SUFFIX)',
737-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)',
735+
'<(obj_path)<(obj_separator)node_dtrace_ustack.<(obj_suffix)',
736+
'<(obj_path)<(obj_separator)node_dtrace_provider.<(obj_suffix)',
737+
'<(obj_path)<(obj_separator)node_dtrace.<(obj_suffix)',
738738
]},
739739
],
740740
}],
@@ -795,7 +795,7 @@
795795
{
796796
'action_name': 'expfile',
797797
'inputs': [
798-
'<(OBJ_DIR)'
798+
'<(obj_dir)'
799799
],
800800
'outputs': [
801801
'<(PRODUCT_DIR)/node.exp'

‎node.gypi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,15 @@
130130
[ 'node_target_type!="static_library"', {
131131
'xcode_settings': {
132132
'OTHER_LDFLAGS': [
133-
'-Wl,-force_load,<(PRODUCT_DIR)/<(OPENSSL_PRODUCT)',
133+
'-Wl,-force_load,<(PRODUCT_DIR)/<(openssl_product)',
134134
],
135135
},
136136
'conditions': [
137137
['OS in "linux freebsd" and node_shared=="false"', {
138138
'ldflags': [
139139
'-Wl,--whole-archive,'
140-
'<(OBJ_DIR)/deps/openssl/'
141-
'<(OPENSSL_PRODUCT)',
140+
'<(obj_dir)/deps/openssl/'
141+
'<(openssl_product)',
142142
'-Wl,--no-whole-archive',
143143
],
144144
}],
@@ -238,7 +238,7 @@
238238
[ 'node_target_type!="static_library"', {
239239
'xcode_settings': {
240240
'OTHER_LDFLAGS': [
241-
'-Wl,-force_load,<(V8_BASE)',
241+
'-Wl,-force_load,<(v8_base)',
242242
],
243243
},
244244
}],
@@ -318,12 +318,12 @@
318318
}],
319319
[ '(OS=="freebsd" or OS=="linux") and node_shared=="false" and coverage=="false"', {
320320
'ldflags': [ '-Wl,-z,noexecstack',
321-
'-Wl,--whole-archive <(V8_BASE)',
321+
'-Wl,--whole-archive <(v8_base)',
322322
'-Wl,--no-whole-archive' ]
323323
}],
324324
[ '(OS=="freebsd" or OS=="linux") and node_shared=="false" and coverage=="true"', {
325325
'ldflags': [ '-Wl,-z,noexecstack',
326-
'-Wl,--whole-archive <(V8_BASE)',
326+
'-Wl,--whole-archive <(v8_base)',
327327
'-Wl,--no-whole-archive',
328328
'--coverage',
329329
'-g',

0 commit comments

Comments
 (0)