Merge pull request #5014 from jekyll/exe

Merge pull request 5014

.gitignore

@@ -13,6 +13,7 @@
 /vendor
 Gemfile.lock
 _site/
+bin/
 bbin/
 coverage
 gh-pages/

.rubocop.yml

@@ -4,6 +4,7 @@ AllCops:
   Include:
   - lib/**/*.rb
   Exclude:
+  - exe/jekyll
   - lib/jekyll/collection.rb
   - lib/jekyll/command.rb
   - lib/jekyll/configuration.rb

features/support/helpers.rb

@@ -12,7 +12,7 @@ class Paths
 
   def self.status_file; test_dir.join("jekyll_status.txt"); end
 
-  def self.jekyll_bin; source_dir.join("bin", "jekyll"); end
+  def self.jekyll_bin; source_dir.join("exe", "jekyll"); end
 
   def self.source_dir; SOURCE_DIR; end
 end

jekyll.gemspec

@@ -21,8 +21,9 @@ Gem::Specification.new do |s|
   s.homepage      = 'https://github.com/jekyll/jekyll'
 
   all_files       = `git ls-files -z`.split("\x0")
-  s.files         = all_files.grep(%r{^(bin|lib)/|^.rubocop.yml$})
-  s.executables   = all_files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.files         = all_files.grep(%r{^(exe|lib)/|^.rubocop.yml$})
+  s.executables   = all_files.grep(%r{^exe/}) { |f| File.basename(f) }
+  s.bindir        = "exe"
   s.require_paths = ['lib']
 
   s.rdoc_options = ['--charset=UTF-8']