Merge pull request #44 from shaun-rutherford/cleanup

OSX non-root user build changes

Author: nmburgan

configs/platforms/osx-11-arm64.rb

@@ -2,7 +2,7 @@
   plat.inherit_from_default
 
   packages = %w[cmake pkg-config]
-  plat.provision_with "su test -c '/usr/local/bin/brew install #{packages.join(' ')}'"
+  plat.provision_with "sudo su test -c '/usr/local/bin/brew install #{packages.join(' ')}'"
 
   plat.output_dir File.join('apple', '13', 'PC1', 'x86_64')
 end

configs/platforms/osx-11-x86_64.rb

@@ -2,7 +2,7 @@
   plat.inherit_from_default
 
   packages = %w[cmake pkg-config]
-  plat.provision_with "su test -c '/usr/local/bin/brew install #{packages.join(' ')}'"
+  plat.provision_with "sudo su test -c '/usr/local/bin/brew install #{packages.join(' ')}'"
 
   plat.output_dir File.join('apple', '14', 'PC1', 'x86_64')
 end

configs/platforms/osx-12-arm64.rb

@@ -85,6 +85,11 @@
 proj.setting(:gem_home, File.join(proj.libdir, 'ruby', 'gems', ruby_base_version))
 proj.setting(:ruby_vendordir, File.join(proj.libdir, "ruby", "vendor_ruby"))
 
+proj.setting(:ruby_dir_base, File.join(proj.libdir, "ruby"))
+proj.setting(:ruby_dir_base_version, File.join(proj.ruby_dir_base, ruby_base_version))
+proj.setting(:rubygems_dir, File.join(proj.ruby_dir_base_version, 'rubygems'))
+proj.setting(:rubygems_ssl_dir, File.join(proj.rubygems_dir, 'ssl_certs'))
+
 # Cross-compiled Linux platforms
 platform_triple = "ppc64le-redhat-linux" if platform.architecture == "ppc64le"
 platform_triple = "powerpc64le-suse-linux" if platform.architecture == "ppc64le" && platform.name =~ /^sles-/
@@ -229,4 +234,9 @@
 proj.directory proj.prefix
 proj.directory proj.sysconfdir
 proj.directory proj.link_bindir
+proj.directory proj.libdir
+proj.directory proj.ruby_dir_base
+proj.directory proj.ruby_dir_base_version
+proj.directory proj.rubygems_dir
+proj.directory proj.rubygems_ssl_dir
 proj.directory proj.bindir if platform.is_windows? || platform.is_macos?

configs/platforms/osx-12-x86_64.rb

@@ -15,7 +15,7 @@ namespace :vox do
     platform = args[:platform]
 
     engine = platform =~ /^(osx|windows)-/ ? 'local' : 'docker'
-    cmd = "bundle exec build #{project} #{platform} --engine #{engine}"
+    cmd = "bundle exec vanagon build #{project} #{platform} --engine #{engine}"
 
     FileUtils.rm_rf('C:/ProgramFiles64Folder/') if platform =~ /^windows-/
 

configs/platforms/osx-13-x86_64.rb

@@ -0,0 +1,19 @@
+require 'fileutils'
+
+namespace :vox do
+  desc 'Cleanup after puppet-runtime compile'
+  task :cleanup, [:platform] do |_, args|
+    abort 'You must provide a platform.' if args[:platform].nil? || args[:platform].empty?
+    platform = args[:platform]
+
+    if platform =~ /^windows-/
+      FileUtils.rm_rf('C:/ProgramFiles64Folder')
+    elsif platform =~ /^osx-/
+      FileUtils.rm_rf('/opt/puppetlabs')
+      FileUtils.rm_rf('/private/etc/puppetlabs')
+    else
+      FileUtils.rm_rf('/opt/puppetlabs')
+      FileUtils.rm_rf('/etc/puppetlabs')
+    end
+  end
+end