vanagon 0.15.25 → 0.15.26

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. checksums.yaml +5 -5
  2. data/lib/vanagon/platform/windows.rb +4 -0
  3. metadata +28 -29
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: e439c40238f1b9c246f4643ff159f37f55437420
4
- data.tar.gz: 7b36f0ba073896d0b59955e81b5e36b01e9f8de8
2
+ SHA256:
3
+ metadata.gz: da54e2506100731be1e77d1284b546ae3094c125555c62811591a35538d0ef31
4
+ data.tar.gz: 59139b08f55d3c1b92f6db31adc26240fc40103291742b43e2a9ebac05ad9d50
5
5
  SHA512:
6
- metadata.gz: 0a7dab94875f2434215cdd7dba115d89d73aaab095c1bb8684adcbe2dbf985e7b7f1fcdcdb6c6cdb5145f705182804e9aebfb40202294fdad118b5ca82062043
7
- data.tar.gz: b4878076d2e16f5c17cfef267665ecdf5b91232e4604dc5289a9e930f80d669d3a8040b427b2ee672461e060af65c11e67fd6a1ed652c2d8e3bbd8414869fe9f
6
+ metadata.gz: 18409a44dae4f83cdf7496d8aa83fc99700d639f7c5318355a95d10aa940dff282511ebe93978d7d1a281c98f5150499778f656a041884565a91604694771391
7
+ data.tar.gz: c9bc509ae1eda7f689b462bdee480f3868a820988959acd7022377f5118233db019e450d4e31d5888a38ead96b0a54a7c88ee37935e29b5d6cfc4d674ac54572
@@ -190,11 +190,15 @@ class Vanagon
190
190
  # -dr - Root DirectoryRef to point all components to
191
191
  # -var - Replace "SourceDir" in the @source attributes of all components with a preprocessor variable
192
192
  app_heat_flags = " -dr INSTALLDIR -v -ke -indent 2 -cg AppComponentGroup -gg -srd -t wix/filter.xslt -sreg -var var.AppSourcePath "
193
+ app_heat_flags += " -fips" if project.platform.name =~ /windowsfips-2012r2/
194
+
193
195
  app_source_path = "SourceDir/#{project.settings[:base_dir]}/#{project.settings[:company_id]}/#{project.settings[:product_id]}"
194
196
  # Candle.exe preprocessor vars are required due to the above double run of heat.exe, both runs of heat use
195
197
  # preprocessor variables
196
198
  candle_preprocessor = "-dAppSourcePath=\"#{app_source_path}\" "
197
199
  candle_flags = "-arch #{@architecture} #{wix_extensions}"
200
+ candle_flags += " -fips" if project.platform.name =~ /windowsfips-2012r2/
201
+
198
202
  # Enable verbose mode for the moment (will be removed for production)
199
203
  # localisation flags to be added
200
204
  light_flags = "-v -cultures:en-us #{wix_extensions}"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vanagon
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.15.25
4
+ version: 0.15.26
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppet Labs
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-07-24 00:00:00.000000000 Z
11
+ date: 2019-09-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: git
@@ -260,47 +260,46 @@ required_rubygems_version: !ruby/object:Gem::Requirement
260
260
  - !ruby/object:Gem::Version
261
261
  version: '0'
262
262
  requirements: []
263
- rubyforge_project:
264
- rubygems_version: 2.6.9
263
+ rubygems_version: 3.0.3
265
264
  signing_key:
266
265
  specification_version: 3
267
266
  summary: All of your packages will fit into this van with this one simple trick.
268
267
  test_files:
269
- - spec/lib/vanagon/component_spec.rb
270
- - spec/lib/vanagon/project_spec.rb
271
- - spec/lib/vanagon/optparse_spec.rb
272
- - spec/lib/vanagon/driver_spec.rb
268
+ - spec/lib/makefile_spec.rb
269
+ - spec/lib/git/rev_list_spec.rb
273
270
  - spec/lib/vanagon/environment_spec.rb
271
+ - spec/lib/vanagon/common/pathname_spec.rb
272
+ - spec/lib/vanagon/common/user_spec.rb
273
+ - spec/lib/vanagon/platform/deb_spec.rb
274
274
  - spec/lib/vanagon/platform/windows_spec.rb
275
+ - spec/lib/vanagon/platform/rpm/aix_spec.rb
276
+ - spec/lib/vanagon/platform/rpm_spec.rb
275
277
  - spec/lib/vanagon/platform/solaris_11_spec.rb
276
- - spec/lib/vanagon/platform/solaris_10_spec.rb
277
- - spec/lib/vanagon/platform/dsl_spec.rb
278
278
  - spec/lib/vanagon/platform/osx_spec.rb
279
- - spec/lib/vanagon/platform/deb_spec.rb
280
- - spec/lib/vanagon/platform/rpm_spec.rb
281
- - spec/lib/vanagon/platform/rpm/aix_spec.rb
282
- - spec/lib/vanagon/component/source/rewrite_spec.rb
283
- - spec/lib/vanagon/component/source/git_spec.rb
284
- - spec/lib/vanagon/component/source/local_spec.rb
285
- - spec/lib/vanagon/component/source/http_spec.rb
286
- - spec/lib/vanagon/component/dsl_spec.rb
287
- - spec/lib/vanagon/component/source_spec.rb
288
- - spec/lib/vanagon/component/rules_spec.rb
279
+ - spec/lib/vanagon/platform/dsl_spec.rb
280
+ - spec/lib/vanagon/platform/solaris_10_spec.rb
281
+ - spec/lib/vanagon/project_spec.rb
282
+ - spec/lib/vanagon/driver_spec.rb
283
+ - spec/lib/vanagon/project/dsl_spec.rb
284
+ - spec/lib/vanagon/optparse_spec.rb
285
+ - spec/lib/vanagon/utilities_spec.rb
289
286
  - spec/lib/vanagon/extensions/string_spec.rb
290
287
  - spec/lib/vanagon/extensions/set/json_spec.rb
291
288
  - spec/lib/vanagon/extensions/ostruct/json_spec.rb
292
- - spec/lib/vanagon/project/dsl_spec.rb
293
- - spec/lib/vanagon/utilities/shell_utilities_spec.rb
294
- - spec/lib/vanagon/utilities_spec.rb
295
- - spec/lib/vanagon/common/pathname_spec.rb
296
- - spec/lib/vanagon/common/user_spec.rb
297
- - spec/lib/vanagon/platform_spec.rb
298
- - spec/lib/vanagon/engine/always_be_scheduling_spec.rb
299
289
  - spec/lib/vanagon/engine/docker_spec.rb
300
290
  - spec/lib/vanagon/engine/ec2_spec.rb
301
291
  - spec/lib/vanagon/engine/hardware_spec.rb
302
292
  - spec/lib/vanagon/engine/local_spec.rb
293
+ - spec/lib/vanagon/engine/always_be_scheduling_spec.rb
303
294
  - spec/lib/vanagon/engine/base_spec.rb
304
295
  - spec/lib/vanagon/engine/pooler_spec.rb
305
- - spec/lib/makefile_spec.rb
306
- - spec/lib/git/rev_list_spec.rb
296
+ - spec/lib/vanagon/utilities/shell_utilities_spec.rb
297
+ - spec/lib/vanagon/platform_spec.rb
298
+ - spec/lib/vanagon/component/source_spec.rb
299
+ - spec/lib/vanagon/component/source/rewrite_spec.rb
300
+ - spec/lib/vanagon/component/source/local_spec.rb
301
+ - spec/lib/vanagon/component/source/http_spec.rb
302
+ - spec/lib/vanagon/component/source/git_spec.rb
303
+ - spec/lib/vanagon/component/dsl_spec.rb
304
+ - spec/lib/vanagon/component/rules_spec.rb
305
+ - spec/lib/vanagon/component_spec.rb