From eba148cef471ce85d5986246e3e6c5b2ae4a467a Mon Sep 17 00:00:00 2001 From: luislavena Date: Mon, 20 Feb 2006 19:00:49 +0000 Subject: Modified the Rakefile removing dependency of daemons just for win32 gem. Also modified mongrel_rails script to avoid daemonize on win32 platform. git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@50 19e92222-5c0b-0410-8929-a290d50e31e9 --- Rakefile | 1 - bin/mongrel_rails | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Rakefile b/Rakefile index 9afee77..dd8cd63 100644 --- a/Rakefile +++ b/Rakefile @@ -46,7 +46,6 @@ task :win32_gem => [:clean, :compile, :test, :package_win32] task :package_win32 do setup_win32_gem(name, version, version, summary, scripts, test_file) do |spec| - spec.add_dependency('daemons', '>= 0.4.2') spec.files << 'ext/http11/http11.so' spec.extensions = [] spec.platform = Gem::Platform::WIN32 diff --git a/bin/mongrel_rails b/bin/mongrel_rails index cb891e1..ed391b1 100644 --- a/bin/mongrel_rails +++ b/bin/mongrel_rails @@ -1,6 +1,5 @@ require 'rubygems' require 'mongrel' -require 'daemons/daemonize' require 'mongrel/command' @@ -77,7 +76,9 @@ class StartCommand < Mongrel::Command::Command def daemonize # save this for later since daemonize will hose it - if @daemon + if @daemon and RUBY_PLATFORM !~ /mswin/ + require 'daemons/daemonize' + puts "Started Mongrel server in #@environment mode at #@address:#@port" Daemonize.daemonize(log_file=File.join(@cwd, @log_file)) -- cgit v1.2.3-24-ge0c7