Permalink
Browse files

fix development tasks

  • Loading branch information...
1 parent e168885 commit 287dd33aa1fc97c9cf54c9c13212117e254761f9 @tmm1 tmm1 committed Feb 28, 2013
Showing with 7 additions and 25 deletions.
  1. +1 −2 Gemfile
  2. +3 −3 eventmachine.gemspec
  3. +3 −20 rakelib/package.rake
View
3 Gemfile
@@ -1,3 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
gemspec
-
View
6 eventmachine.gemspec
@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
s.files = `git ls-files`.split("\n")
s.extensions = ["ext/extconf.rb", "ext/fastfilereader/extconf.rb"]
- s.add_development_dependency 'rake-compiler', '~> 0.8.1'
- s.add_development_dependency 'yard', ">= 0.7.2"
- s.add_development_dependency 'bluecloth'
+ s.add_development_dependency 'rake-compiler', '~> 0.8.3'
+ s.add_development_dependency 'yard', ">= 0.8.5.2"
+ s.add_development_dependency 'bluecloth' unless RUBY_PLATFORM =~ /java/
s.summary = 'Ruby/EventMachine library'
s.description = "EventMachine implements a fast, single-threaded engine for arbitrary network
View
23 rakelib/package.rake
@@ -1,10 +1,5 @@
-begin
- require 'rubygems'
- require 'rubygems/package_task'
-rescue LoadError
- require 'rake/packagetask'
- require 'rake/gempackagetask'
-end
+require 'rubygems'
+require 'rubygems/package_task'
begin
require 'rake/extensiontask'
@@ -19,7 +14,7 @@ rake-compiler gem seems to be missing. Please install it with
MSG
end
-Rake::PackageTask.new(GEMSPEC, EventMachine::VERSION) do |pkg|
+Gem::PackageTask.new(GEMSPEC) do |pkg|
end
if RUBY_PLATFORM =~ /java/
@@ -91,15 +86,3 @@ def gem_cmd(action, name, *args)
end
Rake::Task[:clean].enhance [:clobber_package]
-
-namespace :gem do
- desc 'Install gem (and sudo if required)'
- task :install => :package do
- gem_cmd(:install, "pkg/#{GEMSPEC.name}-#{GEMSPEC.version}.gem")
- end
-
- desc 'Uninstall gem (and sudo if required)'
- task :uninstall do
- gem_cmd(:uninstall, "#{GEMSPEC.name}", "-v=#{GEMSPEC.version}")
- end
-end

5 comments on commit 287dd33

@ibc

This makes rake to fail in my Ubunt 12.10:

~/Proyectos/github_eventmachine$ rake --trace
rake aborted!
Don't know how to build task 'native:eventmachine:x86-mingw32'
/var/lib/gems/1.9.1/gems/rake-0.9.2.2/lib/rake/task_manager.rb:49:in `[]'
/var/lib/gems/1.9.1/gems/rake-0.9.2.2/lib/rake/task.rb:298:in `[]'
/home/ibc/Proyectos/github_eventmachine/rakelib/package.rake:35:in `block in hack_cross_compilation'
/home/ibc/Proyectos/github_eventmachine/rakelib/package.rake:34:in `each'
/home/ibc/Proyectos/github_eventmachine/rakelib/package.rake:34:in `hack_cross_compilation'
/home/ibc/Proyectos/github_eventmachine/rakelib/package.rake:44:in `<top (required)>'
/var/lib/gems/1.9.1/gems/rake-0.9.2.2/lib/rake/rake_module.rb:25:in `load'
/var/lib/gems/1.9.1/gems/rake-0.9.2.2/lib/rake/rake_module.rb:25:in `load_rakefile'
/var/lib/gems/1.9.1/gems/rake-0.9.2.2/lib/rake/default_loader.rb:6:in `load'
/var/lib/gems/1.9.1/gems/rake-0.9.2.2/lib/rake/application.rb:569:in `load_imports'
/var/lib/gems/1.9.1/gems/rake-0.9.2.2/lib/rake/application.rb:508:in `raw_load_rakefile'
/var/lib/gems/1.9.1/gems/rake-0.9.2.2/lib/rake/application.rb:82:in `block in load_rakefile'
/var/lib/gems/1.9.1/gems/rake-0.9.2.2/lib/rake/application.rb:133:in `standard_exception_handling'
/var/lib/gems/1.9.1/gems/rake-0.9.2.2/lib/rake/application.rb:81:in `load_rakefile'
/var/lib/gems/1.9.1/gems/rake-0.9.2.2/lib/rake/application.rb:65:in `block in run'
/var/lib/gems/1.9.1/gems/rake-0.9.2.2/lib/rake/application.rb:133:in `standard_exception_handling'
/var/lib/gems/1.9.1/gems/rake-0.9.2.2/lib/rake/application.rb:63:in `run'
/var/lib/gems/1.9.1/gems/rake-0.9.2.2/bin/rake:33:in `<top (required)>'
/usr/local/bin/rake:19:in `load'
/usr/local/bin/rake:19:in `<main>'

More info:

$ gem list| grep rake 
rake (0.9.2.2)
rake-compiler (0.8.3, 0.8.1, 0.8.0)
@tmm1

This commit is unrelated. The failure is from 6923eca in #222

@tmm1

Fixed in f4145c4

@ibc

Works. Thanks a lot.

Please sign in to comment.