Move remoting dark/candle/light steps to external script

remoting/remoting.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
     # Use consistent strings across all platforms. Note that the plugin name
@@ skipping 668 matching lines @@
           'rules': [
             {
               'rule_name': 'candle',
               'extension': 'wxs',
               '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': [
-                '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).wixobj',
+                '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi',
               ],
-              '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)',
+                'python', 'candle_and_light.py',
+                '--wix_path', '<(wix_path)',
+                '--version', '<(version_full)',
+                '--product_dir', '<(PRODUCT_DIR)',
+                '--intermediate_root', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT)',

[alexeypa (please no reviews), 2012/05/21 16:24:51]

I think it is better to pass '--intermediate_dir', '<(INTERMEDIATE_DIR)'. The
name of .wixobj is not very important so the script can extract it from |input|.
The only important thing is that .wixobj will be in intermediate directory.

[scottmg, 2012/05/21 17:00:38]

Done.

+                '--platformsdk_path', '<(platformsdk_path)',
+                '--defines', '<(_wix_defines)',

[alexeypa (please no reviews), 2012/05/21 16:24:51]

Does this work if there is no defines or more than one defines?

[scottmg, 2012/05/21 17:00:38]

Yes, when a list is inserted into a string context, it's converted with quoted
spaces, and then the whole thing is quoted (with escapes if necessary).

wix_defines: ['a', 'b'] --> "\"a\" \"b\""
wix_defines: [] --> ""

+                '--input', '<(RULE_INPUT_PATH)',
+                '--output', '<@(_outputs)',
               ],
               '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',
-              ],
-              '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',
-                '<@(_wix_defines)',
-                '-out', '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi',
-                '<(RULE_INPUT_PATH)',
-              ],
-              'message': 'Generating <(PRODUCT_DIR)/<(RULE_INPUT_ROOT).msi',
-            },
           ],
         },  # end of target 'remoting_host_installation'
 
         # The 'remoting_host_installation_unittest' target is used to make sure
         # that the code signing job (running outside of Chromium tree) will be
         # able to unpack and re-assemble the installation successfully.
         #
         # *** If this target fails to compile the code signing job will fail
         # too, breaking the official build. ***
         #
         # N.B. The command lines passed to the WiX tools here should be in sync
         # with the code signing script.
         {
           'target_name': 'remoting_host_installation_unittest',
           'type': 'none',
           'dependencies': [
             'remoting_host_installation',
           ],
           'sources': [
             '<(PRODUCT_DIR)/chromoting.msi',
           ],
           'outputs': [
             '<(INTERMEDIATE_DIR)/chromoting-test.msi',
           ],
           'rules': [
             {
-              'rule_name': 'dark',
+              'rule_name': 'dark_and_candle_and_light',
               'extension': 'msi',
+              'inputs': [
+                'dark_and_candle_and_light.py',
+              ],
               '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',
-              ],
-              '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_root', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT)',
+                '--intermediate_dir', '<(INTERMEDIATE_DIR)',

[alexeypa (please no reviews), 2012/05/21 16:24:51]

It is confusing that |intermediate_dir| is a parent of |intermediate_root|.

I think it is better to let the script to reconstruct the files and directory
names from |output|. This will add "-test" to the names of .wxs and .wixobj. It
will not affect anything.

N.B. the current meaning of |intermediate_dir| - the directory where .wxs (and
other files) are unpacked. 

[scottmg, 2012/05/21 17:00:38]

Agreed, they should have had better names at least.
I wasn't sure if you meant you wanted the intermediate_dir passed at all, but it
seemed better to keep it the same as the other script. So, it passes the
intermediate_dir, and builds the full name from intermediate_dir and output.

+                '--output', '<@(_outputs)',
               ],
-              'message': 'Light: linking <(RULE_INPUT_PATH)',
+              'message': 'Unpacking and repacking to <@(_outputs)',
             },
           ],
         },  # end of target 'remoting_host_installation_unittest'
       ],  # end of 'targets'
     }],  # '<(wix_path) != ""'
 
   ],  # end of 'conditions'
 
   'targets': [
     {
@@ skipping 945 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }