Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(VANAGON-257) Enable windowsfips-2016 to use '-fips' candle and heat … #860

Merged
merged 1 commit into from
Aug 28, 2024
Merged

(VANAGON-257) Enable windowsfips-2016 to use '-fips' candle and heat … #860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 4 additions & 43 deletions .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,6 @@ AllCops:
- examples/**/*
- lib/vanagon/platform/defaults/*

Capybara/MatchStyle:
Enabled: true

Capybara/NegationMatcher:
Enabled: true

Capybara/SpecificActions:
Enabled: true

Capybara/SpecificFinders:
Enabled: true

Capybara/SpecificMatcher:
Enabled: true

Gemspec/DeprecatedAttributeAssignment:
Enabled: true

Expand Down Expand Up @@ -395,15 +380,6 @@ RSpec/DuplicatedMetadata:
RSpec/ExcessiveDocstringSpacing:
Enabled: true

RSpec/FactoryBot/ConsistentParenthesesStyle:
Enabled: true

RSpec/FactoryBot/FactoryNameStyle:
Enabled: true

RSpec/FactoryBot/SyntaxMethods:
Enabled: true

RSpec/IdenticalEqualityAssertion:
Enabled: true

Expand All @@ -416,21 +392,6 @@ RSpec/NoExpectationExample:
RSpec/PendingWithoutReason:
Enabled: true

RSpec/Rails/AvoidSetupHook:
Enabled: true

RSpec/Rails/HaveHttpStatus:
Enabled: true

RSpec/Rails/InferredSpecType:
Enabled: true

RSpec/Rails/MinitestAssertions:
Enabled: true

RSpec/Rails/TravelAround:
Enabled: true

RSpec/RedundantAround:
Enabled: true

Expand All @@ -446,16 +407,16 @@ RSpec/SubjectDeclaration:
RSpec/VerifiedDoubleReference:
Enabled: true

Rspec/BeforeAfterAll:
RSpec/BeforeAfterAll:
Enabled: false

Rspec/ExampleLength:
RSpec/ExampleLength:
Enabled: false

Rspec/HookArgument:
RSpec/HookArgument:
Enabled: false

Rspec/MultipleMemoizedHelpers:
RSpec/MultipleMemoizedHelpers:
Enabled: false

Security/CompoundHash:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Put this under an '### Added' section


## [0.52.0] - 2024-06-03
### Added
Expand Down
4 changes: 2 additions & 2 deletions lib/vanagon/platform/windows.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading