Issue 1578 - Add notransforms installer for installations using Group Policy Object

installer/installer.gyp

 #
 # Expects command line definition for variable 'target_arch'
 #   Must be either 'ia32' or 'x64'
 #
 # This .gyp file sits in directory 'installer'.
 # When gyp translates files locations, base them here.
 #
 # The solution file from this .gyp source lands in 'installer/build/<(target_arch)'.
 # When gyp does not translate file locations, base them here.
 #
@@ skipping 38 matching lines @@
     # Note that locality sources (.wxl) are not present here because they're handled at link time.
     #
     'installer_source_top_file': 'src/msi/adblockplusie.wxs',
     'installer_source_files':
     [
       '<(installer_source_top_file)',
       'src/msi/bho_registry_value.wxi',    
       'src/msi/dll_class.wxi',
     ],
     'installer_object_file': '<(build_dir_arch)/adblockplusie.wixobj',
+    'installer_object_file_no_transforms': '<(build_dir_arch)/adblockplusie_notransforms.wixobj',
     
     #
     # WiX installer sources for the compiler, common to all architectures
     #
     'common_source_files': [ 'src/msi/custom_WixUI_InstallDir.wxs' ],
     'common_object_file': '<(build_dir_common)/common.wixobj',
     
     #
     # All the assets from the plug-in that are copied into the MSI file. 
     #
@@ skipping 14 matching lines @@
           # Note that the action in the rule uses later-phase substitution with ">", which occurs after the rule is merged with the target.
           # Apparently, though, it's also being evaluated earlier, before 'locale_id' is defined in the target.
           # Therefore, count this as a workaround for a gyp defect.
           #
           'locale_id%': '0',
 
           #
           # We do want a default 'msi_build_phase', because in all but the first MSI build we want the flag "additional"
           #
           'msi_build_phase%': 'additional',
+          'installer_object': '<(installer_object_file)',
+          'notransforms_name': ''
         },
     'rules': 
         [ {
           #
           # Rule to build a single-language MSI as part of a chain to create a multiple-language MSI
           # The rule runs a  .cmd file to execute the commands; this chose arises from gyp limitations and defects.
           #
           # gyp can only handle a single rule per extension.
           # Since we have only one ".wxl" file, we need to run all the operations (link MSI, diff to MST, embed MST into MSI) with a single action.
           # gyp does not have syntax for multi-line actions.
           # Including a newline as a token doesn't work because of the way gyp "fixes" path names; it treats the newline as a path, prefixes it, and quotes it all.
           #
           # Furthermore, there's the issue of overriding the rule for the first MSI, the one that generates the BASE against which transforms are generated.
           # In order to override the rule, we'd need to duplicate most of this one, particularly all the file name expressions, violating the write-once principle.
           #
           'rule_name': 'MSI Build',
           'extension': 'wxl',
       'message': 'Generating embedded transform for "<(RULE_INPUT_ROOT)"',
           'inputs': [ 'emb.vbs', '<(base_msi)', '<@(payloads)' ],
           'outputs': [ '<(build_dir_arch)/adblockplusie-<(RULE_INPUT_ROOT)-<(target_arch).msi', '<(build_dir_arch)/adblockplusie-<(RULE_INPUT_ROOT)-<(target_arch).mst' ],
       'action': 
           [
             '..\..\msibuild.cmd >(msi_build_phase) >(locale_id) >(RULE_INPUT_ROOT)', '<(RULE_INPUT_PATH)', 
-                '<(build_dir_arch)/adblockplusie-<(RULE_INPUT_ROOT)-<(target_arch).msi',
-                '<(build_dir_arch)/adblockplusie-<(RULE_INPUT_ROOT)-<(target_arch).mst',
+                '<(build_dir_arch)/adblockplusie-<(RULE_INPUT_ROOT)>(notransforms_name)-<(target_arch).msi',
+                '<(build_dir_arch)/adblockplusie-<(RULE_INPUT_ROOT)>(notransforms_name)-<(target_arch).mst',
                 '<(build_dir_arch)/adblockplusie-BASE-<(target_arch).msi',
                 '<(build_dir_arch)/adblockplusie-INTERIM-<(target_arch).msi',
-                '<(installer_object_file)', '<(common_object_file)',
+                '>(installer_object)', '<(common_object_file)',

[Eric, 2014/12/12 15:39:32]

I noticed we've got tabs here. They could be removed.

           ]
         } ],
   },
 
   'targets': 
   [
   #############
   # Compile common WiX source.
   #     All the WiX-linked sources that depend neither on architecture nor configuration.
   #     Principally for user interface.
@@ skipping 37 matching lines @@
       'outputs':
       [
         # List must contain only a single element so that "-out" argument works correctly.
         '<(installer_object_file)'
       ],
       'action':
         [ 'candle -nologo -arch <(candle_arch) -dNoDefault -dVersion=<(version) -dConfiguration=Release', '-out', '<@(_outputs)', '<(installer_source_top_file)' ]
     } ]
   },
 
+  #############
+  # Compile installer WiX source with no transforms.
+  #     Platform-specific.
+  #############
+  {
+    'target_name': 'No transforms Installer, architecture-specific WiX',
+    'type': 'none',
+    'actions':
+    [ {
+      'action_name': 'Compile WiX installer',
+      'message': 'Compiling installer WiX sources',
+      'inputs':
+      [
+        '<@(installer_source_files)'
+      ],
+      'outputs':
+      [
+        # List must contain only a single element so that "-out" argument works correctly.
+        '<(installer_object_file_no_transforms)'
+      ],
+      'action':
+        [ 'candle -nologo -arch <(candle_arch) -dNoDefault -dVersion=<(version) -dConfiguration=Release -dNoTransforms', '-out', '<@(_outputs)', '<(installer_source_top_file)' ]
+    } ]   
+  },
+
+
+
   ##################################
   # MSI targets
   # 
   # Building a multiple-language MSI requires embedding a transform for each language into a single MSI database.
   # Each step requires a locale identifier (Microsoft LCID) as a parameter and a WiX localization file (.wxl) as a source.
   # gyp does not support per-source-file parameters, so we're stuck with one project per step.
   # The naming convention for projects:
   # - The token "MSI". Projects appear in dictionary order in the resulting solution file. A common initial token groups them.
   # - The language tag. These are mostly just the two-letter language codes. There are a few sublanguage tags, though.
   # - The LCID of the language in four digit hexadecimal form, zero-padded if necessary.
@@ skipping 43 matching lines @@
   # The issue is that much of the interior of the installer is opaque, and it's not possible to know if any ANSI calls remain enabled.
   # The WiX user interface code (generally) uses wide characters, but it calls some default error notifications that may not behave correctly.
   #
   # Another warning, the .wxl files are all XML files, whose declared encoding is "utf-8".
   # This encoding may need to be changed for certain files to ensure that character input is correct.
   #
   # Reference: MSDN "Code Page Identifiers" http://msdn.microsoft.com/en-us/library/dd317756%28VS.85%29.aspx
   #
   ##################################
   #############
+  # Link WiX objects and payloads, creating the full MSI.
+  #     Platform-specific. No transforms.
+  #     Generates the MSI with just english language and no embedded transforms.
+  #############
+  {
+    'target_name': 'MSI @ en 9 (English) [NO_TRANSFORMS]',
+    'type': 'none',
+    'dependencies' : 
+    [
+      'No transforms Installer, architecture-specific WiX',
+      'Installer, common WiX',
+      'installer-ca'
+    ],
+  'variables': {
+    'msi_build_phase': 'notransforms',
+    'locale_id': '9',
+    'installer_object': '<(installer_object_file_no_transforms)',
+    'notransforms_name': '-notransforms'
+  },
+  'sources': [ 'src/msi/locale/en.wxl' ]
+  },
+
+  ##################################
+  #############
   # Link WiX objects and payloads, creating base MSI.
   #     Platform-specific.
   #     Generates the reference MSI upon which all transforms are based.
   #############
   {
     'target_name': 'MSI @ en 9 (English) [BASE]',
     'type': 'none',
     'dependencies' : 
     [
       'Installer, architecture-specific WiX',
       'Installer, common WiX',
       'installer-ca'
     ],
         'variables': {
-          # Only define 'msi_build_phase' once as 'initial', here in the BASE target. All others use the default value.
+    # Only define 'msi_build_phase' once as 'initial', here in the BASE target. All others use the default value. 
+    # (Except the build which doesn't embed any transforms. That one uses notransforms)

[Eric, 2014/12/12 15:39:32]

I'd indent these comments to match the declarations immediately below.

           'msi_build_phase': 'initial',
           'locale_id': '9',
         },
         'sources': [ 'src/msi/locale/en.wxl' ],
   },
 
   #############
   # MSI ar 1 (Arabic - Saudi Arabia)
   #############
   {
@@ skipping 574 matching lines @@
         'SubSystem': '1',   # Console
       },
     },
   },
 
   ]
 }