From 375a0b5c5ed4316c1a1a59735f7767e2aeadaf3b Mon Sep 17 00:00:00 2001 From: zedshaw Date: Sat, 10 Jun 2006 07:02:19 +0000 Subject: Some potential fixes for better cross platform builds. git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@237 19e92222-5c0b-0410-8929-a290d50e31e9 --- Rakefile | 6 +++--- projects/gem_plugin/Rakefile | 4 ++-- projects/mongrel_config/Rakefile | 4 ++-- projects/mongrel_console/Rakefile | 4 ++-- projects/mongrel_service/Rakefile | 4 ++-- projects/mongrel_status/Rakefile | 4 ++-- projects/mongrel_upload_progress/Rakefile | 4 ++-- tools/rakehelp.rb | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Rakefile b/Rakefile index 13b8afc..4b2217c 100644 --- a/Rakefile +++ b/Rakefile @@ -80,7 +80,7 @@ end task :install do sub_project("gem_plugin", :install) sh %{rake package} - sh %{sudo gem install pkg/mongrel-#{version}} + sh %{gem install pkg/mongrel-#{version}} sub_project("mongrel_status", :install) sub_project("mongrel_config", :install) sub_project("mongrel_console", :install) @@ -90,14 +90,14 @@ task :uninstall => [:clean] do sub_project("mongrel_status", :uninstall) sub_project("mongrel_config", :uninstall) sub_project("mongrel_console", :uninstall) - sh %{sudo gem uninstall mongrel} + sh %{gem uninstall mongrel} sub_project("gem_plugin", :uninstall) end task :gem_source do mkdir_p "pkg/gems" - + FileList["**/*.gem"].each { |gem| mv gem, "pkg/gems" } FileList["pkg/*.tgz"].each {|tgz| rm tgz } rm_rf "pkg/#{name}-#{version}" diff --git a/projects/gem_plugin/Rakefile b/projects/gem_plugin/Rakefile index ed3fd31..56ab652 100644 --- a/projects/gem_plugin/Rakefile +++ b/projects/gem_plugin/Rakefile @@ -29,11 +29,11 @@ setup_gem(name, version) do |spec| end task :install => [:test, :package] do - sh %{sudo gem install pkg/#{name}-#{version}} + sh %{gem install pkg/#{name}-#{version}} end task :uninstall => [:clean] do - sh %{sudo gem uninstall #{name}} + sh %{gem uninstall #{name}} end task :site => [:rerdoc] do diff --git a/projects/mongrel_config/Rakefile b/projects/mongrel_config/Rakefile index 8ba80c3..57d7a62 100644 --- a/projects/mongrel_config/Rakefile +++ b/projects/mongrel_config/Rakefile @@ -30,10 +30,10 @@ setup_gem(name, version) do |spec| end task :install => [:test, :package] do - sh %{sudo gem install pkg/#{name}-#{version}.gem} + sh %{gem install pkg/#{name}-#{version}.gem} end task :uninstall => [:clean] do - sh %{sudo gem uninstall #{name}} + sh %{gem uninstall #{name}} end diff --git a/projects/mongrel_console/Rakefile b/projects/mongrel_console/Rakefile index f134b28..7bb165b 100644 --- a/projects/mongrel_console/Rakefile +++ b/projects/mongrel_console/Rakefile @@ -29,10 +29,10 @@ end task :install => [:test, :package] do - sh %{sudo gem install pkg/#{name}-#{version}.gem} + sh %{gem install pkg/#{name}-#{version}.gem} end task :uninstall => [:clean] do - sh %{sudo gem uninstall #{name}} + sh %{gem uninstall #{name}} end diff --git a/projects/mongrel_service/Rakefile b/projects/mongrel_service/Rakefile index b850e48..b9c9ceb 100644 --- a/projects/mongrel_service/Rakefile +++ b/projects/mongrel_service/Rakefile @@ -33,10 +33,10 @@ end task :install => [:test, :package] do - sh %{sudo gem install pkg/#{name}-#{version}.gem} + sh %{gem install pkg/#{name}-#{version}.gem} end task :uninstall => [:clean] do - sh %{sudo gem uninstall #{name}} + sh %{gem uninstall #{name}} end diff --git a/projects/mongrel_status/Rakefile b/projects/mongrel_status/Rakefile index 3b14201..b22cc17 100644 --- a/projects/mongrel_status/Rakefile +++ b/projects/mongrel_status/Rakefile @@ -28,9 +28,9 @@ setup_gem(name, version) do |spec| end task :install => [:test, :package] do - sh %{sudo gem install pkg/#{name}-#{version}.gem} + sh %{gem install pkg/#{name}-#{version}.gem} end task :uninstall => [:clean] do - sh %{sudo gem uninstall #{name}} + sh %{gem uninstall #{name}} end diff --git a/projects/mongrel_upload_progress/Rakefile b/projects/mongrel_upload_progress/Rakefile index 9eae683..85fa3f2 100644 --- a/projects/mongrel_upload_progress/Rakefile +++ b/projects/mongrel_upload_progress/Rakefile @@ -29,10 +29,10 @@ end task :install => [:test, :package] do - sh %{sudo gem install pkg/#{name}-#{version}.gem} + sh %{gem install pkg/#{name}-#{version}.gem} end task :uninstall => [:clean] do - sh %{sudo gem uninstall #{name}} + sh %{gem uninstall #{name}} end diff --git a/tools/rakehelp.rb b/tools/rakehelp.rb index 80fb16e..b749ec7 100644 --- a/tools/rakehelp.rb +++ b/tools/rakehelp.rb @@ -111,5 +111,5 @@ begin t.rcov_opts << "-x /usr" t.output_dir = "test/coverage" end -rescue +rescue Object end -- cgit v1.2.3-24-ge0c7