diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-12 12:53:14 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-12 12:53:14 +0000 |
| commit | cfe665790e37d5656466b29edf21be21d5d33062 (patch) | |
| tree | 3a04916ae0fd9f57c2263ea5f161f7412ffebb17 /railties | |
| parent | 912a567252fa89dc785183e4ed7796d035376cd6 (diff) | |
| download | rails-cfe665790e37d5656466b29edf21be21d5d33062.tar.gz rails-cfe665790e37d5656466b29edf21be21d5d33062.tar.bz2 rails-cfe665790e37d5656466b29edf21be21d5d33062.zip | |
Differentiate breakpointing on gem or not in an attempt to fix looping problems
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@119 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/Rakefile | 1 | ||||
| -rw-r--r-- | railties/bin/breakpointing | 8 | ||||
| -rw-r--r-- | railties/bin/breakpointing_for_gem | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/railties/Rakefile b/railties/Rakefile index bb440edd36..d39471862e 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -202,6 +202,7 @@ end task :copy_gem_environment do cp "environments/shared_for_gem.rb", "#{PKG_DESTINATION}/config/environment.rb" + cp "bin/breakpointing_for_gem", "#{PKG_DESTINATION}/script/breakpointing" end diff --git a/railties/bin/breakpointing b/railties/bin/breakpointing index a3e325fe04..4ac3e7c3c9 100644 --- a/railties/bin/breakpointing +++ b/railties/bin/breakpointing @@ -1,9 +1,3 @@ #!/usr/local/bin/ruby -begin - require 'rubygems' - require_gem 'rails' -rescue LoadError - require File.dirname(__FILE__) + '/../vendor/railties/lib/breakpoint' -end - +$LOAD_PATH << File.dirname(__FILE__) + '/../vendor/railties/lib' require 'breakpoint_client' diff --git a/railties/bin/breakpointing_for_gem b/railties/bin/breakpointing_for_gem new file mode 100644 index 0000000000..1366641582 --- /dev/null +++ b/railties/bin/breakpointing_for_gem @@ -0,0 +1,4 @@ +#!/usr/local/bin/ruby +require 'rubygems' +require_gem 'rails' +require 'breakpoint_client' |