|
35 | 35 | proj.setting(:prefix, '/opt/puppetlabs/bolt') |
36 | 36 | end |
37 | 37 |
|
| 38 | + ruby_base_version = proj.ruby_version.gsub(/(\d+)\.(\d+)(\.\d+)?/, '\1.\2.0') |
| 39 | + |
38 | 40 | proj.setting(:ruby_dir, proj.prefix) |
39 | 41 | proj.setting(:bindir, File.join(proj.prefix, 'bin')) |
40 | 42 | proj.setting(:ruby_bindir, proj.bindir) |
41 | 43 | proj.setting(:libdir, File.join(proj.prefix, 'lib')) |
42 | 44 | proj.setting(:includedir, File.join(proj.prefix, 'include')) |
43 | 45 | proj.setting(:datadir, File.join(proj.prefix, 'share')) |
44 | 46 | proj.setting(:mandir, File.join(proj.datadir, 'man')) |
| 47 | + proj.setting(:ruby_dir_base, File.join(proj.libdir, 'ruby')) |
| 48 | + proj.setting(:ruby_dir_base_version, File.join(proj.ruby_dir_base, ruby_base_version)) |
| 49 | + proj.setting(:rubygems_dir, File.join(proj.ruby_dir_base_version, 'rubygems')) |
| 50 | + proj.setting(:rubygems_ssl_dir, File.join(proj.rubygems_dir, 'ssl_certs')) |
45 | 51 |
|
46 | 52 | if platform.is_windows? |
47 | 53 | proj.setting(:host_ruby, File.join(proj.ruby_bindir, 'ruby.exe')) |
|
55 | 61 | proj.setting(:host_gem, File.join(proj.ruby_bindir, 'gem')) |
56 | 62 | end |
57 | 63 |
|
58 | | - ruby_base_version = proj.ruby_version.gsub(/(\d+)\.(\d+)(\.\d+)?/, '\1.\2.0') |
59 | | - |
60 | 64 | proj.setting(:gem_home, File.join(proj.libdir, 'ruby', 'gems', ruby_base_version)) |
61 | 65 | proj.setting(:gem_install, "#{proj.host_gem} install --no-document --local --bindir=#{proj.ruby_bindir}") |
62 | 66 |
|
|
287 | 291 | proj.directory proj.includedir |
288 | 292 | proj.directory proj.datadir |
289 | 293 | proj.directory proj.mandir |
| 294 | + proj.directory proj.ruby_dir_base |
| 295 | + proj.directory proj.ruby_dir_base_version |
| 296 | + proj.directory proj.rubygems_dir |
| 297 | + proj.directory proj.rubygems_ssl_dir |
290 | 298 |
|
291 | 299 | # Export the settings for the current project and platform as yaml during builds |
292 | 300 | proj.publish_yaml_settings |
|
0 commit comments