diff options
| author | Bryan McLellan <btm@chef.io> | 2020-06-24 13:08:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-24 13:08:09 -0400 |
| commit | fecee71267d3c5eefc37eeaade636b8396aa543a (patch) | |
| tree | c237104b7aeba7c11c5e3c53f2a495faeb58c5df | |
| parent | d0845f00e33890b290127168d1e9b07af3374769 (diff) | |
| parent | a14ea9014dbfbe3aa91b448aab027f5453bd9398 (diff) | |
| download | chef-fecee71267d3c5eefc37eeaade636b8396aa543a.tar.gz | |
Merge pull request #10022 from mwrock/pkg_shim
consume powershell shim DLLs from hab package
| -rw-r--r-- | habitat/plan.ps1 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index 704b736048..2b21ae889c 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -13,6 +13,7 @@ $pkg_bin_dirs=@( $pkg_deps=@( "core/cacerts" "chef/ruby27-plus-devkit" + "chef/chef-powershell-shim" ) function Invoke-Begin { @@ -28,7 +29,6 @@ function Invoke-Begin { function Invoke-SetupEnvironment { Push-RuntimeEnv -IsPath GEM_PATH "$pkg_prefix/vendor" - Push-RuntimeEnv -IsPath RUBY_DLL_PATH "$pkg_prefix/lib" Set-RuntimeEnv APPBUNDLER_ALLOW_RVM "true" # prevent appbundler from clearing out the carefully constructed runtime GEM_PATH Set-RuntimeEnv FORCE_FFI_YAJL "ext" # Always use the C-extensions because we use MRI on all the things and C is fast. @@ -77,9 +77,6 @@ function Invoke-Build { try { Push-Location "${HAB_CACHE_SRC_PATH}/${pkg_dirname}" - Write-BuildLine " ** Copying Chef DLLs" - New-Item -ItemType Directory -Force -Path "$pkg_prefix/lib" - Get-ChildItem ./distro/ruby_bin_folder -Filter "*.dll" | Copy-Item -Destination "$pkg_prefix/lib" $env:_BUNDER_WINDOWS_DLLS_COPIED = "1" Write-BuildLine " ** Using bundler to retrieve the Ruby dependencies" |