Remove platform-specific commands

No longer need the platform-specific commands. ISSUE=#193
lunchclass · Nov 22, 2017 · 47d3e28 · 47d3e28
1 parent 57bd300
commit 47d3e28
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 101 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -13,10 +13,6 @@
 # limitations under the License.
 
 {
-  'includes': [
-    'generator/generator.gypi',
-  ],
-
   'variables': {
     'bacardi_command%': './bacardi',
     'conditions': [
@@ -31,30 +27,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)',
@@ -71,34 +49,20 @@
         {
           'action_name': 'tsc',
           'inputs': [
-            '<@(generator_files)',
           ],
           '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': [
+            '<(module_root_dir)/<(bacardi_command)',
+            'tsc',
+            '--outDir',
+            '<@(_outputs)',
           ],
         },
       ],
     },
+
     {
       'target_name': 'idl',
       'type': 'none',
@@ -114,27 +78,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': [
+            '<(module_root_dir)/<(bacardi_command)',
+            'node',
+            '<@(PRODUCT_DIR)/generator/main.js',
+            '<(module_root_dir)',
+            '<@(SHARED_INTERMEDIATE_DIR)',
+            '<@(_inputs)',
           ],
         },
       ],

diff --git a/bootstrap/bacardi.sh b/bootstrap/bacardi.sh
@@ -40,8 +40,9 @@ if [ ! -f .last_update ] || [ package.json -nt .last_update ]; then
   npm install
 fi
 
+sub_command=$(basename $(echo $1 | sed 's/\\/\//g'))
 for command in $(ls $(bootstrap_command_path)); do
-  if [ "$1" = "$command" ]; then
+  if [ "$sub_command" = "$command" ]; then
     shift
     $(bootstrap_command_path)/$command $@
     exit

diff --git a/bootstrap/command/tsc b/bootstrap/command/tsc
@@ -14,4 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-tsc --lib es2015 $@
+. $BACARDI_PATH/bootstrap/common/path_info.sh
+. $BACARDI_PATH/bootstrap/common/platform_info.sh
+
+if is_windows_platform; then
+  $(bacardi_path)/node_modules/.bin/tsc.cmd
+else
+  $(bacardi_path)/node_modules/.bin/tsc
+fi
diff --git a/generator/generator.gypi b/generator/generator.gypi
diff --git a/tsconfig.json b/tsconfig.json
@@ -3,10 +3,12 @@
   "compilerOptions": {
     "baseUrl": ".",
     "experimentalDecorators": true,
-    "noImplicitAny": true,
-    "noImplicitReturns": true,
+    "lib": ["es2015"],
     "preserveConstEnums": true,
     "sourceMap": true,
     "target": "es5"
-  }
+  },
+  "include": [
+    "generator/**/*"
+  ]
 }