Move remoting dark/candle/light steps to external script

remoting/remoting.gyp

Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index c93e3fcf6061a7dc10576d6a050f875bc180e1cb..20fb8786e5399a3df91ba39e6b01e5933cbc3f9f 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -678,7 +678,7 @@
           ],
           'rules': [
             {
-              'rule_name': 'candle',
+              'rule_name': 'candle_and_light',
               'extension': 'wxs',
               'inputs': [
                 '<(PRODUCT_DIR)/remoting_host_controller.exe',
@@ -686,58 +686,24 @@
                 '<(PRODUCT_DIR)/remoting_service.exe',
                 '<(platformsdk_path)/redist/x86/sas.dll',
                 'resources/chromoting.ico',
-              ],
-              'outputs': [
-                '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).wixobj',
-              ],
-              'process_outputs_as_sources': 1,
-              'msvs_cygwin_shell': 0,
-              'action': [
-                '<(wix_path)\\candle',
-                '-ext', '<(wix_path)\\WixFirewallExtension.dll',
-                '-ext', '<(wix_path)\\WixUIExtension.dll',
-                '-ext', '<(wix_path)\\WixUtilExtension.dll',
-                '-dVersion=<(version_full)',
-                '-dFileSource=<(PRODUCT_DIR).',
-                '-dIconPath=resources/chromoting.ico',
-                '-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll',
-                '<@(_wix_defines)',
-                '-out', '<@(_outputs)',
-                '<(RULE_INPUT_PATH)',
-              ],
-              'message': 'Generating <@(_outputs)',
-            },
-            {
-              'rule_name': 'light',
-              'extension': 'wixobj',
-              'inputs': [
-                '<(PRODUCT_DIR)/remoting_host_controller.exe',
-                '<(PRODUCT_DIR)/remoting_me2me_host.exe',
-                '<(PRODUCT_DIR)/remoting_service.exe',
-                '<(platformsdk_path)/redist/x86/sas.dll',
-                'resources/chromoting.ico',
+                'candle_and_light.py',
               ],
               'outputs': [
                 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi',
-                '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).wixpdb',
               ],
               'msvs_cygwin_shell': 0,
               'action': [
-                '<(wix_path)\\light',
-                '-ext', '<(wix_path)\\WixFirewallExtension.dll',
-                '-ext', '<(wix_path)\\WixUIExtension.dll',
-                '-ext', '<(wix_path)\\WixUtilExtension.dll',
-                '-cultures:en-us',
-                '-sw1076',
-                '-dVersion=<(version_full)',
-                '-dFileSource=<(PRODUCT_DIR).',
-                '-dIconPath=resources/chromoting.ico',
-                '-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll',
+                'python', 'candle_and_light.py',
+                '--wix_path', '<(wix_path)',
+                '--version', '<(version_full)',
+                '--product_dir', '<(PRODUCT_DIR).',
+                '--intermediate_dir', '<(INTERMEDIATE_DIR).',
+                '--platformsdk_path', '<(platformsdk_path)',
+                '--input', '<(RULE_INPUT_PATH)',
+                '--output', '<@(_outputs)',
                 '<@(_wix_defines)',
-                '-out', '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi',
-                '<(RULE_INPUT_PATH)',
               ],
-              'message': 'Generating <(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi',
+              'message': 'Generating <@(_outputs)',
             },
           ],
         },  # end of target 'remoting_host_installation'
@@ -765,52 +731,24 @@
           ],
           'rules': [
             {
-              'rule_name': 'dark',
+              'rule_name': 'dark_and_candle_and_light',
               'extension': 'msi',
-              'outputs': [
-                '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).wxs',
-              ],
-              'process_outputs_as_sources': 1,
-              'msvs_cygwin_shell': 0,
-              'action': [
-                '<(wix_path)\\dark',
-                '<(RULE_INPUT_PATH)',
-                '-o', '<@(_outputs)',
-                '-x', '<(INTERMEDIATE_DIR).',
-              ],
-              'message': 'Dark: unpacking <(RULE_INPUT_PATH)',
-            },
-            {
-              'rule_name': 'candle',
-              'extension': 'wxs',
-              'outputs': [
-                '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).wixobj',
-              ],
-              'process_outputs_as_sources': 1,
-              'msvs_cygwin_shell': 0,
-              'action': [
-                '<(wix_path)\\candle',
-                '<(RULE_INPUT_PATH)',
-                '-o', '<@(_outputs)',
-                '-ext', '<(wix_path)\\WixFirewallExtension.dll',
+              'inputs': [
+                'dark_and_candle_and_light.py',
               ],
-              'message': 'Candle: compiling <(RULE_INPUT_PATH)',
-            },
-            {
-              'rule_name': 'light',
-              'extension': 'wixobj',
               'outputs': [
-                '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT)-test.msi',
+                '<(INTERMEDIATE_DIR)/chromoting-test.msi',
               ],
               'msvs_cygwin_shell': 0,
               'action': [
-                '<(wix_path)\\light',
-                '<(RULE_INPUT_PATH)',
-                '-o', '<@(_outputs)',
-                '-ext', '<(wix_path)\\WixFirewallExtension.dll',
-                '-sw1076',
+                'python',
+                'dark_and_candle_and_light.py',
+                '--wix_path', '<(wix_path)',
+                '--input', '<(RULE_INPUT_PATH)',
+                '--intermediate_dir', '<(INTERMEDIATE_DIR).',
+                '--output', '<@(_outputs)',
               ],
-              'message': 'Light: linking <(RULE_INPUT_PATH)',
+              'message': 'Unpacking and repacking to <@(_outputs)',
             },
           ],
         },  # end of target 'remoting_host_installation_unittest'