mkrf 0.2.1 → 0.2.2

data/Rakefile

@@ -43,13 +43,14 @@ namespace :test do
     SAMPLE_DIRS = {
       :trivial => BASE_DIR + '/libtrivial/ext/',
       :syck => BASE_DIR + '/syck-0.55/ext/ruby/ext/syck/',
-      :libxml => BASE_DIR + '/libxml-ruby-0.3.8/ext/xml/'
+      :libxml => BASE_DIR + '/libxml-ruby-0.3.8/ext/xml/',
+      :cpp_bang => BASE_DIR + '/cpp_bang/ext/'
     }
     
     task :default => [:all]
     
     desc "Try to compile all of the sample extensions"
-    task :all => [:trivial, :libxml, :syck]
+    task :all => [:trivial, :libxml, :syck, :cpp_bang]
     
     desc "Try to compile a trivial extension"
     task :trivial do
@@ -66,6 +67,11 @@ namespace :test do
       sh "cd #{SAMPLE_DIRS[:syck]}; ruby extconf.rb; rake"
     end
     
+    desc "Try to compile cpp_bang"
+    task :cpp_bang do
+      sh "cd #{SAMPLE_DIRS[:cpp_bang]}; ruby mkrf_config.rb; rake"
+    end
+
     desc "Clean up after sample tests"
     task :clobber do
       if ENV['PROJECT']

data/lib/mkrf.rb

@@ -1,4 +1,4 @@
 require File.dirname(__FILE__) + '/mkrf/availability'
 require File.dirname(__FILE__) + '/mkrf/generator'
 
-Mkrf::VERSION = "0.2.1"
+Mkrf::VERSION = "0.2.2"

data/lib/mkrf/generator.rb

@@ -75,7 +75,13 @@ module Mkrf
       @extension_name = extension_name + ".#{CONFIG['DLEXT']}"
       @available = Mkrf::Availability.new(availability_options)
       @defines = []
-      @cc = CONFIG['CC']
+      if @sources[0] =~ /cpp/
+        @cc = 'g++' # should be in CONFIG['C++'] but is not.
+        @source_extension = 'cpp'
+      else
+        @cc = CONFIG['CC']
+        @source_extension = 'c'
+      end
       
       @objects  = ''
       @ldshared = ''
@@ -193,7 +199,7 @@ LIBRUBYARG_SHARED = "#{CONFIG['LIBRUBYARG_SHARED']}"
 
 task :default => ['#{@extension_name}']
 
-rule '.#{objext}' => '.c' do |t|
+rule '.#{objext}' => '.#{@source_extension}' do |t|
   sh "\#{CC} \#{CFLAGS} \#{INCLUDES} -c \#{t.source}"
 end
 

data/test/sample_files/cpp_bang/ext/bang.cpp

@@ -0,0 +1,15 @@
+#include <iostream>
+#include <ruby.h>
+
+VALUE rk_mBang;
+
+static VALUE t_bang(VALUE self) {
+  return rb_str_new2("Bang !");
+}
+
+extern "C" void Init_bang() {
+  // define the class 'Hello'
+  rk_mBang = rb_define_module("Bang");
+  rb_define_singleton_method(rk_mBang, "bang", (VALUE(*)(...))t_bang, 0);
+}
+

data/test/sample_files/cpp_bang/ext/mkrf_config.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+require 'mkrf'
+
+Mkrf::Generator.new('bang', ["*.cpp"]) do |g|
+  g.ldshared << ' -L/usr/lib -lgcc -lstdc++'
+end

data/test/sample_files/libtrivial/ext/Rakefile

@@ -0,0 +1,43 @@
+# Generated by mkrf
+require 'rake/clean'
+
+CLEAN.include('*.o')
+CLOBBER.include('libtrivial.so', 'mkrf.log')
+
+SRC = FileList['*.c']
+OBJ = SRC.ext('o')
+CC = 'gcc'
+
+ADDITIONAL_OBJECTS = ''
+
+LDSHARED = "gcc -shared "
+
+LIBPATH =  "-L/usr/lib "
+
+INCLUDES = "-I/usr/include -I/usr/lib/ruby/1.8/i486-linux -I/usr/local/lib/site_ruby/1.8 -I."
+
+LIBS = "-lpthread -ldl -lcrypt -lm"
+
+CFLAGS = " -fPIC -Wall -g -fno-strict-aliasing -O2  -fPIC  "
+
+RUBYARCHDIR = "#{ENV["RUBYARCHDIR"]}"
+LIBRUBYARG_SHARED = "-lruby1.8"
+
+task :default => ['libtrivial.so']
+
+rule '.o' => '.c' do |t|
+  sh "#{CC} #{CFLAGS} #{INCLUDES} -c #{t.source}"
+end
+
+desc "Build this extension"
+file 'libtrivial.so' => OBJ do
+  sh "#{LDSHARED} #{LIBPATH} -o libtrivial.so #{OBJ} #{ADDITIONAL_OBJECTS} #{LIBS} #{LIBRUBYARG_SHARED}"
+end
+
+desc "Install this extension"
+task :install => 'libtrivial.so' do
+  makedirs "#{RUBYARCHDIR}"
+  install "libtrivial.so", "#{RUBYARCHDIR}"
+end
+
+

data/test/sample_files/libtrivial/ext/mkrf.log

@@ -0,0 +1,3 @@
+# Logfile created on Wed Jul 18 08:51:58 +0900 2007 by logger.rb/1.5.2.9
+I, [2007-07-18T08:51:58.554535 #26060]  INFO -- : Rakefile written
+I, [2007-07-18T08:52:30.605975 #26370]  INFO -- : Rakefile written

data/test/sample_files/libxml-ruby-0.3.8/ext/xml/Rakefile

@@ -0,0 +1,43 @@
+# Generated by mkrf
+require 'rake/clean'
+
+CLEAN.include('*.o')
+CLOBBER.include('libxml_so.so', 'mkrf.log')
+
+SRC = FileList['*.c']
+OBJ = SRC.ext('o')
+CC = 'gcc'
+
+ADDITIONAL_OBJECTS = ''
+
+LDSHARED = "gcc -shared "
+
+LIBPATH =  "-L/usr/lib "
+
+INCLUDES = "-I/usr/include -I/usr/lib/ruby/1.8/i486-linux -I/usr/local/lib/site_ruby/1.8 -I. -I/usr/include/libxml2"
+
+LIBS = "-lpthread -ldl -lcrypt -lm -lnsl -lz -lc -lxml2 -lxml2"
+
+CFLAGS = " -fPIC -Wall -g -fno-strict-aliasing -O2  -fPIC  -DHAVE_ZLIB_H -DHAVE_LIBXML_XMLVERSION_H"
+
+RUBYARCHDIR = "#{ENV["RUBYARCHDIR"]}"
+LIBRUBYARG_SHARED = "-lruby1.8"
+
+task :default => ['libxml_so.so']
+
+rule '.o' => '.c' do |t|
+  sh "#{CC} #{CFLAGS} #{INCLUDES} -c #{t.source}"
+end
+
+desc "Build this extension"
+file 'libxml_so.so' => OBJ do
+  sh "#{LDSHARED} #{LIBPATH} -o libxml_so.so #{OBJ} #{ADDITIONAL_OBJECTS} #{LIBS} #{LIBRUBYARG_SHARED}"
+end
+
+desc "Install this extension"
+task :install => 'libxml_so.so' do
+  makedirs "#{RUBYARCHDIR}"
+  install "libxml_so.so", "#{RUBYARCHDIR}"
+end
+
+

data/test/sample_files/libxml-ruby-0.3.8/ext/xml/mkrf.log

@@ -0,0 +1,47 @@
+# Logfile created on Wed Jul 18 08:51:58 +0900 2007 by logger.rb/1.5.2.9
+I, [2007-07-18T08:51:58.965489 #26069]  INFO -- : Checking for library: socket
+W, [2007-07-18T08:51:59.005838 #26069]  WARN -- : Function not found: socket()
+W, [2007-07-18T08:51:59.005977 #26069]  WARN -- : Library not found: socket
+I, [2007-07-18T08:51:59.006065 #26069]  INFO -- : Checking for library: nsl
+I, [2007-07-18T08:51:59.071232 #26069]  INFO -- : Function found: gethostbyname()
+I, [2007-07-18T08:51:59.071373 #26069]  INFO -- : Library found: nsl
+I, [2007-07-18T08:51:59.071460 #26069]  INFO -- : Checking for library: z
+I, [2007-07-18T08:51:59.128352 #26069]  INFO -- : Function found: inflate()
+I, [2007-07-18T08:51:59.128495 #26069]  INFO -- : Library found: z
+I, [2007-07-18T08:51:59.128580 #26069]  INFO -- : Checking for library: iconv
+W, [2007-07-18T08:51:59.184066 #26069]  WARN -- : Function not found: iconv_open()
+W, [2007-07-18T08:51:59.184258 #26069]  WARN -- : Library not found: iconv
+I, [2007-07-18T08:51:59.184346 #26069]  INFO -- : Checking for library: c
+I, [2007-07-18T08:51:59.248856 #26069]  INFO -- : Function found: iconv_open()
+I, [2007-07-18T08:51:59.249016 #26069]  INFO -- : Library found: c
+I, [2007-07-18T08:51:59.249223 #26069]  INFO -- : Checking for library: xml2
+I, [2007-07-18T08:51:59.319904 #26069]  INFO -- : Function found: xmlParseDoc()
+I, [2007-07-18T08:51:59.320072 #26069]  INFO -- : Library found: xml2
+I, [2007-07-18T08:51:59.430908 #26069]  INFO -- : Header found: libxml/xmlversion.h
+I, [2007-07-18T08:51:59.431078 #26069]  INFO -- : Checking for library: xml2
+I, [2007-07-18T08:51:59.431142 #26069]  INFO -- : Library already loaded: xml2
+I, [2007-07-18T08:51:59.495697 #26069]  INFO -- : Function found: docbCreateFileParserCtxt()
+I, [2007-07-18T08:51:59.496539 #26069]  INFO -- : Rakefile written
+I, [2007-07-18T08:52:30.900937 #26373]  INFO -- : Checking for library: socket
+W, [2007-07-18T08:52:30.939047 #26373]  WARN -- : Function not found: socket()
+W, [2007-07-18T08:52:30.939167 #26373]  WARN -- : Library not found: socket
+I, [2007-07-18T08:52:30.939238 #26373]  INFO -- : Checking for library: nsl
+I, [2007-07-18T08:52:30.989344 #26373]  INFO -- : Function found: gethostbyname()
+I, [2007-07-18T08:52:30.989468 #26373]  INFO -- : Library found: nsl
+I, [2007-07-18T08:52:30.989541 #26373]  INFO -- : Checking for library: z
+I, [2007-07-18T08:52:31.041133 #26373]  INFO -- : Function found: inflate()
+I, [2007-07-18T08:52:31.041259 #26373]  INFO -- : Library found: z
+I, [2007-07-18T08:52:31.041335 #26373]  INFO -- : Checking for library: iconv
+W, [2007-07-18T08:52:31.081884 #26373]  WARN -- : Function not found: iconv_open()
+W, [2007-07-18T08:52:31.093045 #26373]  WARN -- : Library not found: iconv
+I, [2007-07-18T08:52:31.093128 #26373]  INFO -- : Checking for library: c
+I, [2007-07-18T08:52:31.151068 #26373]  INFO -- : Function found: iconv_open()
+I, [2007-07-18T08:52:31.151204 #26373]  INFO -- : Library found: c
+I, [2007-07-18T08:52:31.151279 #26373]  INFO -- : Checking for library: xml2
+I, [2007-07-18T08:52:31.215566 #26373]  INFO -- : Function found: xmlParseDoc()
+I, [2007-07-18T08:52:31.215708 #26373]  INFO -- : Library found: xml2
+I, [2007-07-18T08:52:31.321932 #26373]  INFO -- : Header found: libxml/xmlversion.h
+I, [2007-07-18T08:52:31.322115 #26373]  INFO -- : Checking for library: xml2
+I, [2007-07-18T08:52:31.322176 #26373]  INFO -- : Library already loaded: xml2
+I, [2007-07-18T08:52:31.385246 #26373]  INFO -- : Function found: docbCreateFileParserCtxt()
+I, [2007-07-18T08:52:31.386239 #26373]  INFO -- : Rakefile written

data/test/sample_files/syck-0.55/ext/ruby/ext/syck/Rakefile

@@ -0,0 +1,43 @@
+# Generated by mkrf
+require 'rake/clean'
+
+CLEAN.include('*.o')
+CLOBBER.include('syck.so', 'mkrf.log')
+
+SRC = FileList['*.c']
+OBJ = SRC.ext('o')
+CC = 'gcc'
+
+ADDITIONAL_OBJECTS = ''
+
+LDSHARED = "gcc -shared "
+
+LIBPATH =  "-L/usr/lib "
+
+INCLUDES = "-I/usr/include -I/usr/lib/ruby/1.8/i486-linux -I/usr/local/lib/site_ruby/1.8 -I."
+
+LIBS = "-lpthread -ldl -lcrypt -lm"
+
+CFLAGS = " -fPIC -Wall -g -fno-strict-aliasing -O2  -fPIC  -DHAVE_ST_H"
+
+RUBYARCHDIR = "#{ENV["RUBYARCHDIR"]}"
+LIBRUBYARG_SHARED = "-lruby1.8"
+
+task :default => ['syck.so']
+
+rule '.o' => '.c' do |t|
+  sh "#{CC} #{CFLAGS} #{INCLUDES} -c #{t.source}"
+end
+
+desc "Build this extension"
+file 'syck.so' => OBJ do
+  sh "#{LDSHARED} #{LIBPATH} -o syck.so #{OBJ} #{ADDITIONAL_OBJECTS} #{LIBS} #{LIBRUBYARG_SHARED}"
+end
+
+desc "Install this extension"
+task :install => 'syck.so' do
+  makedirs "#{RUBYARCHDIR}"
+  install "syck.so", "#{RUBYARCHDIR}"
+end
+
+

data/test/sample_files/syck-0.55/ext/ruby/ext/syck/mkrf.log

@@ -0,0 +1,5 @@
+# Logfile created on Wed Jul 18 08:52:04 +0900 2007 by logger.rb/1.5.2.9
+I, [2007-07-18T08:52:04.386804 #26187]  INFO -- : Header found: st.h
+I, [2007-07-18T08:52:04.387435 #26187]  INFO -- : Rakefile written
+I, [2007-07-18T08:52:31.793730 #26426]  INFO -- : Header found: st.h
+I, [2007-07-18T08:52:31.798322 #26426]  INFO -- : Rakefile written

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: mkrf
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2007-04-14 00:00:00 +09:00
+  version: 0.2.2
+date: 2007-07-18 00:00:00 +09:00
 summary: Generate Rakefiles to Build C Extensions to Ruby
 require_paths: 
 - lib
@@ -47,6 +47,7 @@ files:
 - test/sample_files/libxml-ruby-0.3.8
 - test/sample_files/syck-0.55
 - test/sample_files/libtrivial
+- test/sample_files/cpp_bang
 - test/sample_files/libxml-ruby-0.3.8/ext
 - test/sample_files/libxml-ruby-0.3.8/CHANGELOG
 - test/sample_files/libxml-ruby-0.3.8/README
@@ -95,6 +96,29 @@ files:
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_dtd.c
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_schema.h
 - test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_parser_context.c
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/mkrf.log
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/Rakefile
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_node.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_node_set.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_schema.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_input_cbg.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xpath_context.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xpointer.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xinclude.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_attr.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_ns.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_tree.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/cbg.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/libxml.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_document.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_parser.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xpath.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_sax_parser.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_attribute.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_xpointer_context.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_dtd.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/ruby_xml_parser_context.o
+- test/sample_files/libxml-ruby-0.3.8/ext/xml/libxml_so.so
 - test/sample_files/syck-0.55/ext
 - test/sample_files/syck-0.55/tests
 - test/sample_files/syck-0.55/config
@@ -142,6 +166,19 @@ files:
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/extconf.rb
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/node.c
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/syck.h
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/mkrf.log
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/Rakefile
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/rubyext.o
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/gram.o
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/bytecode.o
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/yaml2byte.o
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/implicit.o
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/syck.o
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/emitter.o
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/token.o
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/handler.o
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/node.o
+- test/sample_files/syck-0.55/ext/ruby/ext/syck/syck.so
 - test/sample_files/syck-0.55/ext/ruby/tests/basic.rb
 - test/sample_files/syck-0.55/ext/ruby/samples/yaml-sortHashKeys.rb
 - test/sample_files/syck-0.55/ext/ruby/samples/okayNews-sample.rb
@@ -230,6 +267,13 @@ files:
 - test/sample_files/libtrivial/ext
 - test/sample_files/libtrivial/ext/libtrivial.c
 - test/sample_files/libtrivial/ext/extconf.rb
+- test/sample_files/libtrivial/ext/mkrf.log
+- test/sample_files/libtrivial/ext/Rakefile
+- test/sample_files/libtrivial/ext/libtrivial.o
+- test/sample_files/libtrivial/ext/libtrivial.so
+- test/sample_files/cpp_bang/ext
+- test/sample_files/cpp_bang/ext/bang.cpp
+- test/sample_files/cpp_bang/ext/mkrf_config.rb
 - test/fixtures/down_a_directory
 - test/fixtures/stdmkrf.h
 - test/fixtures/some_binary