Changeset 1001

Timestamp:

03/31/08 03:19:17 (5 months ago)

Author:

luislavena

Message:

A bunch of corrections to the Rakefiles and the Manifest.
Almost nirvana for CI.

Files:

• branches/stable_1-2 (modified) (2 props)
• branches/stable_1-2/Manifest (modified) (2 diffs)
• branches/stable_1-2/Rakefile (modified) (10 diffs)
• branches/stable_1-2/projects/fastthread/Rakefile (modified) (3 diffs)
• branches/stable_1-2/projects/gem_plugin/Rakefile (modified) (2 diffs)
• branches/stable_1-2/projects/mongrel_service/Rakefile (modified) (3 diffs)

branches/stable_1-2/Manifest

@@ -45 +45 @@
-lib/mongrel/uri_classifier.rb
-lib/mongrel.rb
-lib/mongrel.rb.rej
-LICENSE
-Manifest
@@ -64 +63 @@
-test/unit/test_debug.rb
-test/unit/test_handlers.rb
-11
+_parser
-test/unit/test_redirect_handler.rb
-test/unit/test_request_progress.rb

branches/stable_1-2/Rakefile

@@ -1 +1 @@
-
-require 'rubygems'
-5
+11
-require 'echoe'
-
-e = Echoe.new("mongrel") do |p|
-  p.summary = "A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps."
-
+
+
-  p.clean_pattern = ['ext/http11/*.{bundle,so,o,obj,pdb,lib,def,exp}', 'lib/*.{bundle,so,o,obj,pdb,lib,def,exp}', 'ext/http11/Makefile', 'pkg', 'lib/*.bundle', '*.gem', 'site/output', '.config', 'lib/http11.jar', 'ext/http11_java/classes', 'coverage', 'test_*.log', 'log', 'doc']
-  p.url = "http://mongrel.rubyforge.org"
@@ -16 +17 @@
-  p.extension_pattern = nil
-  
-ENV['USER']
+(ENV['USER'] || ENV['USERNAME']).downcase
-    when 'eweaver' 
-      ['~/p/configuration/gem_certificates/mongrel/mongrel-public_cert.pem',
-       '~/p/configuration/gem_certificates/evan_weaver-mongrel-public_cert.pem']
-
-
-
+, 'luis'
+projects/
+projects/
-  end
-  
@@ -28 +29 @@
-  p.need_tgz = true
-
-if RUBY_PLATFORM !~ /mswin|java/
+unless Platform.windows? or Platform.java?
-    p.extension_pattern = ["ext/**/extconf.rb"]
-  end
-
-  p.eval = proc do
-
-
+
-      self.files += ['lib/http11.so']
-      self.platform = Gem::Platform::CURRENT
-when /java/
+elsif Platform.java?
-      self.files += ['lib/http11.jar']
-      self.platform = 'jruby' # XXX Is this right?
@@ -83 +83 @@
-end
-
-
-
+
-  filename = "lib/http11.so"
-  file filename do
-    Dir.chdir("ext/http11") do
-      ruby "extconf.rb"
-LATFORM =~ /mswin/ ? 'nmake' : 'make'
+latform.make
-    end
-    move_extensions
@@ -95 +94 @@
-  task :compile => [filename]
-
-
+
-
-  # Avoid JRuby in-process launching problem
@@ -122 +121 @@
-  targets.each do |target|
-    Dir.chdir "projects/#{project}" do
-
-
-
+
-    end
-  end
+end
+
+desc "Compile all the projects"
+task :compile_all => [:compile] do
+  sub_project("fastthread", :compile)
+  sub_project("mongrel_service", :compile)
-end
-
@@ -140 +143 @@
-  sub_project("mongrel_experimental", :package)
-
-RUBY_PLATFORM =~ /java/
+Platform.windows?
-  
-
-
-
+
-end
-
@@ -162 +163 @@
-  sub_project("mongrel_cluster", :install)
-  # sub_project("mongrel_experimental", :install)
-RUBY_PLATFORM =~ /mswin/
+Platform.windows?
-end
-
@@ -174 +175 @@
-  sub_project("fastthread", :uninstall)
-  # sub_project("mongrel_experimental", :uninstall)
-RUBY_PLATFORM =~ /mswin/
+Platform.windows?
-end
-
-desc "for Mongrel and all its subprojects"
-
+_all => [:clean]
-  sub_project("gem_plugin", :clean)
-  sub_project("cgi_multipart_eof_fix", :clean)
@@ -187 +188 @@
-  sub_project("mongrel_cluster", :clean)
-  sub_project("mongrel_experimental", :clean)
-RUBY_PLATFORM =~ /mswin/
+Platform.windows?
-end
-

branches/stable_1-2/projects/fastthread/Rakefile

@@ -1 +1 @@
-
+require 'rubygems'
+gem 'echoe', '>=2.7.11'
-require 'echoe'
-
@@ -5 +7 @@
-  p.project = "mongrel"
-  p.author = "MenTaLguY <mental@rydia.net>"
+  p.email = "mental@rydia.net"
-  p.summary = "Optimized replacement for thread.rb primitives"
-  p.extensions = "ext/fastthread/extconf.rb"
@@ -15 +18 @@
-  p.require_signed = true
-
-  
-RUBY_PLATFORM.match("win32")
-platform = Gem::Platform::WIN32
-
+
+Platform.windows?
+self.platform = Gem::Platform::CURRENT
+self.
-      task :package => [:clean, :compile]
-    end

branches/stable_1-2/projects/gem_plugin/Rakefile

@@ -1 +1 @@
-
+require 'rubygems'
+gem 'echoe', '>=2.7.11'
-require 'echoe'
-
-Echoe.new("gem_plugin") do |p|
-
+
+
-  p.project = "mongrel"
-  p.summary = "A plugin system based on rubygems that uses dependencies only"
@@ -16 +19 @@
-  p.clean_pattern += ["pkg", "lib/*.bundle", "*.gem", ".config"]
-  p.rdoc_pattern = ['README', 'LICENSE', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc']
-allison
+#{Platform.windows? ? 'allison.bat' : 'allison'}
-end
-

branches/stable_1-2/projects/mongrel_service/Rakefile

@@ +1 @@
+
+require 'rubygems'
+gem 'echoe', '>=2.7.11'
-require 'echoe'
-require 'tools/freebasic'
@@ -11 +14 @@
-  p.description = "This plugin offer native win32 services for rails, powered by Mongrel."
-  p.author = "Luis Lavena"
-
+
+
-  p.dependencies = ['gem_plugin >=0.2.3', 'mongrel >=1.0.2', 'win32-service >=0.5.0']
-
@@ -18 +22 @@
-  p.need_tar_gz = false
-  p.need_zip = true
-
-
+projects/
+projects/
-  p.require_signed = true
-end