From f94adf546c69ae75cd77cee41997d7e54808ae9c Mon Sep 17 00:00:00 2001
From: Gabriel Schulhof <gabriel.schulhof@intel.com>
Date: Tue, 3 Dec 2019 18:01:53 -0800
Subject: [PATCH] factor out common build settings

---
 common.gypi      | 24 ++++++++++++++++++++++
 except.gypi      | 16 +++++++++++++++
 noexcept.gypi    | 16 +++++++++++++++
 test/binding.gyp | 52 ++++--------------------------------------------
 4 files changed, 60 insertions(+), 48 deletions(-)
 create mode 100644 common.gypi
 create mode 100644 except.gypi
 create mode 100644 noexcept.gypi

diff --git a/common.gypi b/common.gypi
new file mode 100644
index 000000000..812198aea
--- /dev/null
+++ b/common.gypi
@@ -0,0 +1,24 @@
+{
+  'variables': {
+    'NAPI_VERSION%': "<!(node -p \"process.versions.napi\")",
+    'NODE_MAJOR_VERSION%': "<!(node -p \"process.versions.node.match(/\\d+/)[0]\")",
+    'disable_deprecated': "<!(node -p \"process.env['npm_config_disable_deprecated']\")"
+  },
+  'conditions': [
+    ['NAPI_VERSION!=""', { 'defines': ['NAPI_VERSION=<@(NAPI_VERSION)'] } ],
+    ['disable_deprecated=="true"', {
+      'defines': ['NODE_ADDON_API_DISABLE_DEPRECATED']
+    }],
+    ['OS=="mac"', {
+      'cflags+': ['-fvisibility=hidden'],
+      'xcode_settings': {
+        'OTHER_CFLAGS': ['-fvisibility=hidden']
+      }
+    }]
+  ],
+  'defines': ['NODE_MAJOR_VERSION=<@(NODE_MAJOR_VERSION)'],
+  'include_dirs': ["<!@(node -p \"require('../').include\")"],
+  'dependencies': ["<!(node -p \"require('../').gyp\")"],
+  'cflags': [ '-Werror', '-Wall', '-Wextra', '-Wpedantic', '-Wunused-parameter' ],
+  'cflags_cc': [ '-Werror', '-Wall', '-Wextra', '-Wpedantic', '-Wunused-parameter' ]
+}
diff --git a/except.gypi b/except.gypi
new file mode 100644
index 000000000..1f295d10a
--- /dev/null
+++ b/except.gypi
@@ -0,0 +1,16 @@
+{
+  'defines': [ 'NAPI_CPP_EXCEPTIONS' ],
+  'cflags!': [ '-fno-exceptions' ],
+  'cflags_cc!': [ '-fno-exceptions' ],
+  'msvs_settings': {
+    'VCCLCompilerTool': {
+      'ExceptionHandling': 1,
+      'EnablePREfast': 'true',
+    },
+  },
+  'xcode_settings': {
+    'CLANG_CXX_LIBRARY': 'libc++',
+    'MACOSX_DEPLOYMENT_TARGET': '10.7',
+    'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
+  },
+}
diff --git a/noexcept.gypi b/noexcept.gypi
new file mode 100644
index 000000000..179f21f79
--- /dev/null
+++ b/noexcept.gypi
@@ -0,0 +1,16 @@
+{
+  'defines': [ 'NAPI_DISABLE_CPP_EXCEPTIONS' ],
+  'cflags': [ '-fno-exceptions' ],
+  'cflags_cc': [ '-fno-exceptions' ],
+  'msvs_settings': {
+    'VCCLCompilerTool': {
+      'ExceptionHandling': 0,
+      'EnablePREfast': 'true',
+    },
+  },
+  'xcode_settings': {
+    'CLANG_CXX_LIBRARY': 'libc++',
+    'MACOSX_DEPLOYMENT_TARGET': '10.7',
+    'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',
+  },
+}
diff --git a/test/binding.gyp b/test/binding.gyp
index ced1a6802..ba359c026 100644
--- a/test/binding.gyp
+++ b/test/binding.gyp
@@ -1,10 +1,6 @@
 {
-  'variables': {
-    'NAPI_VERSION%': "<!(node -p \"process.versions.napi\")",
-    'NODE_MAJOR_VERSION%': "<!(node -p \"process.versions.node.match(/\\d+/)[0]\")",
-    'disable_deprecated': "<!(node -p \"process.env['npm_config_disable_deprecated']\")"
-  },
   'target_defaults': {
+    'includes': ['../common.gypi'],
     'sources': [
         'arraybuffer.cc',
         'asynccontext.cc',
@@ -49,59 +45,19 @@
         'thunking_manual.cc',
       ],
       'conditions': [
-        ['NAPI_VERSION!=""', { 'defines': ['NAPI_VERSION=<@(NAPI_VERSION)'] } ],
-        ['disable_deprecated=="true"', {
-          'defines': ['NODE_ADDON_API_DISABLE_DEPRECATED']
-        }, {
+        ['disable_deprecated!="true"', {
           'sources': ['object/object_deprecated.cc']
-        }],
-        ['OS=="mac"', {
-          'cflags+': ['-fvisibility=hidden'],
-          'xcode_settings': {
-            'OTHER_CFLAGS': ['-fvisibility=hidden']
-          }
         }]
       ],
-      'defines': ['NODE_MAJOR_VERSION=<@(NODE_MAJOR_VERSION)'],
-      'include_dirs': ["<!@(node -p \"require('../').include\")"],
-      'dependencies': ["<!(node -p \"require('../').gyp\")"],
-      'cflags': [ '-Werror', '-Wall', '-Wextra', '-Wpedantic', '-Wunused-parameter' ],
-      'cflags_cc': [ '-Werror', '-Wall', '-Wextra', '-Wpedantic', '-Wunused-parameter' ]
   },
   'targets': [
     {
       'target_name': 'binding',
-      'defines': [ 'NAPI_CPP_EXCEPTIONS' ],
-      'cflags!': [ '-fno-exceptions' ],
-      'cflags_cc!': [ '-fno-exceptions' ],
-      'msvs_settings': {
-        'VCCLCompilerTool': {
-          'ExceptionHandling': 1,
-          'EnablePREfast': 'true',
-        },
-      },
-      'xcode_settings': {
-        'CLANG_CXX_LIBRARY': 'libc++',
-        'MACOSX_DEPLOYMENT_TARGET': '10.7',
-        'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
-      },
+      'includes': ['../except.gypi']
     },
     {
       'target_name': 'binding_noexcept',
-      'defines': [ 'NAPI_DISABLE_CPP_EXCEPTIONS' ],
-      'cflags': [ '-fno-exceptions' ],
-      'cflags_cc': [ '-fno-exceptions' ],
-      'msvs_settings': {
-        'VCCLCompilerTool': {
-          'ExceptionHandling': 0,
-          'EnablePREfast': 'true',
-        },
-      },
-      'xcode_settings': {
-        'CLANG_CXX_LIBRARY': 'libc++',
-        'MACOSX_DEPLOYMENT_TARGET': '10.7',
-        'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',
-      },
+      'includes': ['../noexcept.gypi']
     },
   ],
 }