Updated installer with custom action

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 653 matching lines @@
     'dependencies' : [ 'MSI zh-CN 2052 (Chinese - China)' ],
         'variables': { 'locale_id': '1028' },
         'sources': [ 'src/msi/locale/zh-TW.wxl' ],
   },
 
   ##################################
   # END of MSI section
   ##################################
 
   #############
-  # Custom Action library for the installer
+  # Custom Action DLL for the installer
   #############
   {
     'target_name': 'installer-ca',
     'type': 'shared_library',
+        'dependencies':  [ 'installer-library' ],
     'sources': 
     [
-      #
-      # Custom Action
-      #
       'src/custom-action/abp_ca.cpp',
       'src/custom-action/abp_ca.def',
       'src/custom-action/abp_ca.rc',
       'src/custom-action/close_application.cpp',
-      #
-      # Windows Installer library 
-      #
-      'src/installer-lib/database.cpp', 
-      'src/installer-lib/database.h',
-      'src/installer-lib/DLL.cpp', 
-      'src/installer-lib/DLL.h', 
-      'src/installer-lib/interaction.cpp', 
-      'src/installer-lib/interaction.h',
-      'src/installer-lib/property.cpp', 
-      'src/installer-lib/property.h',
-      'src/installer-lib/record.cpp', 
-      'src/installer-lib/record.h',
-      'src/installer-lib/session.cpp', 
-      'src/installer-lib/session.h',
+      'src/custom-action/close_ie.wxi',
     ],
     'include_dirs': 
     [
       'src/installer-lib',
     ],
     'link_settings': 
     {
       'libraries': [ 'user32.lib', 'Shell32.lib', 'advapi32.lib', 'msi.lib', 'Version.lib' ]        
     },
     'msvs_settings': 
     {
       'VCLinkerTool': {}
     }
   },
 
   #############
   # Windows Installer library
   #############
   {
-    'target_name': 'installer-ca-lib',
+    'target_name': 'installer-library',
     'type': 'static_library',
     'sources': 
     [
+          'src/installer-lib/custom-i18n.h',
+          'src/installer-lib/custom-i18n.wxi',
       'src/installer-lib/database.cpp', 
       'src/installer-lib/database.h',
       'src/installer-lib/DLL.cpp', 
       'src/installer-lib/DLL.h', 
+      'src/installer-lib/handle.h', 
       'src/installer-lib/interaction.cpp', 
       'src/installer-lib/interaction.h',
       'src/installer-lib/process.cpp', 
       'src/installer-lib/process.h',
       'src/installer-lib/property.cpp', 
       'src/installer-lib/property.h',
       'src/installer-lib/record.cpp', 
       'src/installer-lib/record.h',
       'src/installer-lib/session.cpp', 
       'src/installer-lib/session.h',

[Oleksandr, 2014/03/12 19:26:04]

We don't usually include .h files in GYP, I believe

[Eric, 2014/03/17 12:26:46]

They're not necessary for the build, true. But also they don't interfere with
it.

I put them there so I could locate them faster when working inside Visual
Studio.

     ],
     'include_dirs': 
     [
       'src/installer-lib',
     ],
+        'direct_dependent_settings':
+        {
+          'include_dirs': 
+          [
+            'src/installer-lib',
+          ],
+        },
     'link_settings': 
     {
       'libraries': [ 'user32.lib', 'Shell32.lib', 'advapi32.lib', 'msi.lib', 'Version.lib' ]        
     },
     'msvs_settings': 
     {
       'VCLinkerTool': {}
     }
   },
   
+  #############
+  # Custom actions for library test MSI
+  #############
+  {
+    'target_name': 'installer-library-test-customactions',
+    'type': 'shared_library',
+    'dependencies':
+        [
+          'installer-library',
+    ],
+        'sources': 
+        [
+          'src/installer-lib/test/test-installer-lib-ca.cpp',
+      'src/installer-lib/test/test-installer-lib-ca.def',
+      'src/installer-lib/test/test-installer-lib-ca.rc',
+      'src/installer-lib/test/test-installer-lib-sandbox.cpp',
+      'src/installer-lib/test/custom-action-fail.cpp',
+          'src/custom-action/close_application.cpp',    
+        ],
+  },
+
+  #############
+  # WiX compile for library test MSI
+  #############
+  {
+    'target_name': 'installer-library-test-wix',
+    'type': 'none',
+        'sources': 
+        [
+          'src/installer-lib/test/test-installer-lib.wxs',
+          'src/installer-lib/custom-i18n.wxi',
+    ],
+    'actions': 
+    [ {
+      'action_name': 'WiX compile',
+      'message': 'Compiling WiX source',
+      'inputs': 
+      [
+        'src/installer-lib/test/test-installer-lib.wxs'
+      ],
+      'outputs':
+      [
+        '<(build_dir_arch)/test-installer-lib.wixobj'
+      ],
+      'action':
+        [ 'candle -nologo -dNoDefault ', '-out', '<@(_outputs)', '<@(_inputs)' ]
+    } ]
+  },
+
+  #############
+  # WiX link for library test MSI
+  #############
+  {
+    'target_name': 'installer-library-test-msi',
+    'type': 'none',
+    'dependencies':
+        [
+      'installer-library-test-customactions',
+      'installer-library-test-wix',
+    ],
+        'sources': 
+        [
+          '<(build_dir_arch)/test-installer-lib.wixobj',
+        ],
+        'actions':
+        [ {
+          'action_name': 'WiX link',
+          'message': 'Linking WiX objects',
+          'linked_inputs':
+          [
+        '<(build_dir_arch)/test-installer-lib.wixobj',
+          ],
+          'localization_input':
+          [
+                'src/custom-action/close_ie_default.wxl',                       # Keep the .WXL file out of 'sources', since otherwise the custom rule will kick in
+          ],
+          'inputs': 
+          [
+                '<@(_linked_inputs)',
+
+                # Keep the .WXL file out of here, since otherwise the custom rule will kick in
+                # This isn't the best solution, since it means manual recompilation it this file changes, 
+                #   but it's easier to do this than to deal with how to change the default rule for '.wxl' that all the MSI targets use.
+                #'<@(_localization_input)',
+
+                'src/custom-action/close_ie.wxi',
+                '<(build_dir_arch)/Debug/installer-library-test-customactions.dll'
+          ],
+          'outputs': 
+          [
+            '<(build_dir_arch)/test-installer-lib.msi'
+          ],
+          'action':
+            # ICE71: The Media table has no entries
+                # Suppress ICE71 because the test MSI does not install any files.
+            [
+                        'light -notidy -nologo -ext WixUIExtension -sice:ICE71',
+                        '<@(_linked_inputs)',
+                        '-out', '<(build_dir_arch)/test-installer-lib.msi',
+                        '-loc', '<@(_localization_input)'
+                ]
+        } ]
+  },
+
+  #############
+  # Custom Action unit tests
+  #############
   {
     'target_name': 'installer-ca-tests',
     'type': 'executable',
-    'dependencies': [
-          'installer-ca-lib',
+    'dependencies':
+        [
+          'installer-library',
+          'installer-library-test-msi',                 # Some unit tests open the test MSI database
       'googletest.gyp:googletest_main',
     ],
-        'sources': [
+        'sources':
+        [
+          'src/installer-lib/test/database_test.cpp',
           'src/installer-lib/test/process_test.cpp',
+          'src/installer-lib/test/property_test.cpp',
           'src/installer-lib/test/record_test.cpp',
     ],
-    'link_settings': {
+    'link_settings':
+        {
       'libraries': [],
     },
-    'msvs_settings': {
-      'VCLinkerTool': {
+    'msvs_settings':
+        {
+      'VCLinkerTool':
+          {
         'SubSystem': '1',   # Console
       },
     },
-  }
+  },
+
   ]
 }
+
+
+