1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: make gyp user defined variables lowercase

Browse Source 
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.

PR-URL: https://github.com/nodejs/node/pull/16238
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Daniel Bevenius 2017-10-16 15:34:42 +02:00 committed by Ruben Bridgewater
parent 936eea5099
commit ac7f1e339c
No known key found for this signature in database
GPG Key ID: F07496B3EB3C1762
4 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common.gypi
View File

@ -44,29 +44,29 @@
'conditions': [ 'conditions': [
['GENERATOR=="ninja"', { ['GENERATOR=="ninja"', {
'OBJ_DIR': '<(PRODUCT_DIR)/obj', 'obj_dir': '<(PRODUCT_DIR)/obj',
'V8_BASE': '<(PRODUCT_DIR)/obj/deps/v8/src/libv8_base.a', 'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/src/libv8_base.a',
}, { }, {
'OBJ_DIR%': '<(PRODUCT_DIR)/obj.target', 'obj_dir%': '<(PRODUCT_DIR)/obj.target',
'V8_BASE%': '<(PRODUCT_DIR)/obj.target/deps/v8/src/libv8_base.a', 'v8_base%': '<(PRODUCT_DIR)/obj.target/deps/v8/src/libv8_base.a',
}], }],
['OS == "win"', { ['OS == "win"', {
'os_posix': 0, 'os_posix': 0,
'v8_postmortem_support%': 'false', 'v8_postmortem_support%': 'false',
'OBJ_DIR': '<(PRODUCT_DIR)/obj', 'obj_dir': '<(PRODUCT_DIR)/obj',
'V8_BASE': '<(PRODUCT_DIR)/lib/v8_libbase.lib', 'v8_base': '<(PRODUCT_DIR)/lib/v8_libbase.lib',
}, { }, {
'os_posix': 1, 'os_posix': 1,
'v8_postmortem_support%': 'true', 'v8_postmortem_support%': 'true',
}], }],
['OS== "mac"', { ['OS== "mac"', {
'OBJ_DIR%': '<(PRODUCT_DIR)/obj.target', 'obj_dir%': '<(PRODUCT_DIR)/obj.target',
'V8_BASE': '<(PRODUCT_DIR)/libv8_base.a', 'v8_base': '<(PRODUCT_DIR)/libv8_base.a',
}], }],
['openssl_fips != ""', { ['openssl_fips != ""', {
'OPENSSL_PRODUCT': '<(STATIC_LIB_PREFIX)crypto<(STATIC_LIB_SUFFIX)', 'openssl_product': '<(STATIC_LIB_PREFIX)crypto<(STATIC_LIB_SUFFIX)',
}, { }, {
'OPENSSL_PRODUCT': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)', 'openssl_product': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)',
}], }],
['OS=="mac"', { ['OS=="mac"', {
'clang%': 1, 'clang%': 1,

128
node.gyp
View File

@ -234,7 +234,7 @@
'conditions': [ 'conditions': [
['OS in "linux freebsd openbsd solaris android"', { ['OS in "linux freebsd openbsd solaris android"', {
'ldflags': [ 'ldflags': [
'-Wl,--whole-archive,<(OBJ_DIR)/<(STATIC_LIB_PREFIX)' '-Wl,--whole-archive,<(obj_dir)/<(STATIC_LIB_PREFIX)'
'<(node_core_target_name)<(STATIC_LIB_SUFFIX)', '<(node_core_target_name)<(STATIC_LIB_SUFFIX)',
'-Wl,--no-whole-archive', '-Wl,--no-whole-archive',
], ],
@ -772,10 +772,10 @@
{ {
'action_name': 'node_dtrace_provider_o', 'action_name': 'node_dtrace_provider_o',
'inputs': [ 'inputs': [
'<(OBJ_DIR)/<(node_lib_target_name)/src/node_dtrace.o', '<(obj_dir)/<(node_lib_target_name)/src/node_dtrace.o',
], ],
'outputs': [ 'outputs': [
'<(OBJ_DIR)/<(node_lib_target_name)/src/node_dtrace_provider.o' '<(obj_dir)/<(node_lib_target_name)/src/node_dtrace_provider.o'
], ],
'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d', 'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d',
'<@(_inputs)', '-o', '<@(_outputs)' ] '<@(_inputs)', '-o', '<@(_outputs)' ]
@ -807,7 +807,7 @@
{ {
'action_name': 'node_dtrace_ustack_constants', 'action_name': 'node_dtrace_ustack_constants',
'inputs': [ 'inputs': [
'<(V8_BASE)' '<(v8_base)'
], ],
'outputs': [ 'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/v8constants.h' '<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
@ -825,7 +825,7 @@
'<(SHARED_INTERMEDIATE_DIR)/v8constants.h' '<(SHARED_INTERMEDIATE_DIR)/v8constants.h'
], ],
'outputs': [ 'outputs': [
'<(OBJ_DIR)/<(node_lib_target_name)/src/node_dtrace_ustack.o' '<(obj_dir)/<(node_lib_target_name)/src/node_dtrace_ustack.o'
], ],
'conditions': [ 'conditions': [
[ 'target_arch=="ia32" or target_arch=="arm"', { [ 'target_arch=="ia32" or target_arch=="arm"', {
@ -915,32 +915,32 @@
], ],
'variables': { 'variables': {
'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src', 'obj_path': '<(obj_dir)/<(node_lib_target_name)/src',
'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/gen', 'obj_gen_path': '<(obj_dir)/<(node_lib_target_name)/gen',
'OBJ_TRACING_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src/tracing', 'obj_tracing_path': '<(obj_dir)/<(node_lib_target_name)/src/tracing',
'OBJ_SUFFIX': 'o', 'obj_suffix': 'o',
'OBJ_SEPARATOR': '/', 'obj_separator': '/',
'conditions': [ 'conditions': [
['OS=="win"', { ['OS=="win"', {
'OBJ_SUFFIX': 'obj', 'obj_suffix': 'obj',
}], }],
['GENERATOR=="ninja"', { ['GENERATOR=="ninja"', {
'OBJ_PATH': '<(OBJ_DIR)/src', 'obj_path': '<(obj_dir)/src',
'OBJ_GEN_PATH': '<(OBJ_DIR)/gen', 'obj_gen_path': '<(obj_dir)/gen',
'OBJ_TRACING_PATH': '<(OBJ_DIR)/src/tracing', 'obj_tracing_path': '<(obj_dir)/src/tracing',
'OBJ_SEPARATOR': '/<(node_lib_target_name).', 'obj_separator': '/<(node_lib_target_name).',
}, { }, {
'conditions': [ 'conditions': [
['OS=="win"', { ['OS=="win"', {
'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)', 'obj_path': '<(obj_dir)/<(node_lib_target_name)',
'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)', 'obj_gen_path': '<(obj_dir)/<(node_lib_target_name)',
'OBJ_TRACING_PATH': '<(OBJ_DIR)/<(node_lib_target_name)', 'obj_tracing_path': '<(obj_dir)/<(node_lib_target_name)',
}], }],
['OS=="aix"', { ['OS=="aix"', {
'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src', 'obj_path': '<(obj_dir)/<(node_lib_target_name)/src',
'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/gen', 'obj_gen_path': '<(obj_dir)/<(node_lib_target_name)/gen',
'OBJ_TRACING_PATH': 'obj_tracing_path':
'<(OBJ_DIR)/<(node_lib_target_name)/src/tracing', '<(obj_dir)/<(node_lib_target_name)/src/tracing',
}], }],
]} ]}
] ]
@ -974,26 +974,26 @@
], ],
'libraries': [ 'libraries': [
'<(OBJ_PATH)<(OBJ_SEPARATOR)async_wrap.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)async_wrap.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)handle_wrap.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)handle_wrap.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)env.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)env.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)node.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)node.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_buffer.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)node_buffer.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_debug_options.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)node_debug_options.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_i18n.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)node_i18n.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_perf.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)node_perf.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_platform.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)node_platform.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_url.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)node_url.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)util.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)util.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)string_bytes.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)string_bytes.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)string_search.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)string_search.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)stream_base.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)stream_base.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_constants.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)node_constants.<(obj_suffix)',
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)agent.<(OBJ_SUFFIX)', '<(obj_tracing_path)<(obj_separator)agent.<(obj_suffix)',
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_buffer.<(OBJ_SUFFIX)', '<(obj_tracing_path)<(obj_separator)node_trace_buffer.<(obj_suffix)',
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_writer.<(OBJ_SUFFIX)', '<(obj_tracing_path)<(obj_separator)node_trace_writer.<(obj_suffix)',
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)trace_event.<(OBJ_SUFFIX)', '<(obj_tracing_path)<(obj_separator)trace_event.<(obj_suffix)',
'<(OBJ_GEN_PATH)<(OBJ_SEPARATOR)node_javascript.<(OBJ_SUFFIX)', '<(obj_gen_path)<(obj_separator)node_javascript.<(obj_suffix)',
], ],
'conditions': [ 'conditions': [
@ -1001,10 +1001,10 @@
'conditions': [ 'conditions': [
['node_target_type!="static_library"', { ['node_target_type!="static_library"', {
'libraries': [ 'libraries': [
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)node_crypto.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_bio.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)node_crypto_bio.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_clienthello.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)node_crypto_clienthello.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)tls_wrap.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)tls_wrap.<(obj_suffix)',
], ],
}], }],
], ],
@ -1015,9 +1015,9 @@
[ 'node_use_perfctr=="true"', { [ 'node_use_perfctr=="true"', {
'defines': [ 'HAVE_PERFCTR=1' ], 'defines': [ 'HAVE_PERFCTR=1' ],
'libraries': [ 'libraries': [
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_counters.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)node_counters.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)' '<(obj_path)<(obj_separator)'
'node_win32_perfctr_provider.<(OBJ_SUFFIX)', 'node_win32_perfctr_provider.<(obj_suffix)',
], ],
}], }],
['v8_enable_inspector==1', { ['v8_enable_inspector==1', {
@ -1028,11 +1028,11 @@
'conditions': [ 'conditions': [
['node_target_type!="static_library"', { ['node_target_type!="static_library"', {
'libraries': [ 'libraries': [
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_agent.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)inspector_agent.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_io.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)inspector_io.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_js_api.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)inspector_js_api.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_socket.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)inspector_socket.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_socket_server.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)inspector_socket_server.<(obj_suffix)',
], ],
}], }],
], ],
@ -1042,19 +1042,19 @@
}], }],
[ 'node_use_dtrace=="true" and node_target_type!="static_library"', { [ 'node_use_dtrace=="true" and node_target_type!="static_library"', {
'libraries': [ 'libraries': [
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)node_dtrace.<(obj_suffix)',
], ],
'conditions': [ 'conditions': [
['OS!="mac" and OS!="linux"', { ['OS!="mac" and OS!="linux"', {
'libraries': [ 'libraries': [
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_provider.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)node_dtrace_provider.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_ustack.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)node_dtrace_ustack.<(obj_suffix)',
] ]
}], }],
['OS=="linux"', { ['OS=="linux"', {
'libraries': [ 'libraries': [
'<(SHARED_INTERMEDIATE_DIR)<(OBJ_SEPARATOR)' '<(SHARED_INTERMEDIATE_DIR)<(obj_separator)'
'node_dtrace_provider.<(OBJ_SUFFIX)', 'node_dtrace_provider.<(obj_suffix)',
] ]
}], }],
], ],
@ -1062,22 +1062,22 @@
'conditions': [ 'conditions': [
[ 'node_use_etw=="true" and OS=="win"', { [ 'node_use_etw=="true" and OS=="win"', {
'libraries': [ 'libraries': [
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)node_dtrace.<(obj_suffix)',
'<(OBJ_PATH)<(OBJ_SEPARATOR)' '<(obj_path)<(obj_separator)'
'node_win32_etw_provider.<(OBJ_SUFFIX)', 'node_win32_etw_provider.<(obj_suffix)',
], ],
}] }]
] ]
}], }],
[ 'OS=="win" and node_target_type!="static_library"', { [ 'OS=="win" and node_target_type!="static_library"', {
'libraries': [ 'libraries': [
'<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_win32.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)backtrace_win32.<(obj_suffix)',
], ],
}, { }, {
'conditions': [ 'conditions': [
['node_target_type!="static_library"', { ['node_target_type!="static_library"', {
'libraries': [ 'libraries': [
'<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_posix.<(OBJ_SUFFIX)', '<(obj_path)<(obj_separator)backtrace_posix.<(obj_suffix)',
], ],
}], }],
], ],

14
node.gypi
View File

@ -99,7 +99,7 @@
[ 'force_load=="true"', { [ 'force_load=="true"', {
'xcode_settings': { 'xcode_settings': {
'OTHER_LDFLAGS': [ 'OTHER_LDFLAGS': [
'-Wl,-force_load,<(V8_BASE)', '-Wl,-force_load,<(v8_base)',
], ],
}, },
}], }],
@ -154,7 +154,7 @@
{ {
'action_name': 'expfile', 'action_name': 'expfile',
'inputs': [ 'inputs': [
'<(OBJ_DIR)' '<(obj_dir)'
], ],
'outputs': [ 'outputs': [
'<(PRODUCT_DIR)/node.exp' '<(PRODUCT_DIR)/node.exp'
@ -186,13 +186,13 @@
[ '(OS=="freebsd" or OS=="linux") and node_shared=="false"' [ '(OS=="freebsd" or OS=="linux") and node_shared=="false"'
' and coverage=="false" and force_load=="true"', { ' and coverage=="false" and force_load=="true"', {
'ldflags': [ '-Wl,-z,noexecstack', 'ldflags': [ '-Wl,-z,noexecstack',
'-Wl,--whole-archive <(V8_BASE)', '-Wl,--whole-archive <(v8_base)',
'-Wl,--no-whole-archive' ] '-Wl,--no-whole-archive' ]
}], }],
[ '(OS=="freebsd" or OS=="linux") and node_shared=="false"' [ '(OS=="freebsd" or OS=="linux") and node_shared=="false"'
' and coverage=="true" and force_load=="true"', { ' and coverage=="true" and force_load=="true"', {
'ldflags': [ '-Wl,-z,noexecstack', 'ldflags': [ '-Wl,-z,noexecstack',
'-Wl,--whole-archive <(V8_BASE)', '-Wl,--whole-archive <(v8_base)',
'-Wl,--no-whole-archive', '-Wl,--no-whole-archive',
'--coverage', '--coverage',
'-g', '-g',
@ -237,15 +237,15 @@
[ 'force_load=="true"', { [ 'force_load=="true"', {
'xcode_settings': { 'xcode_settings': {
'OTHER_LDFLAGS': [ 'OTHER_LDFLAGS': [
'-Wl,-force_load,<(PRODUCT_DIR)/<(OPENSSL_PRODUCT)', '-Wl,-force_load,<(PRODUCT_DIR)/<(openssl_product)',
], ],
}, },
'conditions': [ 'conditions': [
['OS in "linux freebsd" and node_shared=="false"', { ['OS in "linux freebsd" and node_shared=="false"', {
'ldflags': [ 'ldflags': [
'-Wl,--whole-archive,' '-Wl,--whole-archive,'
'<(OBJ_DIR)/deps/openssl/' '<(obj_dir)/deps/openssl/'
'<(OPENSSL_PRODUCT)', '<(openssl_product)',
'-Wl,--no-whole-archive', '-Wl,--no-whole-archive',
], ],
}], }],

2
test/addons/openssl-client-cert-engine/binding.gyp
View File

@ -14,7 +14,7 @@
'include_dirs': ['../../../deps/openssl/openssl/include'], 'include_dirs': ['../../../deps/openssl/openssl/include'],
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'../../../../out/<(PRODUCT_DIR)/<(OPENSSL_PRODUCT)' '../../../../out/<(PRODUCT_DIR)/<(openssl_product)'
] ]
}, },
}] }]