From a2c4f104a800ccbc5fe669d505062f94a61eafc5 Mon Sep 17 00:00:00 2001 From: Shubham Shinde Date: Fri, 23 Aug 2024 11:58:16 +0530 Subject: [PATCH] (VANAGON-257) Enable windowsfips-2016 to use '-fips' candle and heat flags --- CHANGELOG.md | 1 + lib/vanagon/platform/windows.rb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cfeafe5..ea12a413 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](https://semver.org). This changelog adheres to [Keep a CHANGELOG](https://keepachangelog.com). ## [Unreleased] +- (VANAGON-257) Enable windowsfips-2016 to use '-fips' candle and heat flags. ## [0.52.0] - 2024-06-03 ### Added diff --git a/lib/vanagon/platform/windows.rb b/lib/vanagon/platform/windows.rb index 66699c94..ae297784 100644 --- a/lib/vanagon/platform/windows.rb +++ b/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.name =~ /windowsfips-(2012r2|2016)/ 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.name =~ /windowsfips-(2012r2|2016)/ # Enable verbose mode for the moment (will be removed for production) # localisation flags to be added