Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixed is_meta_singleton vs rb_is_meta_singleton bug

  • Loading branch information...
commit 005f367f1b640aa1d802e84fd92a4442c1525959 1 parent 44566da
@banister authored
View
14 Rakefile
@@ -9,7 +9,8 @@ direc = File.dirname(__FILE__)
CLOBBER.include("**/*.#{dlext}", "**/*~", "**/*#*", "**/*.log", "**/*.o", "doc/**")
CLEAN.include("ext/**/*.#{dlext}", "ext/**/.log", "ext/**/.o", "ext/**/*~",
- "ext/**/*#*", "ext/**/.obj", "ext/**/.def", "ext/**/.pdb")
+ "ext/**/*#*", "ext/**/.obj", "ext/**/.def",
+ "ext/**/.pdb", "*flymake*", "*flymake*.*")
def apply_spec_defaults(s)
s.name = "object2module"
@@ -44,6 +45,8 @@ end
pkg.need_zip = false
pkg.need_tar = false
end
+
+ task :gem => :clean
end
end
@@ -58,10 +61,15 @@ namespace :ruby do
pkg.need_zip = false
pkg.need_tar = false
end
+
+ task :gem => :clean
end
+directories = ["#{direc}/lib/1.8", "#{direc}/lib/1.9"]
+directories.each { |d| directory d }
+
desc "build the 1.8 and 1.9 binaries from source and copy to lib/"
-task :compile do
+task :compile => [:clobber, *directories] do
build_for = proc do |pik_ver, ver|
sh %{ \
c:\\devkit\\devkitvars.bat && \
@@ -80,7 +88,7 @@ task :compile do
end
desc "build all platform gems at once"
-task :gems => [:rmgems, "mingw32:gem", "mswin32:gem", "ruby:gem"]
+task :gems => [:clean, :rmgems, "mingw32:gem", "mswin32:gem", "ruby:gem"]
desc "remove all platform gems"
task :rmgems => ["ruby:clobber_package"]
View
2  ext/object2module/object2module.c
@@ -72,7 +72,7 @@ rb_gen_include_one(VALUE klass, VALUE module)
c = klass;
// loop until superclass is 0 (for modules) or superclass is a meta^n singleton of Object (for classes)
- while (module && !rb_is_meta_singleton_of(module, rb_cObject)) {
+ while (module && !is_meta_singleton_of(module, rb_cObject)) {
int superclass_seen = FALSE;
if (RCLASS_M_TBL(klass) == RCLASS_M_TBL(module))
View
2  lib/object2module/version.rb
@@ -1,3 +1,3 @@
module Object2module
- VERSION = "0.5.0"
+ VERSION = "0.5.1"
end
Please sign in to comment.
Something went wrong with that request. Please try again.