diff options
| -rw-r--r-- | railties/Rakefile | 2 | ||||
| -rw-r--r-- | railties/bin/performance/benchmark (renamed from railties/bin/perform/benchmark) | 0 | ||||
| -rw-r--r-- | railties/bin/performance/profile (renamed from railties/bin/perform/profile) | 0 | ||||
| -rw-r--r-- | railties/lib/commands/performance/benchmark.rb (renamed from railties/lib/commands/perform/benchmark.rb) | 0 | ||||
| -rw-r--r-- | railties/lib/commands/performance/profile.rb (renamed from railties/lib/commands/perform/profile.rb) | 0 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/applications/app/app_generator.rb | 2 |
6 files changed, 2 insertions, 2 deletions
diff --git a/railties/Rakefile b/railties/Rakefile index a0b1f5b325..0a879580da 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -38,7 +38,7 @@ HTML_FILES = %w( 404.html 500.html index.html robots.txt favicon.ico javascripts/prototype.js javascripts/scriptaculous.js javascripts/effects.js javascripts/dragdrop.js javascripts/controls.js javascripts/util.js javascripts/slider.js ) -BIN_FILES = %w( breakpointer console destroy generate perform/benchmark perform/profile process/reaper process/spawner process/spinner runner server ) +BIN_FILES = %w( breakpointer console destroy generate performance/benchmarker performance/profiler process/reaper process/spawner process/spinner runner server ) VENDOR_LIBS = %w( actionpack activerecord actionmailer activesupport actionwebservice railties ) diff --git a/railties/bin/perform/benchmark b/railties/bin/performance/benchmark index c787fae8ad..c787fae8ad 100644 --- a/railties/bin/perform/benchmark +++ b/railties/bin/performance/benchmark diff --git a/railties/bin/perform/profile b/railties/bin/performance/profile index 743262e56c..743262e56c 100644 --- a/railties/bin/perform/profile +++ b/railties/bin/performance/profile diff --git a/railties/lib/commands/perform/benchmark.rb b/railties/lib/commands/performance/benchmark.rb index b12cf57215..b12cf57215 100644 --- a/railties/lib/commands/perform/benchmark.rb +++ b/railties/lib/commands/performance/benchmark.rb diff --git a/railties/lib/commands/perform/profile.rb b/railties/lib/commands/performance/profile.rb index f599ad6635..f599ad6635 100644 --- a/railties/lib/commands/perform/profile.rb +++ b/railties/lib/commands/performance/profile.rb diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb index 73348f51d3..0e3549cd62 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -44,7 +44,7 @@ class AppGenerator < Rails::Generator::Base m.file "environments/test.rb", "config/environments/test.rb" # Scripts - %w( breakpointer console destroy generate perform/benchmark perform/profile process/reaper process/spawner process/spinner runner server ).each do |file| + %w( breakpointer console destroy generate performance/benchmarker performance/profiler process/reaper process/spawner process/spinner runner server ).each do |file| m.file "bin/#{file}", "script/#{file}", script_options end |