summaryrefslogtreecommitdiff
path: root/omnibus
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-04-17 09:34:29 -0700
committerJohn Keiser <john@johnkeiser.com>2016-04-18 14:21:02 -0700
commit01cf3ef2a85d3190b0bd46835ff6ae37f830764a (patch)
treeb15fc1934d56c4449101b10d074b72e26a4884e3 /omnibus
parent31f9ada8660a2831204aca436e343b6a10b103cd (diff)
downloadchef-01cf3ef2a85d3190b0bd46835ff6ae37f830764a.tar.gz
Remove Gemfile.windows and put both platforms in Gemfile.lock
Diffstat (limited to 'omnibus')
-rw-r--r--omnibus/Gemfile.lock8
-rw-r--r--omnibus/files/chef-gem/build-chef-gem/gem-install-software-def.rb12
-rw-r--r--omnibus/files/chef/build-chef.rb10
3 files changed, 10 insertions, 20 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 90bf93fa1c..5214847aa1 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -98,6 +98,7 @@ GEM
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
+ ffi (1.9.10-x86-mingw32)
ffi-yajl (2.2.3)
libyajl2 (~> 1.2)
fuzzyurl (0.8.0)
@@ -107,6 +108,7 @@ GEM
builder (>= 2.1.2)
hashie (3.4.3)
hitimes (1.2.3)
+ hitimes (1.2.3-x86-mingw32)
httpclient (2.6.0.1)
iostruct (0.0.4)
ipaddress (0.8.3)
@@ -136,6 +138,9 @@ GEM
mixlib-versioning
mixlib-log (1.6.0)
mixlib-shellout (2.2.6)
+ mixlib-shellout (2.2.6-universal-mingw32)
+ win32-process (~> 0.8.2)
+ wmi-lite (~> 1.0)
mixlib-versioning (1.1.0)
multi_json (1.11.2)
multipart-post (1.2.0)
@@ -224,6 +229,8 @@ GEM
varia_model (0.4.1)
buff-extensions (~> 1.0)
hashie (>= 2.0.2, < 4.0.0)
+ win32-process (0.8.3)
+ ffi (>= 1.0.0)
winrm (1.7.3)
builder (>= 2.1.2)
gssapi (~> 1.2)
@@ -242,6 +249,7 @@ GEM
PLATFORMS
ruby
+ x86-mingw32
DEPENDENCIES
berkshelf (~> 3.0)
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
#