Remove Gemfile.windows and put both platforms in Gemfile.lock

2 files changed, 2 insertions, 20 deletions

diff --git a/omnibus/files/chef-gem/build-chef-gem/gem-install-software-def.rb b/omnibus/files/chef-gem/build-chef-gem/gem-install-software-def.rb
index 5d77ebf7f2..3022bf448e 100644
--- a/omnibus/files/chef-gem/build-chef-gem/gem-install-software-def.rb
+++ b/omnibus/files/chef-gem/build-chef-gem/gem-install-software-def.rb
@@ -66,17 +66,7 @@ module BuildChefGem
     end
 
     def gemfile_path
-      # gemfile path could be relative to software filename (and often is)
-      @gemfile_path ||= begin
-        # Grab the version (and maybe source) from the lockfile so omnibus knows whether
-        # to toss the cache or not
-        gemfile_path = File.join(root_path, "Gemfile")
-        platform_gemfile_path = "#{gemfile_path}.#{Omnibus::Ohai["platform"]}"
-        if File.exist?(platform_gemfile_path)
-          gemfile_path = platform_gemfile_path
-        end
-        gemfile_path
-      end
+      File.join(root_path, "Gemfile")
     end
 
     def lockfile_path
diff --git a/omnibus/files/chef/build-chef.rb b/omnibus/files/chef/build-chef.rb
index a4a6becfdd..b0d41c185b 100644
--- a/omnibus/files/chef/build-chef.rb
+++ b/omnibus/files/chef/build-chef.rb
@@ -28,17 +28,9 @@ module BuildChef
 
   #
   # Get the (possibly platform-specific) path to the Gemfile.
-  # /var/omnibus/cache/src/chef/Gemfile or
-  # /var/omnibus/cache/src/chef/Gemfile.windows
   #
   def chef_gemfile
-    gemfile = File.join(project_dir, "Gemfile")
-    # Check for platform specific version
-    platform_gemfile = "#{gemfile}.#{Omnibus::Ohai["platform"]}"
-    if File.exist?(platform_gemfile)
-      gemfile = platform_gemfile
-    end
-    gemfile
+    File.join(project_dir, "Gemfile")
   end
 
   #