diff --git a/Rakefile b/Rakefile index 462eaec5..6e7c3dd1 100644 --- a/Rakefile +++ b/Rakefile @@ -66,6 +66,9 @@ setup_gem(name, version) do |spec| spec.required_ruby_version = '>= 1.8.4' if RUBY_PLATFORM =~ /mswin/ + Dir.chdir "projects/mongrel_service" do + sh %{rake install } + end spec.files << 'ext/http11/http11.so' spec.add_dependency('win32-service', '>= 0.5.0') spec.extensions.clear @@ -82,16 +85,20 @@ task :install do sh %{rake package} sh %{gem install pkg/mongrel-#{version}} sub_project("mongrel_status", :install) - sub_project("mongrel_config", :install) sub_project("mongrel_console", :install) + if RUBY_PLATFORM =~ /mswin/ + sub_project("mongrel_service", :install) + end end task :uninstall => [:clean] do sub_project("mongrel_status", :uninstall) - sub_project("mongrel_config", :uninstall) sub_project("mongrel_console", :uninstall) sh %{gem uninstall mongrel} sub_project("gem_plugin", :uninstall) + if RUBY_PLATFORM =~ /mswin/ + sub_project("mongrel_service", :install) + end end diff --git a/tools/rakehelp.rb b/tools/rakehelp.rb index b749ec7e..0a0f3839 100644 --- a/tools/rakehelp.rb +++ b/tools/rakehelp.rb @@ -98,7 +98,9 @@ end def sub_project(project, *targets) targets.each do |target| - sh %{cd projects/#{project}; rake #{target.to_s}; } + Dir.chdir "projects/#{project}" do + sh %{rake --trace #{target.to_s} } + end end end