build and install mingw32 gem explicitly, don't bail out on error

Signed-off-by: Vikram Karve <vikram.karve@progress.com>

1 files changed, 10 insertions, 2 deletions

diff --git a/habitat/plan.ps1 b/habitat/plan.ps1
index 9f11c99c27..b260809594 100644
--- a/habitat/plan.ps1
+++ b/habitat/plan.ps1
@@ -76,11 +76,10 @@ function Invoke-Build {
     try {
         Push-Location "${HAB_CACHE_SRC_PATH}/${pkg_dirname}"
 
-        $env:_BUNDER_WINDOWS_DLLS_COPIED = "1"
+        $env:_BUNDLER_WINDOWS_DLLS_COPIED = "1"
 
         Write-BuildLine " ** Using bundler to retrieve the Ruby dependencies"
         bundle install
-        gem install chefstyle
         if (-not $?) { throw "unable to install gem dependencies" }
         Write-BuildLine " ** 'rake install' any gem sourced as a git reference so they'll look like regular gems."
         foreach($git_gem in (Get-ChildItem "$env:GEM_HOME/bundler/gems")) {
@@ -93,6 +92,15 @@ function Invoke-Build {
                 Pop-Location
             }
         }
+        Write-BuildLine " ** Running the chef project's 'rake install' to install the path-based gems so they look like any other installed gem."
+        bundle exec rake install:local # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler
+        if (-not $?) {
+            Write-Warning " -- That didn't work. Let's try again."
+            bundle exec rake install:local # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler
+            # if (-not $?) { throw "unable to install the gems that live in directories within this repo" }
+        }
+        gem build chef-universal-mingw32.gemspec
+        gem install chef-universal-mingw32.gem
     } finally {
         Pop-Location
     }