mirror of
https://github.com/puma/puma.git
synced 2022-11-09 13:48:40 -05:00
A few more fixes trying to improve the win32 build support.
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@242 19e92222-5c0b-0410-8929-a290d50e31e9
This commit is contained in:
parent
ee957121c7
commit
5406120730
2 changed files with 12 additions and 3 deletions
11
Rakefile
11
Rakefile
|
@ -66,6 +66,9 @@ setup_gem(name, version) do |spec|
|
||||||
spec.required_ruby_version = '>= 1.8.4'
|
spec.required_ruby_version = '>= 1.8.4'
|
||||||
|
|
||||||
if RUBY_PLATFORM =~ /mswin/
|
if RUBY_PLATFORM =~ /mswin/
|
||||||
|
Dir.chdir "projects/mongrel_service" do
|
||||||
|
sh %{rake install }
|
||||||
|
end
|
||||||
spec.files << 'ext/http11/http11.so'
|
spec.files << 'ext/http11/http11.so'
|
||||||
spec.add_dependency('win32-service', '>= 0.5.0')
|
spec.add_dependency('win32-service', '>= 0.5.0')
|
||||||
spec.extensions.clear
|
spec.extensions.clear
|
||||||
|
@ -82,16 +85,20 @@ task :install do
|
||||||
sh %{rake package}
|
sh %{rake package}
|
||||||
sh %{gem install pkg/mongrel-#{version}}
|
sh %{gem install pkg/mongrel-#{version}}
|
||||||
sub_project("mongrel_status", :install)
|
sub_project("mongrel_status", :install)
|
||||||
sub_project("mongrel_config", :install)
|
|
||||||
sub_project("mongrel_console", :install)
|
sub_project("mongrel_console", :install)
|
||||||
|
if RUBY_PLATFORM =~ /mswin/
|
||||||
|
sub_project("mongrel_service", :install)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
task :uninstall => [:clean] do
|
task :uninstall => [:clean] do
|
||||||
sub_project("mongrel_status", :uninstall)
|
sub_project("mongrel_status", :uninstall)
|
||||||
sub_project("mongrel_config", :uninstall)
|
|
||||||
sub_project("mongrel_console", :uninstall)
|
sub_project("mongrel_console", :uninstall)
|
||||||
sh %{gem uninstall mongrel}
|
sh %{gem uninstall mongrel}
|
||||||
sub_project("gem_plugin", :uninstall)
|
sub_project("gem_plugin", :uninstall)
|
||||||
|
if RUBY_PLATFORM =~ /mswin/
|
||||||
|
sub_project("mongrel_service", :install)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -98,7 +98,9 @@ end
|
||||||
|
|
||||||
def sub_project(project, *targets)
|
def sub_project(project, *targets)
|
||||||
targets.each do |target|
|
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
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue