Remove platform-specific commands

No longer need the platform-specific commands. ISSUE=#193
lunchclass · Nov 19, 2017 · 5894246 · 5894246
1 parent 7fcb1a4
commit 5894246
Showing 1 changed file with 19 additions and 63 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -31,30 +31,12 @@
       'target_name': 'bacardi',
       'dependencies': [
         'idl',
+        '<!@(<(bacardi_command) node -p \'require("node-addon-api").gyp\')',
       ],
-      'conditions': [
-        ['OS!="win"',
-        {
-          'dependencies': [
-            '<!@(./bootstrap/command/node -p \'require("node-addon-api").gyp\')',
-          ],
-          'include_dirs': [
-            './',
-            '<@(SHARED_INTERMEDIATE_DIR)',
-            '<!@(./bootstrap/command/node -p \'require("node-addon-api").include\')',
-          ],
-        }],
-        ['OS=="win"',
-        {
-          'dependencies': [
-            '<!(third_party\\node\\node.exe -p "require(\'node-addon-api\').gyp")',
-          ],
-          'include_dirs': [
-            './',
-            '<@(SHARED_INTERMEDIATE_DIR)',
-            '<!@(third_party\\node\\node.exe -p "require(\'node-addon-api\').include")',
-          ],
-        }],
+      'include_dirs': [
+        './',
+        '<@(SHARED_INTERMEDIATE_DIR)',
+        '<!@(<(bacardi_command) node -p \'require("node-addon-api").include\')',
       ],
       'sources': [
         '<!@(<(bacardi_command) list_cpp_files --silent)',
@@ -76,29 +58,17 @@
           'outputs': [
             '<@(PRODUCT_DIR)/generator',
           ],
-          'conditions': [
-            ['OS!="win"',
-            {
-              'action': [
-                '<@(PRODUCT_DIR)/../../bootstrap/command/tsc',
-                '<@(_inputs)',
-                '--outDir',
-                '<@(_outputs)',
-                ],
-            }],
-            ['OS=="win"',
-            {
-              'action': [
-                '<@(PRODUCT_DIR)/../../third_party/node/node.exe <@(PRODUCT_DIR)/../../node_modules/typescript/bin/tsc --lib es2015',
-                '<@(_inputs)',
-                '--outDir',
-                '<@(_outputs)',
-                ],
-            }],
+          'action': [
+            '<(bacardi_command)',
+            'tsc',
+            '<@(_inputs)',
+            '--outDir',
+            '<@(_outputs)',
           ],
         },
       ],
     },
+
     {
       'target_name': 'idl',
       'type': 'none',
@@ -114,27 +84,13 @@
           'outputs': [
             '<!@(<(bacardi_command) list_generated_cpp_files --silent)',
           ],
-          'conditions': [
-            ['OS!="win"',
-            {
-              'action': [
-                '<@(PRODUCT_DIR)/../../bootstrap/command/node',
-                '<@(PRODUCT_DIR)/generator/main.js',
-                '<(module_root_dir)',
-                '<@(SHARED_INTERMEDIATE_DIR)',
-                '<@(_inputs)',
-              ],
-            }],
-            ['OS=="win"',
-            {
-              'action': [
-                '<@(PRODUCT_DIR)/../../third_party/node/node.exe',
-                '<@(PRODUCT_DIR)/generator/main.js',
-                '<(module_root_dir)',
-                '<@(SHARED_INTERMEDIATE_DIR)',
-                '<@(_inputs)',
-              ],
-            }],
+          'action': [
+            '<(bacardi_command)',
+            'node',
+            '<@(PRODUCT_DIR)/generator/main.js',
+            '<(module_root_dir)',
+            '<@(SHARED_INTERMEDIATE_DIR)',
+            '<@(_inputs)',
           ],
         },
       ],