From ede6c4a048e54ab6516bc186ca5d5b16f8175b02 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Wed, 23 Jan 2019 12:01:01 +0100 Subject: [PATCH 1/3] test, tools: suppress addon function cast warnings Currently, there are a number of compiler warnings generated when building the addons on Linux, for example: make[1]: Entering directory '/node/test/addons/zlib-binding/build' CXX(target) Release/obj.target/binding/binding.o SOLINK_MODULE(target) Release/obj.target/binding.node COPY Release/binding.node make[1]: Leaving directory '/node/test/addons/zlib-binding/build' In file included from ../binding.cc:1: /node/src/node.h:515:51: warning: cast between incompatible function types from 'void (*)(v8::Local, v8::Local, v8::Local)' to 'node::addon_context_register_func' {aka 'void (*)(v8::Local, v8::Local, v8::Local, void*)'} [-Wcast-function-type] (node::addon_context_register_func) (regfunc), \ ^ /node/src/node.h:533:3: note: in expansion of macro 'NODE_MODULE_CONTEXT_AWARE_X' NODE_MODULE_CONTEXT_AWARE_X(modname, regfunc, NULL, 0) ^~~~~~~~~~~~~~~~~~~~~~~~~~~ ../binding.cc:58:1: note: in expansion of macro 'NODE_MODULE_CONTEXT_AWARE' NODE_MODULE_CONTEXT_AWARE(NODE_GYP_MODULE_NAME, Initialize) ^~~~~~~~~~~~~~~~~~~~~~~~~ This commit adds the flag -Wno-cast-function-type to suppress these warnings. With this change the warnings are not displayed anymore and the output matches that of osx when running 'make -j8 test/addons/.buildstamp'. --- test/addons/async-hello-world/binding.gyp | 3 ++- test/addons/async-hooks-id/binding.gyp | 3 ++- test/addons/async-hooks-promise/binding.gyp | 3 ++- test/addons/async-resource/binding.gyp | 3 ++- test/addons/at-exit/binding.gyp | 3 ++- test/addons/buffer-free-callback/binding.gyp | 3 ++- test/addons/callback-scope/binding.gyp | 3 ++- test/addons/dlopen-ping-pong/binding.gyp | 1 + test/addons/errno-exception/binding.gyp | 3 ++- test/addons/heap-profiler/binding.gyp | 3 ++- test/addons/hello-world-esm/binding.gyp | 3 ++- test/addons/hello-world-function-export/binding.gyp | 3 ++- test/addons/hello-world/binding.gyp | 3 ++- test/addons/load-long-path/binding.gyp | 3 ++- test/addons/make-callback-domain-warning/binding.gyp | 3 ++- test/addons/make-callback-recurse/binding.gyp | 3 ++- test/addons/make-callback/binding.gyp | 3 ++- test/addons/new-target/binding.gyp | 3 ++- test/addons/node-module-version/binding.gyp | 3 ++- test/addons/non-node-context/binding.gyp | 3 ++- test/addons/not-a-binding/binding.gyp | 3 ++- test/addons/null-buffer-neuter/binding.gyp | 3 ++- test/addons/openssl-binding/binding.gyp | 3 ++- test/addons/openssl-client-cert-engine/binding.gyp | 1 + test/addons/parse-encoding/binding.gyp | 3 ++- test/addons/repl-domain-abort/binding.gyp | 3 ++- test/addons/stringbytes-external-exceed-max/binding.gyp | 3 ++- test/addons/symlinked-module/binding.gyp | 3 ++- test/addons/uv-handle-leak/binding.gyp | 3 ++- test/addons/worker-addon/binding.gyp | 3 ++- test/addons/zlib-binding/binding.gyp | 1 + tools/doc/addon-verify.js | 3 ++- 32 files changed, 61 insertions(+), 29 deletions(-) diff --git a/test/addons/async-hello-world/binding.gyp b/test/addons/async-hello-world/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/async-hello-world/binding.gyp +++ b/test/addons/async-hello-world/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/async-hooks-id/binding.gyp b/test/addons/async-hooks-id/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/async-hooks-id/binding.gyp +++ b/test/addons/async-hooks-id/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/async-hooks-promise/binding.gyp b/test/addons/async-hooks-promise/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/async-hooks-promise/binding.gyp +++ b/test/addons/async-hooks-promise/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/async-resource/binding.gyp b/test/addons/async-resource/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/async-resource/binding.gyp +++ b/test/addons/async-resource/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/at-exit/binding.gyp b/test/addons/at-exit/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/at-exit/binding.gyp +++ b/test/addons/at-exit/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/buffer-free-callback/binding.gyp b/test/addons/buffer-free-callback/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/buffer-free-callback/binding.gyp +++ b/test/addons/buffer-free-callback/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/callback-scope/binding.gyp b/test/addons/callback-scope/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/callback-scope/binding.gyp +++ b/test/addons/callback-scope/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/dlopen-ping-pong/binding.gyp b/test/addons/dlopen-ping-pong/binding.gyp index 48af696b326507..dd7eccacdfe2bf 100644 --- a/test/addons/dlopen-ping-pong/binding.gyp +++ b/test/addons/dlopen-ping-pong/binding.gyp @@ -19,6 +19,7 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/errno-exception/binding.gyp b/test/addons/errno-exception/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/errno-exception/binding.gyp +++ b/test/addons/errno-exception/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/heap-profiler/binding.gyp b/test/addons/heap-profiler/binding.gyp index ceb1d3e73415de..605223fd975ca5 100644 --- a/test/addons/heap-profiler/binding.gyp +++ b/test/addons/heap-profiler/binding.gyp @@ -4,7 +4,8 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'win_delay_load_hook': 'false' + 'win_delay_load_hook': 'false', + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/hello-world-esm/binding.gyp b/test/addons/hello-world-esm/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/hello-world-esm/binding.gyp +++ b/test/addons/hello-world-esm/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/hello-world-function-export/binding.gyp b/test/addons/hello-world-function-export/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/hello-world-function-export/binding.gyp +++ b/test/addons/hello-world-function-export/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/hello-world/binding.gyp b/test/addons/hello-world/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/hello-world/binding.gyp +++ b/test/addons/hello-world/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/load-long-path/binding.gyp b/test/addons/load-long-path/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/load-long-path/binding.gyp +++ b/test/addons/load-long-path/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/make-callback-domain-warning/binding.gyp b/test/addons/make-callback-domain-warning/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/make-callback-domain-warning/binding.gyp +++ b/test/addons/make-callback-domain-warning/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/make-callback-recurse/binding.gyp b/test/addons/make-callback-recurse/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/make-callback-recurse/binding.gyp +++ b/test/addons/make-callback-recurse/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/make-callback/binding.gyp b/test/addons/make-callback/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/make-callback/binding.gyp +++ b/test/addons/make-callback/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/new-target/binding.gyp b/test/addons/new-target/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/new-target/binding.gyp +++ b/test/addons/new-target/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/node-module-version/binding.gyp b/test/addons/node-module-version/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/node-module-version/binding.gyp +++ b/test/addons/node-module-version/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/non-node-context/binding.gyp b/test/addons/non-node-context/binding.gyp index b83bae308260f2..08cdea2e25d58a 100644 --- a/test/addons/non-node-context/binding.gyp +++ b/test/addons/non-node-context/binding.gyp @@ -2,7 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'sources': ['binding.cc'] + 'sources': ['binding.cc'], + 'cflags': ['-Wno-cast-function-type'], }, ] } diff --git a/test/addons/not-a-binding/binding.gyp b/test/addons/not-a-binding/binding.gyp index 7ddad59c1d1683..ac1751a874e922 100644 --- a/test/addons/not-a-binding/binding.gyp +++ b/test/addons/not-a-binding/binding.gyp @@ -2,7 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'sources': [ 'not_a_binding.c' ] + 'sources': [ 'not_a_binding.c' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/null-buffer-neuter/binding.gyp b/test/addons/null-buffer-neuter/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/null-buffer-neuter/binding.gyp +++ b/test/addons/null-buffer-neuter/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/openssl-binding/binding.gyp b/test/addons/openssl-binding/binding.gyp index 3bfe93350fe3bf..4aa98e41dff1cd 100644 --- a/test/addons/openssl-binding/binding.gyp +++ b/test/addons/openssl-binding/binding.gyp @@ -7,7 +7,8 @@ 'sources': ['binding.cc'], 'include_dirs': ['../../../deps/openssl/openssl/include'], }] - ] + ], + 'cflags': ['-Wno-cast-function-type'], }, ] } diff --git a/test/addons/openssl-client-cert-engine/binding.gyp b/test/addons/openssl-client-cert-engine/binding.gyp index f43be602199ad0..950b0580bfd388 100644 --- a/test/addons/openssl-client-cert-engine/binding.gyp +++ b/test/addons/openssl-client-cert-engine/binding.gyp @@ -3,6 +3,7 @@ { 'target_name': 'testengine', 'type': 'none', + 'cflags': ['-Wno-cast-function-type'], 'conditions': [ ['OS=="mac" and ' 'node_use_openssl=="true" and ' diff --git a/test/addons/parse-encoding/binding.gyp b/test/addons/parse-encoding/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/parse-encoding/binding.gyp +++ b/test/addons/parse-encoding/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/repl-domain-abort/binding.gyp b/test/addons/repl-domain-abort/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/repl-domain-abort/binding.gyp +++ b/test/addons/repl-domain-abort/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/stringbytes-external-exceed-max/binding.gyp b/test/addons/stringbytes-external-exceed-max/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/stringbytes-external-exceed-max/binding.gyp +++ b/test/addons/stringbytes-external-exceed-max/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/symlinked-module/binding.gyp b/test/addons/symlinked-module/binding.gyp index 3bfb84493f3e87..28e09ffdeaf9b1 100644 --- a/test/addons/symlinked-module/binding.gyp +++ b/test/addons/symlinked-module/binding.gyp @@ -2,7 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/uv-handle-leak/binding.gyp b/test/addons/uv-handle-leak/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/uv-handle-leak/binding.gyp +++ b/test/addons/uv-handle-leak/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/worker-addon/binding.gyp b/test/addons/worker-addon/binding.gyp index 7ede63d94a0d77..02e07caea7d9fb 100644 --- a/test/addons/worker-addon/binding.gyp +++ b/test/addons/worker-addon/binding.gyp @@ -3,7 +3,8 @@ { 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], - 'sources': [ 'binding.cc' ] + 'sources': [ 'binding.cc' ], + 'cflags': ['-Wno-cast-function-type'], } ] } diff --git a/test/addons/zlib-binding/binding.gyp b/test/addons/zlib-binding/binding.gyp index 60a9bb82661820..3f35a08bb4ff82 100644 --- a/test/addons/zlib-binding/binding.gyp +++ b/test/addons/zlib-binding/binding.gyp @@ -4,6 +4,7 @@ 'target_name': 'binding', 'sources': ['binding.cc'], 'include_dirs': ['../../../deps/zlib'], + 'cflags': ['-Wno-cast-function-type'], }, ] } diff --git a/tools/doc/addon-verify.js b/tools/doc/addon-verify.js index ae6a08b2cc6475..8ee8216fed3730 100644 --- a/tools/doc/addon-verify.js +++ b/tools/doc/addon-verify.js @@ -80,7 +80,8 @@ ${files[name].replace( { target_name: 'addon', defines: [ 'V8_DEPRECATION_WARNINGS=1' ], - sources: files.map(({ name }) => name) + sources: files.map(({ name }) => name), + cflags: [ '-Wno-cast-function-type' ] } ] }) From b81432dd402facec7ab8ce2a37897c70466767c4 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Mon, 28 Jan 2019 08:49:22 +0100 Subject: [PATCH 2/3] squash!: conditionaly add -Wno-cast-function-type --- test/addons/async-hello-world/binding.gyp | 6 +++++- test/addons/async-hooks-id/binding.gyp | 6 +++++- test/addons/async-hooks-promise/binding.gyp | 6 +++++- test/addons/async-resource/binding.gyp | 6 +++++- test/addons/at-exit/binding.gyp | 6 +++++- test/addons/buffer-free-callback/binding.gyp | 6 +++++- test/addons/callback-scope/binding.gyp | 6 +++++- test/addons/dlopen-ping-pong/binding.gyp | 6 +++++- test/addons/errno-exception/binding.gyp | 6 +++++- test/addons/heap-profiler/binding.gyp | 6 +++++- test/addons/hello-world-esm/binding.gyp | 6 +++++- test/addons/hello-world-function-export/binding.gyp | 6 +++++- test/addons/hello-world/binding.gyp | 6 +++++- test/addons/load-long-path/binding.gyp | 6 +++++- test/addons/make-callback-domain-warning/binding.gyp | 6 +++++- test/addons/make-callback-recurse/binding.gyp | 6 +++++- test/addons/make-callback/binding.gyp | 6 +++++- test/addons/new-target/binding.gyp | 6 +++++- test/addons/node-module-version/binding.gyp | 6 +++++- test/addons/non-node-context/binding.gyp | 6 +++++- test/addons/not-a-binding/binding.gyp | 6 +++++- test/addons/null-buffer-neuter/binding.gyp | 6 +++++- test/addons/openssl-binding/binding.gyp | 6 ++++-- test/addons/openssl-client-cert-engine/binding.gyp | 5 ++++- test/addons/parse-encoding/binding.gyp | 6 +++++- test/addons/repl-domain-abort/binding.gyp | 6 +++++- test/addons/stringbytes-external-exceed-max/binding.gyp | 6 +++++- test/addons/symlinked-module/binding.gyp | 6 +++++- test/addons/uv-handle-leak/binding.gyp | 6 +++++- test/addons/worker-addon/binding.gyp | 6 +++++- test/addons/zlib-binding/binding.gyp | 6 +++++- tools/doc/addon-verify.js | 6 +++++- 32 files changed, 158 insertions(+), 33 deletions(-) diff --git a/test/addons/async-hello-world/binding.gyp b/test/addons/async-hello-world/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/async-hello-world/binding.gyp +++ b/test/addons/async-hello-world/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/async-hooks-id/binding.gyp b/test/addons/async-hooks-id/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/async-hooks-id/binding.gyp +++ b/test/addons/async-hooks-id/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/async-hooks-promise/binding.gyp b/test/addons/async-hooks-promise/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/async-hooks-promise/binding.gyp +++ b/test/addons/async-hooks-promise/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/async-resource/binding.gyp b/test/addons/async-resource/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/async-resource/binding.gyp +++ b/test/addons/async-resource/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/at-exit/binding.gyp b/test/addons/at-exit/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/at-exit/binding.gyp +++ b/test/addons/at-exit/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/buffer-free-callback/binding.gyp b/test/addons/buffer-free-callback/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/buffer-free-callback/binding.gyp +++ b/test/addons/buffer-free-callback/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/callback-scope/binding.gyp b/test/addons/callback-scope/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/callback-scope/binding.gyp +++ b/test/addons/callback-scope/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/dlopen-ping-pong/binding.gyp b/test/addons/dlopen-ping-pong/binding.gyp index dd7eccacdfe2bf..e369720572d9f4 100644 --- a/test/addons/dlopen-ping-pong/binding.gyp +++ b/test/addons/dlopen-ping-pong/binding.gyp @@ -19,7 +19,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/errno-exception/binding.gyp b/test/addons/errno-exception/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/errno-exception/binding.gyp +++ b/test/addons/errno-exception/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/heap-profiler/binding.gyp b/test/addons/heap-profiler/binding.gyp index 605223fd975ca5..5f59a55217d9a9 100644 --- a/test/addons/heap-profiler/binding.gyp +++ b/test/addons/heap-profiler/binding.gyp @@ -5,7 +5,11 @@ 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], 'win_delay_load_hook': 'false', - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/hello-world-esm/binding.gyp b/test/addons/hello-world-esm/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/hello-world-esm/binding.gyp +++ b/test/addons/hello-world-esm/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/hello-world-function-export/binding.gyp b/test/addons/hello-world-function-export/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/hello-world-function-export/binding.gyp +++ b/test/addons/hello-world-function-export/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/hello-world/binding.gyp b/test/addons/hello-world/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/hello-world/binding.gyp +++ b/test/addons/hello-world/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/load-long-path/binding.gyp b/test/addons/load-long-path/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/load-long-path/binding.gyp +++ b/test/addons/load-long-path/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/make-callback-domain-warning/binding.gyp b/test/addons/make-callback-domain-warning/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/make-callback-domain-warning/binding.gyp +++ b/test/addons/make-callback-domain-warning/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/make-callback-recurse/binding.gyp b/test/addons/make-callback-recurse/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/make-callback-recurse/binding.gyp +++ b/test/addons/make-callback-recurse/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/make-callback/binding.gyp b/test/addons/make-callback/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/make-callback/binding.gyp +++ b/test/addons/make-callback/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/new-target/binding.gyp b/test/addons/new-target/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/new-target/binding.gyp +++ b/test/addons/new-target/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/node-module-version/binding.gyp b/test/addons/node-module-version/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/node-module-version/binding.gyp +++ b/test/addons/node-module-version/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/non-node-context/binding.gyp b/test/addons/non-node-context/binding.gyp index 08cdea2e25d58a..6c5ecb18ffc058 100644 --- a/test/addons/non-node-context/binding.gyp +++ b/test/addons/non-node-context/binding.gyp @@ -3,7 +3,11 @@ { 'target_name': 'binding', 'sources': ['binding.cc'], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], }, ] } diff --git a/test/addons/not-a-binding/binding.gyp b/test/addons/not-a-binding/binding.gyp index ac1751a874e922..5e26321bf43bf0 100644 --- a/test/addons/not-a-binding/binding.gyp +++ b/test/addons/not-a-binding/binding.gyp @@ -3,7 +3,11 @@ { 'target_name': 'binding', 'sources': [ 'not_a_binding.c' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/null-buffer-neuter/binding.gyp b/test/addons/null-buffer-neuter/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/null-buffer-neuter/binding.gyp +++ b/test/addons/null-buffer-neuter/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/openssl-binding/binding.gyp b/test/addons/openssl-binding/binding.gyp index 4aa98e41dff1cd..878df759412245 100644 --- a/test/addons/openssl-binding/binding.gyp +++ b/test/addons/openssl-binding/binding.gyp @@ -6,9 +6,11 @@ ['node_use_openssl=="true"', { 'sources': ['binding.cc'], 'include_dirs': ['../../../deps/openssl/openssl/include'], - }] + }], + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], ], - 'cflags': ['-Wno-cast-function-type'], }, ] } diff --git a/test/addons/openssl-client-cert-engine/binding.gyp b/test/addons/openssl-client-cert-engine/binding.gyp index 950b0580bfd388..034a6d2e1b05f1 100644 --- a/test/addons/openssl-client-cert-engine/binding.gyp +++ b/test/addons/openssl-client-cert-engine/binding.gyp @@ -18,7 +18,10 @@ '../../../../out/<(PRODUCT_DIR)/<(openssl_product)' ] }, - }] + }], + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], ] } ] diff --git a/test/addons/parse-encoding/binding.gyp b/test/addons/parse-encoding/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/parse-encoding/binding.gyp +++ b/test/addons/parse-encoding/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/repl-domain-abort/binding.gyp b/test/addons/repl-domain-abort/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/repl-domain-abort/binding.gyp +++ b/test/addons/repl-domain-abort/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/stringbytes-external-exceed-max/binding.gyp b/test/addons/stringbytes-external-exceed-max/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/stringbytes-external-exceed-max/binding.gyp +++ b/test/addons/stringbytes-external-exceed-max/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/symlinked-module/binding.gyp b/test/addons/symlinked-module/binding.gyp index 28e09ffdeaf9b1..447c8a553b3299 100644 --- a/test/addons/symlinked-module/binding.gyp +++ b/test/addons/symlinked-module/binding.gyp @@ -3,7 +3,11 @@ { 'target_name': 'binding', 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/uv-handle-leak/binding.gyp b/test/addons/uv-handle-leak/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/uv-handle-leak/binding.gyp +++ b/test/addons/uv-handle-leak/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/worker-addon/binding.gyp b/test/addons/worker-addon/binding.gyp index 02e07caea7d9fb..67ac9322f072a2 100644 --- a/test/addons/worker-addon/binding.gyp +++ b/test/addons/worker-addon/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], } ] } diff --git a/test/addons/zlib-binding/binding.gyp b/test/addons/zlib-binding/binding.gyp index 3f35a08bb4ff82..1e0be7ce57a6b8 100644 --- a/test/addons/zlib-binding/binding.gyp +++ b/test/addons/zlib-binding/binding.gyp @@ -4,7 +4,11 @@ 'target_name': 'binding', 'sources': ['binding.cc'], 'include_dirs': ['../../../deps/zlib'], - 'cflags': ['-Wno-cast-function-type'], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], }, ] } diff --git a/tools/doc/addon-verify.js b/tools/doc/addon-verify.js index 8ee8216fed3730..4dfecb2451a1bb 100644 --- a/tools/doc/addon-verify.js +++ b/tools/doc/addon-verify.js @@ -81,7 +81,11 @@ ${files[name].replace( target_name: 'addon', defines: [ 'V8_DEPRECATION_WARNINGS=1' ], sources: files.map(({ name }) => name), - cflags: [ '-Wno-cast-function-type' ] + conditions: [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + cflags: ['-Wno-cast-function-type'], + }], + ], } ] }) From c692e51561896c5d42e493a9cdae6a27d65c2ef3 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Thu, 31 Jan 2019 05:31:43 +0100 Subject: [PATCH 3/3] squash!: introduce test/addons/common.gypi --- test/addons/async-hello-world/binding.gyp | 7 +------ test/addons/async-hooks-id/binding.gyp | 7 +------ test/addons/async-hooks-promise/binding.gyp | 7 +------ test/addons/async-resource/binding.gyp | 7 +------ test/addons/at-exit/binding.gyp | 7 +------ test/addons/buffer-free-callback/binding.gyp | 7 +------ test/addons/callback-scope/binding.gyp | 7 +------ test/addons/common.gypi | 8 ++++++++ test/addons/dlopen-ping-pong/binding.gyp | 7 +------ test/addons/errno-exception/binding.gyp | 7 +------ test/addons/heap-profiler/binding.gyp | 7 +------ test/addons/hello-world-esm/binding.gyp | 7 +------ test/addons/hello-world-function-export/binding.gyp | 7 +------ test/addons/hello-world/binding.gyp | 7 +------ test/addons/load-long-path/binding.gyp | 7 +------ test/addons/make-callback-domain-warning/binding.gyp | 7 +------ test/addons/make-callback-recurse/binding.gyp | 7 +------ test/addons/make-callback/binding.gyp | 7 +------ test/addons/new-target/binding.gyp | 7 +------ test/addons/node-module-version/binding.gyp | 7 +------ test/addons/non-node-context/binding.gyp | 6 +----- test/addons/not-a-binding/binding.gyp | 6 +----- test/addons/null-buffer-neuter/binding.gyp | 7 +------ test/addons/openssl-binding/binding.gyp | 4 +--- test/addons/openssl-client-cert-engine/binding.gyp | 5 +---- test/addons/parse-encoding/binding.gyp | 7 +------ test/addons/repl-domain-abort/binding.gyp | 7 +------ test/addons/stringbytes-external-exceed-max/binding.gyp | 7 +------ test/addons/symlinked-module/binding.gyp | 6 +----- test/addons/uv-handle-leak/binding.gyp | 7 +------ test/addons/worker-addon/binding.gyp | 7 +------ test/addons/zlib-binding/binding.gyp | 6 +----- tools/doc/addon-verify.js | 7 +------ 33 files changed, 40 insertions(+), 183 deletions(-) create mode 100644 test/addons/common.gypi diff --git a/test/addons/async-hello-world/binding.gyp b/test/addons/async-hello-world/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/async-hello-world/binding.gyp +++ b/test/addons/async-hello-world/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/async-hooks-id/binding.gyp b/test/addons/async-hooks-id/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/async-hooks-id/binding.gyp +++ b/test/addons/async-hooks-id/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/async-hooks-promise/binding.gyp b/test/addons/async-hooks-promise/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/async-hooks-promise/binding.gyp +++ b/test/addons/async-hooks-promise/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/async-resource/binding.gyp b/test/addons/async-resource/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/async-resource/binding.gyp +++ b/test/addons/async-resource/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/at-exit/binding.gyp b/test/addons/at-exit/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/at-exit/binding.gyp +++ b/test/addons/at-exit/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/buffer-free-callback/binding.gyp b/test/addons/buffer-free-callback/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/buffer-free-callback/binding.gyp +++ b/test/addons/buffer-free-callback/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/callback-scope/binding.gyp b/test/addons/callback-scope/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/callback-scope/binding.gyp +++ b/test/addons/callback-scope/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/common.gypi b/test/addons/common.gypi new file mode 100644 index 00000000000000..3f1c11dc3cda15 --- /dev/null +++ b/test/addons/common.gypi @@ -0,0 +1,8 @@ +{ + 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], + 'conditions': [ + [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { + 'cflags': ['-Wno-cast-function-type'], + }], + ], +} diff --git a/test/addons/dlopen-ping-pong/binding.gyp b/test/addons/dlopen-ping-pong/binding.gyp index e369720572d9f4..8569b011fac8e5 100644 --- a/test/addons/dlopen-ping-pong/binding.gyp +++ b/test/addons/dlopen-ping-pong/binding.gyp @@ -17,13 +17,8 @@ }, { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/errno-exception/binding.gyp b/test/addons/errno-exception/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/errno-exception/binding.gyp +++ b/test/addons/errno-exception/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/heap-profiler/binding.gyp b/test/addons/heap-profiler/binding.gyp index 5f59a55217d9a9..2d26a785709dd1 100644 --- a/test/addons/heap-profiler/binding.gyp +++ b/test/addons/heap-profiler/binding.gyp @@ -2,14 +2,9 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], 'win_delay_load_hook': 'false', - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/hello-world-esm/binding.gyp b/test/addons/hello-world-esm/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/hello-world-esm/binding.gyp +++ b/test/addons/hello-world-esm/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/hello-world-function-export/binding.gyp b/test/addons/hello-world-function-export/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/hello-world-function-export/binding.gyp +++ b/test/addons/hello-world-function-export/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/hello-world/binding.gyp b/test/addons/hello-world/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/hello-world/binding.gyp +++ b/test/addons/hello-world/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/load-long-path/binding.gyp b/test/addons/load-long-path/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/load-long-path/binding.gyp +++ b/test/addons/load-long-path/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/make-callback-domain-warning/binding.gyp b/test/addons/make-callback-domain-warning/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/make-callback-domain-warning/binding.gyp +++ b/test/addons/make-callback-domain-warning/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/make-callback-recurse/binding.gyp b/test/addons/make-callback-recurse/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/make-callback-recurse/binding.gyp +++ b/test/addons/make-callback-recurse/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/make-callback/binding.gyp b/test/addons/make-callback/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/make-callback/binding.gyp +++ b/test/addons/make-callback/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/new-target/binding.gyp b/test/addons/new-target/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/new-target/binding.gyp +++ b/test/addons/new-target/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/node-module-version/binding.gyp b/test/addons/node-module-version/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/node-module-version/binding.gyp +++ b/test/addons/node-module-version/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/non-node-context/binding.gyp b/test/addons/non-node-context/binding.gyp index 6c5ecb18ffc058..2eb456719623b9 100644 --- a/test/addons/non-node-context/binding.gyp +++ b/test/addons/non-node-context/binding.gyp @@ -3,11 +3,7 @@ { 'target_name': 'binding', 'sources': ['binding.cc'], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], }, ] } diff --git a/test/addons/not-a-binding/binding.gyp b/test/addons/not-a-binding/binding.gyp index 5e26321bf43bf0..43036995f8e5d4 100644 --- a/test/addons/not-a-binding/binding.gyp +++ b/test/addons/not-a-binding/binding.gyp @@ -3,11 +3,7 @@ { 'target_name': 'binding', 'sources': [ 'not_a_binding.c' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/null-buffer-neuter/binding.gyp b/test/addons/null-buffer-neuter/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/null-buffer-neuter/binding.gyp +++ b/test/addons/null-buffer-neuter/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/openssl-binding/binding.gyp b/test/addons/openssl-binding/binding.gyp index 878df759412245..38a7c10d672d92 100644 --- a/test/addons/openssl-binding/binding.gyp +++ b/test/addons/openssl-binding/binding.gyp @@ -2,14 +2,12 @@ 'targets': [ { 'target_name': 'binding', + 'includes': ['../common.gypi'], 'conditions': [ ['node_use_openssl=="true"', { 'sources': ['binding.cc'], 'include_dirs': ['../../../deps/openssl/openssl/include'], }], - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], ], }, ] diff --git a/test/addons/openssl-client-cert-engine/binding.gyp b/test/addons/openssl-client-cert-engine/binding.gyp index 034a6d2e1b05f1..9d5f501fd633bc 100644 --- a/test/addons/openssl-client-cert-engine/binding.gyp +++ b/test/addons/openssl-client-cert-engine/binding.gyp @@ -3,7 +3,7 @@ { 'target_name': 'testengine', 'type': 'none', - 'cflags': ['-Wno-cast-function-type'], + 'includes': ['../common.gypi'], 'conditions': [ ['OS=="mac" and ' 'node_use_openssl=="true" and ' @@ -19,9 +19,6 @@ ] }, }], - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], ] } ] diff --git a/test/addons/parse-encoding/binding.gyp b/test/addons/parse-encoding/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/parse-encoding/binding.gyp +++ b/test/addons/parse-encoding/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/repl-domain-abort/binding.gyp b/test/addons/repl-domain-abort/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/repl-domain-abort/binding.gyp +++ b/test/addons/repl-domain-abort/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/stringbytes-external-exceed-max/binding.gyp b/test/addons/stringbytes-external-exceed-max/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/stringbytes-external-exceed-max/binding.gyp +++ b/test/addons/stringbytes-external-exceed-max/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/symlinked-module/binding.gyp b/test/addons/symlinked-module/binding.gyp index 447c8a553b3299..55fbe7050f18e4 100644 --- a/test/addons/symlinked-module/binding.gyp +++ b/test/addons/symlinked-module/binding.gyp @@ -3,11 +3,7 @@ { 'target_name': 'binding', 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/uv-handle-leak/binding.gyp b/test/addons/uv-handle-leak/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/uv-handle-leak/binding.gyp +++ b/test/addons/uv-handle-leak/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/worker-addon/binding.gyp b/test/addons/worker-addon/binding.gyp index 67ac9322f072a2..55fbe7050f18e4 100644 --- a/test/addons/worker-addon/binding.gyp +++ b/test/addons/worker-addon/binding.gyp @@ -2,13 +2,8 @@ 'targets': [ { 'target_name': 'binding', - 'defines': [ 'V8_DEPRECATION_WARNINGS=1' ], 'sources': [ 'binding.cc' ], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], } ] } diff --git a/test/addons/zlib-binding/binding.gyp b/test/addons/zlib-binding/binding.gyp index 1e0be7ce57a6b8..0451f21782ff19 100644 --- a/test/addons/zlib-binding/binding.gyp +++ b/test/addons/zlib-binding/binding.gyp @@ -4,11 +4,7 @@ 'target_name': 'binding', 'sources': ['binding.cc'], 'include_dirs': ['../../../deps/zlib'], - 'conditions': [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': ['-Wno-cast-function-type'], - }], - ], + 'includes': ['../common.gypi'], }, ] } diff --git a/tools/doc/addon-verify.js b/tools/doc/addon-verify.js index 4dfecb2451a1bb..2ff61c21f5c22e 100644 --- a/tools/doc/addon-verify.js +++ b/tools/doc/addon-verify.js @@ -79,13 +79,8 @@ ${files[name].replace( targets: [ { target_name: 'addon', - defines: [ 'V8_DEPRECATION_WARNINGS=1' ], sources: files.map(({ name }) => name), - conditions: [ - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - cflags: ['-Wno-cast-function-type'], - }], - ], + includes: ['../common.gypi'], } ] })