|
 |
07f2a6 |
From 8cca079d3be8d07c261baea72529628469938245 Mon Sep 17 00:00:00 2001
|
|
|
07f2a6 |
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
|
|
|
07f2a6 |
Date: Sat, 2 Feb 2019 10:41:22 +0000
|
|
|
07f2a6 |
Subject: [PATCH] Fixup r66984. Update the location of bundler gemspec.
|
|
|
07f2a6 |
|
|
|
07f2a6 |
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66993 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
|
|
07f2a6 |
---
|
|
|
07f2a6 |
spec/bundler/support/path.rb | 2 +-
|
|
|
07f2a6 |
tool/sync_default_gems.rb | 2 +-
|
|
|
07f2a6 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
07f2a6 |
|
|
|
07f2a6 |
diff --git a/spec/bundler/support/path.rb b/spec/bundler/support/path.rb
|
|
|
07f2a6 |
index 38f7145dc72a..69efcba05175 100644
|
|
|
07f2a6 |
--- a/spec/bundler/support/path.rb
|
|
|
07f2a6 |
+++ b/spec/bundler/support/path.rb
|
|
|
07f2a6 |
@@ -9,7 +9,7 @@ def root
|
|
|
07f2a6 |
end
|
|
|
07f2a6 |
|
|
|
07f2a6 |
def gemspec
|
|
|
07f2a6 |
- @gemspec ||= root.join(ruby_core? ? "lib/bundler.gemspec" : "bundler.gemspec")
|
|
|
07f2a6 |
+ @gemspec ||= root.join(ruby_core? ? "lib/bundler/bundler.gemspec" : "bundler.gemspec")
|
|
|
07f2a6 |
end
|
|
|
07f2a6 |
|
|
|
07f2a6 |
def bindir
|
|
|
07f2a6 |
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
|
|
|
07f2a6 |
index bb4fcdd2cc12..26458147e5a3 100644
|
|
|
07f2a6 |
--- a/tool/sync_default_gems.rb
|
|
|
07f2a6 |
+++ b/tool/sync_default_gems.rb
|
|
|
07f2a6 |
@@ -89,7 +89,7 @@ def sync_default_gems(gem)
|
|
|
07f2a6 |
`rm -rf lib/bundler* libexec/bundler libexec/bundle libexec/bundle_ruby spec/bundler man/bundle* man/gemfile*`
|
|
|
07f2a6 |
`cp -r ../../bundler/bundler/lib/bundler* ./lib`
|
|
|
07f2a6 |
`cp -r ../../bundler/bundler/exe/bundle* ./libexec`
|
|
|
07f2a6 |
- `cp ../../bundler/bundler/bundler.gemspec ./lib`
|
|
|
07f2a6 |
+ `cp ../../bundler/bundler/bundler.gemspec ./lib/bundler`
|
|
|
07f2a6 |
`cp -r ../../bundler/bundler/spec spec/bundler`
|
|
|
07f2a6 |
`cp -r ../../bundler/bundler/man/*.{1,5,1\.txt,5\.txt,ronn} ./man`
|
|
|
07f2a6 |
`rm -rf spec/bundler/support/artifice/vcr_cassettes`
|