Merge branch 'main' into maint/main/PA-6886_add_digicert_for_solaris

CHANGELOG.md

@@ -9,6 +9,7 @@ This changelog adheres to [Keep a CHANGELOG](https://keepachangelog.com).
 
 ### Added
 - Add DigiCertGlobalRootG2 cert as part of Solaris default
+- (VANAGON-257) Enable windowsfips-2016 to use '-fips' candle and heat flags.
 
 ## [0.52.0] - 2024-06-03
 ### Added

lib/vanagon/platform/windows.rb

@@ -192,14 +192,14 @@ def generate_msi_package(project) # rubocop:disable Metrics/AbcSize
         #   -dr             - Root DirectoryRef to point all components to
         #   -var            - Replace "SourceDir" in the @source attributes of all components with a preprocessor variable
         app_heat_flags = " -dr INSTALLDIR -v -ke -indent 2 -cg AppComponentGroup -gg -srd -t wix/filter.xslt -sreg -var var.AppSourcePath "
-        app_heat_flags += " -fips" if project.platform.name =~ /windowsfips-2012r2/
+        app_heat_flags += " -fips" if project.platform.is_windows? && project.platform.is_fips?
 
         app_source_path = "SourceDir/#{project.settings[:base_dir]}/#{project.settings[:company_id]}/#{project.settings[:product_id]}"
         # Candle.exe preprocessor vars are required due to the above double run of heat.exe, both runs of heat use
         # preprocessor variables
         candle_preprocessor = "-dAppSourcePath=\"#{app_source_path}\" "
         candle_flags = "-arch #{@architecture} #{wix_extensions}"
-        candle_flags += " -fips" if project.platform.name =~ /windowsfips-2012r2/
+        candle_flags += " -fips" if project.platform.is_windows? && project.platform.is_fips?
 
         # Enable verbose mode for the moment (will be removed for production)
         # localisation flags to be added