mutant-melbourne 2.0.1 → 2.0.2

data/Rakefile

@@ -4,11 +4,11 @@ require "rubygems/package_task"
 desc "Compile the C extension"
 Rake::ExtensionTask.new('melbourne')
 
-gemspec = eval(File.read("melbourne.gemspec"))
+gemspec = eval(File.read("mutant-melbourne.gemspec"))
 desc "Build the gem"
 Gem::PackageTask.new(gemspec).define
 
 desc "Install the gem"
 task :install => :repackage do
-  sh "gem install pkg/melbourne-*.gem"
+  sh "gem install pkg/mutant-melbourne-*.gem"
 end

data/ext/melbourne/extconf.rb

@@ -1,87 +1,86 @@
-unless(defined?(RUBY_ENGINE) and RUBY_ENGINE == 'rbx')
-require 'mkmf'
+unless(defined?(RUBY_ENGINE) and %w(rbx jruby).include?(RUBY_ENGINE))
+  require 'mkmf'
 
-def add_lib(name)
-  i, lib = dir_config(name)
-  $libs << " #{lib}/lib#{name}.a "
-end
-
-# add_lib("mquark")
-# add_lib("bstring")
-# add_lib("ptr_array")
-# add_lib("cchash")
-
-#have_library("bstring")
-#have_library("mquark")
-#have_library("ptr_array")
-#have_library("cchash")
-
-$CFLAGS += " -ggdb3"
-
-# Courtesy of EventMachine. Thank you EventMachine and tmm1 !
-case RUBY_PLATFORM
-when /mswin32/, /mingw32/, /bccwin32/
-  check_heads(%w[windows.h winsock.h], true)
-  check_libs(%w[kernel32 rpcrt4 gdi32], true)
-
-  if GNU_CHAIN
-    CONFIG['LDSHARED'] = "$(CXX) -shared -lstdc++"
-  else
-    $defs.push "-EHs"
-    $defs.push "-GR"
+  def add_lib(name)
+    i, lib = dir_config(name)
+    $libs << " #{lib}/lib#{name}.a "
   end
 
-when /solaris/
-  add_define 'OS_SOLARIS8'
+  # add_lib("mquark")
+  # add_lib("bstring")
+  # add_lib("ptr_array")
+  # add_lib("cchash")
+
+  #have_library("bstring")
+  #have_library("mquark")
+  #have_library("ptr_array")
+  #have_library("cchash")
+
+  $CFLAGS += " -ggdb3"
+
+  # Courtesy of EventMachine. Thank you EventMachine and tmm1 !
+  case RUBY_PLATFORM
+  when /mswin32/, /mingw32/, /bccwin32/
+    check_heads(%w[windows.h winsock.h], true)
+    check_libs(%w[kernel32 rpcrt4 gdi32], true)
+
+    if GNU_CHAIN
+      CONFIG['LDSHARED'] = "$(CXX) -shared -lstdc++"
+    else
+      $defs.push "-EHs"
+      $defs.push "-GR"
+    end
+
+  when /solaris/
+    add_define 'OS_SOLARIS8'
+
+    if CONFIG['CC'] == 'cc' and `cc -flags 2>&1` =~ /Sun/ # detect SUNWspro compiler
+      # SUN CHAIN
+      add_define 'CC_SUNWspro'
+      $preload = ["\nCXX = CC"] # hack a CXX= line into the makefile
+      $CFLAGS = CONFIG['CFLAGS'] = "-KPIC"
+      CONFIG['CCDLFLAGS'] = "-KPIC"
+      CONFIG['LDSHARED'] = "$(CXX) -G -KPIC -lCstd"
+    else
+      # GNU CHAIN
+      # on Unix we need a g++ link, not gcc.
+      CONFIG['LDSHARED'] = "$(CXX) -shared"
+    end
+
+  when /openbsd/
+    # OpenBSD branch contributed by Guillaume Sellier.
+
+    # on Unix we need a g++ link, not gcc. On OpenBSD, linking against libstdc++ have to be explicitly done for shared libs
+    CONFIG['LDSHARED'] = "$(CXX) -shared -lstdc++ -fPIC"
+    CONFIG['LDSHAREDXX'] = "$(CXX) -shared -lstdc++ -fPIC"
+
+  when /darwin/
+    # on Unix we need a g++ link, not gcc.
+    # Ff line contributed by Daniel Harple.
+    CONFIG['LDSHARED'] = "$(CXX) " + CONFIG['LDSHARED'].split[1..-1].join(' ')
+
+  when /aix/
+    CONFIG['LDSHARED'] = "$(CXX) -shared -Wl,-G -Wl,-brtl"
 
-  if CONFIG['CC'] == 'cc' and `cc -flags 2>&1` =~ /Sun/ # detect SUNWspro compiler
-    # SUN CHAIN
-    add_define 'CC_SUNWspro'
-    $preload = ["\nCXX = CC"] # hack a CXX= line into the makefile
-    $CFLAGS = CONFIG['CFLAGS'] = "-KPIC"
-    CONFIG['CCDLFLAGS'] = "-KPIC"
-    CONFIG['LDSHARED'] = "$(CXX) -G -KPIC -lCstd"
   else
-    # GNU CHAIN
     # on Unix we need a g++ link, not gcc.
     CONFIG['LDSHARED'] = "$(CXX) -shared"
   end
 
-when /openbsd/
-  # OpenBSD branch contributed by Guillaume Sellier.
-
-  # on Unix we need a g++ link, not gcc. On OpenBSD, linking against libstdc++ have to be explicitly done for shared libs
-  CONFIG['LDSHARED'] = "$(CXX) -shared -lstdc++ -fPIC"
-  CONFIG['LDSHAREDXX'] = "$(CXX) -shared -lstdc++ -fPIC"
-
-when /darwin/
-  # on Unix we need a g++ link, not gcc.
-  # Ff line contributed by Daniel Harple.
-  CONFIG['LDSHARED'] = "$(CXX) " + CONFIG['LDSHARED'].split[1..-1].join(' ')
-
-when /aix/
-  CONFIG['LDSHARED'] = "$(CXX) -shared -Wl,-G -Wl,-brtl"
-
-else
-  # on Unix we need a g++ link, not gcc.
-  CONFIG['LDSHARED'] = "$(CXX) -shared"
-end
-
-create_makefile('melbourne')
-
-File.open("Makefile","a+") do |f|
-  f.puts <<END
+  create_makefile('melbourne')
 
+  File.open("Makefile","a+") do |f|
+    f.puts <<END
 grammar.cpp: grammar.y
-	bison -o grammar.cpp grammar.y
+  bison -o grammar.cpp grammar.y
 END
-end
-else
-File.open("Makefile","w+") do |f|
-  f.puts <<END
+   end
+ else
+  File.open("Makefile","w+") do |f|
+    f.puts <<END
 all: 
 
 install:
 END
-end
+  end
 end

data/lib/melbourne.rb

@@ -1,4 +1,4 @@
-unless(defined?(RUBY_ENGINE) and RUBY_ENGINE == 'rbx')
+unless(defined?(RUBY_ENGINE) and %w(rbx jruby).include?(RUBY_ENGINE))
   module Rubinius
 
     unless singleton_methods.map { |name| name.to_s }.include?('ruby18?')

data/lib/melbourne/version.rb

@@ -1,3 +1,3 @@
 module Melbourne
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mutant-melbourne
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors: