Refactor compile_js.gypi to support script_args and closure_args

remoting/remoting_webapp_compile.gypi

Index: remoting/remoting_webapp_compile.gypi
diff --git a/remoting/remoting_webapp_compile.gypi b/remoting/remoting_webapp_compile.gypi
index f30195c061dd09c31c74154e59b785399dc2b63b..c5a803c796038d0739f0d7c44a1d95481109f1eb 100644
--- a/remoting/remoting_webapp_compile.gypi
+++ b/remoting/remoting_webapp_compile.gypi
@@ -9,74 +9,66 @@
     'success_stamp': '<(PRODUCT_DIR)/<(_target_name)_jscompile.stamp',
     'success_stamp_bt': '<(PRODUCT_DIR)/<(_target_name)_bt_jscompile.stamp',
     'success_stamp_ut': '<(PRODUCT_DIR)/<(_target_name)_ut_jscompile.stamp',
-    'compiler_flags': [
-      '--strict',
-      '--no-single-file',
-      '--externs',
-      '<(DEPTH)/third_party/closure_compiler/externs/chrome_extensions.js',
-    ],
   },
   'actions': [
     {
       'action_name': 'Verify remoting webapp',
+      'includes': ['compile_js.gypi'],
       'inputs': [
         'remoting_webapp_compile.gypi',
         'remoting_webapp_files.gypi',
-        '<@(remoting_webapp_crd_js_files)',
-        '<@(remoting_webapp_js_proto_files)',
-      ],
-      'outputs': [
-        '<(success_stamp)',
-      ],
-      'action': [
-        'python', '<(DEPTH)/third_party/closure_compiler/compile.py',
-        '<@(compiler_flags)',
-        '--success-stamp', '<(success_stamp)',
-        '<@(remoting_webapp_crd_js_files)',
-        '<@(remoting_webapp_js_proto_files)',
       ],
+      'variables': {
+        'source_files': [
+          '<@(remoting_webapp_crd_js_files)',
+          '<@(remoting_webapp_js_proto_files)',
+        ],
+        'out_file': '<(success_stamp)',
+        'script_args': [
+          '--success-stamp', '<(success_stamp)',

[Dan Beam, 2015/06/03 23:39:11]

i don't think we need --success-stamp now that we can change out_file?

[Theresa, 2015/06/04 17:44:05]

I think you're right. Should I kill it in compile.py as well?

[Dan Beam, 2015/06/04 18:35:45]

plz

[Theresa, 2015/06/04 19:21:30]

Done.

+        ],
+        'externs': ['<(DEPTH)/third_party/closure_compiler/externs/chrome_extensions.js'],
+      },
     },
     {
       'action_name': 'Verify remoting webapp with browsertests',
+      'includes': ['compile_js.gypi'],
       'inputs': [
         'remoting_webapp_compile.gypi',
         'remoting_webapp_files.gypi',
-        '<@(remoting_webapp_crd_js_files)',
-        '<@(remoting_webapp_browsertest_all_js_files)',
-        '<@(remoting_webapp_browsertest_js_proto_files)',
-      ],
-      'outputs': [
-        '<(success_stamp_bt)',
-      ],
-      'action': [
-        'python', '<(DEPTH)/third_party/closure_compiler/compile.py',
-        '<@(compiler_flags)',
-        '--success-stamp', '<(success_stamp_bt)',
-        '<@(remoting_webapp_crd_js_files)',
-        '<@(remoting_webapp_browsertest_all_js_files)',
-        '<@(remoting_webapp_browsertest_js_proto_files)',
       ],
+      'variables': {
+        'source_files': [
+          '<@(remoting_webapp_crd_js_files)',
+          '<@(remoting_webapp_browsertest_all_js_files)',
+          '<@(remoting_webapp_browsertest_js_proto_files)',
+        ],
+        'out_file': '<(success_stamp_bt)',
+        'script_args': [
+          '--success-stamp', '<(success_stamp_bt)',
+        ],
+        'externs': ['<(DEPTH)/third_party/closure_compiler/externs/chrome_extensions.js'],
+      },
     },
     {
       'action_name': 'Verify remoting webapp unittests',
+      'includes': ['compile_js.gypi'],
       'inputs': [
         'remoting_webapp_compile.gypi',
         'remoting_webapp_files.gypi',
-        '<@(remoting_webapp_crd_js_files)',
-        '<@(remoting_webapp_unittests_all_js_files)',
-        '<@(remoting_webapp_unittests_js_proto_files)',
-      ],
-      'outputs': [
-        '<(success_stamp_ut)',
-      ],
-      'action': [
-        'python', '<(DEPTH)/third_party/closure_compiler/compile.py',
-        '<@(compiler_flags)',
-        '--success-stamp', '<(success_stamp_ut)',
-        '<@(remoting_webapp_crd_js_files)',
-        '<@(remoting_webapp_unittests_all_js_files)',
-        '<@(remoting_webapp_unittests_js_proto_files)',
       ],
+      'variables': {
+        'source_files': [
+          '<@(remoting_webapp_crd_js_files)',
+          '<@(remoting_webapp_unittests_all_js_files)',
+          '<@(remoting_webapp_unittests_js_proto_files)',
+        ],
+        'out_file': '<(success_stamp_ut)',
+        'script_args': [
+          '--success-stamp', '<(success_stamp_ut)',
+        ],
+        'externs': ['<(DEPTH)/third_party/closure_compiler/externs/chrome_extensions.js'],
+      },
     },
   ],
   'includes': ['remoting_webapp_files.gypi'],