diff options
| author | Jay Mundrawala <jdmundrawala@gmail.com> | 2014-11-04 10:51:19 -0800 |
|---|---|---|
| committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2014-11-04 10:51:19 -0800 |
| commit | 670c0133a5955f98ae3b2f0a00729ec946a2a7f4 (patch) | |
| tree | e7415f6906d8d975a8f9d404477142d95966c2b5 | |
| parent | ff9147776117f6a5592449384ab6f6ff6605e9be (diff) | |
| parent | 36c2c011348d8779449e315934f80b189fcc1845 (diff) | |
| download | chef-670c0133a5955f98ae3b2f0a00729ec946a2a7f4.tar.gz | |
Merge pull request #2273 from opscode/jdmundrawala/gemspec
Only include chef-service-manager on windows
| -rw-r--r-- | chef-x86-mingw32.gemspec | 2 | ||||
| -rw-r--r-- | chef.gemspec | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/chef-x86-mingw32.gemspec b/chef-x86-mingw32.gemspec index a35ec5d63c..0364e07827 100644 --- a/chef-x86-mingw32.gemspec +++ b/chef-x86-mingw32.gemspec @@ -18,4 +18,6 @@ gemspec.add_dependency "win32-eventlog", "0.6.1" gemspec.extensions << "ext/win32-eventlog/Rakefile" gemspec.files += %w(ext/win32-eventlog/Rakefile ext/win32-eventlog/chef-log.man) +gemspec.executables += %w( chef-service-manager chef-windows-service ) + gemspec diff --git a/chef.gemspec b/chef.gemspec index 427657f678..e7b6aa35ff 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -46,10 +46,7 @@ Gem::Specification.new do |s| %w(rspec-core rspec-expectations rspec-mocks).each { |gem| s.add_development_dependency gem, "~> 2.14.0" } s.bindir = "bin" - # chef-service-manager is a windows only executable. - # However gemspec doesn't give us a way to have this executable only - # on windows. So we're including this in all platforms. - s.executables = %w( chef-client chef-solo knife chef-shell shef chef-apply chef-service-manager chef-windows-service ) + s.executables = %w( chef-client chef-solo knife chef-shell shef chef-apply ) s.require_path = 'lib' s.files = %w(Rakefile LICENSE README.md CONTRIBUTING.md) + Dir.glob("{distro,lib,tasks,spec}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) } |