ffi-compiler 0.0.2 → 0.0.3

data/ffi-compiler.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'ffi-compiler'
-  s.version = '0.0.2'
+  s.version = '0.0.3'
   s.author = 'Wayne Meissner'
   s.email = 'wmeissner@gmail.com'
   s.homepage = 'http://wiki.github.com/ffi/ffi'

data/lib/ffi-compiler/task.rb

@@ -2,18 +2,28 @@ require 'rake/tasklib'
 require 'rake/clean'
 require 'ffi'
 require 'tmpdir'
+require 'rbconfig'
 
 module FFI
   class Compiler
+    DEFAULT_CFLAGS = %w(-fexceptions -O -fno-omit-frame-pointer -fno-strict-aliasing)
+    DEFAULT_LDFLAGS = %w(-fexceptions)
+    
     class Task < Rake::TaskLib
+      attr_reader :cflags, :cxxflags, :ldflags, :libs
+      
       def initialize(name)
-        @name = name
+        @name = File.basename(name)
         @defines = []
         @include_paths = []
         @library_paths = []
         @libraries = []
         @headers = []
         @functions = []
+        @cflags = DEFAULT_CFLAGS.dup
+        @cxxflags = DEFAULT_CFLAGS.dup
+        @ldflags = DEFAULT_LDFLAGS.dup
+        @libs = []
 
         yield self if block_given?
         define_task!
@@ -40,55 +50,51 @@ module FFI
         try_library(libname, @library_paths) || try_library(libname, paths)
       end
 
-      def create_rakefile!
-        create_rakefile(@name)
-      end
-
       private
       def define_task!
-        lib_name = FFI.map_library_name(@name)
-        pic_flags = '-fPIC'
-        so_flags = ''
-        ld_flags = ''
-        cc = 'cc'
-        cxx = 'c++'
-        iflags = @include_paths.uniq.map { |p| "-I#{p}" }.join(' ')
-        defines = @functions.uniq.map { |f| "-DHAVE_#{f.upcase}=1" }.join(' ')
-        defines << " " + @headers.uniq.map { |h| "-DHAVE_#{h.upcase.sub(/\./, '_')}=1" }.join(' ')
-
+        pic_flags = %w(-fPIC)
+        so_flags = []
+        
         if FFI::Platform.mac?
-          pic_flags = ''
-          ld_flags += ' -dynamiclib '
+          pic_flags = []
+          so_flags << '-dynamiclib'
 
         elsif FFI::Platform.name =~ /linux/
-          so_flags += " -shared -Wl,-soname,#{lib_name} "
+          so_flags << "-shared -Wl,-soname,#{lib_name}"
+        
+        else
+          so_flags << '-shared'
         end
+        so_flags = so_flags.join(' ')
+
+        lib_name = FFI.map_library_name(@name)
 
-        cflags = "#{pic_flags} #{iflags} #{defines}".strip
-        ld_flags += so_flags
-        ld_flags += @library_paths.map { |path| "-L#{path}" }.join(' ')
-        ld_flags.strip!
-        ld = FileList['*.cpp'].empty? ? cc : cxx
-        cxxflags = cflags
-        libs = @libraries.map { |l| "-l#{l}" }.join(" ")
+        iflags = @include_paths.uniq.map { |p| "-I#{p}" }
+        defines = @functions.uniq.map { |f| "-DHAVE_#{f.upcase}=1" }
+        defines << @headers.uniq.map { |h| "-DHAVE_#{h.upcase.sub(/\./, '_')}=1" }
 
-        obj_files = FileList['*.c', '*.cpp'].map { |f| f.gsub(/\.(c|cpp)$/, '.o') }
+        cflags = (@cflags + pic_flags + iflags + defines).join(' ')
+        cxxflags = (@cxxflags + @cflags + pic_flags + iflags + defines).join(' ')
+        ld_flags = (@library_paths.map { |path| "-L#{path}" } + @ldflags).join(' ')
+        libs = (@libraries.map { |l| "-l#{l}" } + @libs).join(' ')
+
+        src_files = FileList['*.{c,cpp}']
+        obj_files = src_files.ext '.o'
+        ld = src_files.detect { |f| f =~ /\.cpp$/ } ? cxx : cc
 
         CLEAN.include(obj_files)
 
-        desc "Compile C file to object file"
-        rule '.o' => ['.c'] do |t|
+        rule '.o' => '.c' do |t|
           sh "#{cc} #{cflags} -o #{t.name} -c #{t.source}"
         end
 
-        desc "Compile C++ file to object file"
-        rule '.o' => ['.cpp'] do |t|
+        rule '.o' => '.cpp' do |t|
           sh "#{cxx} #{cxxflags} -o #{t.name} -c #{t.source}"
         end
 
-        desc "Compile to dynamic library"
+        desc "Build dynamic library"
         file lib_name => obj_files do |t|
-          sh "#{ld} #{ld_flags} -o #{t.name} #{t.prerequisites.join(' ')} #{libs}"
+          sh "#{ld} #{so_flags} -o #{t.name} #{t.prerequisites.join(' ')} #{ld_flags} #{libs}"
         end
         CLEAN.include(lib_name)
 
@@ -138,16 +144,24 @@ module FFI
       def try_compile(src, *opts)
         Dir.mktmpdir do |dir|
           path = File.join(dir, 'ffi-test.c')
-          File.open(path, "w") do |f|
+          File.open(path, 'w') do |f|
             f << src
           end
           begin
-            return system "cc #{opts.join(' ')} -o #{File.join(dir, 'ffi-test')} #{path} >& /dev/null"
+            return system "#{cc} #{opts.join(' ')} -o #{File.join(dir, 'ffi-test')} #{path} >& /dev/null"
           rescue
             return false
           end
         end
       end
+
+      def cc
+        @cc ||= (ENV['CC'] || RbConfig::CONFIG['CC'] || 'cc')
+      end
+
+      def cxx
+        @cxx ||= (ENV['CXX'] || RbConfig::CONFIG['CXX'] || 'c++')
+      end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-compiler
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -70,7 +70,6 @@ files:
 - Rakefile
 - LICENSE
 - lib/ffi-compiler/loader.rb
-- lib/ffi-compiler/mkrf.rb
 - lib/ffi-compiler/task.rb
 homepage: http://wiki.github.com/ffi/ffi
 licenses:

data/lib/ffi-compiler/mkrf.rb

@@ -1,168 +0,0 @@
-require 'ffi'
-require 'tmpdir'
-
-module FFI
-  class Compiler 
-    def initialize(name, &block)
-      @name = name
-      @defines = []
-      @include_paths = []
-      @library_paths = []
-      @libraries = []
-      @headers = []
-      @functions = []
-
-      if block_given?
-        yield self 
-        create_rakefile!
-      end
-    end
-    
-    def have_func?(func)
-      main = <<-C_FILE
-        extern void #{func}();
-        int main(int argc, char **argv) { #{func}(); return 0; }
-      C_FILE
-      
-      if try_compile(main)
-        @functions << func
-        return true
-      end
-      false
-    end
-    
-    def have_header?(header, *paths)
-      try_header(header, @include_paths) || try_header(header, paths)
-    end
-    
-    def have_library?(libname, *paths)
-      try_library(libname, @library_paths) || try_library(libname, paths)
-    end
-    
-    def create_rakefile!
-      create_rakefile(@name)
-    end
-    
-    private
-
-    def try_header(header, paths)
-      main = <<-C_FILE
-          #include <#{header}>
-          int main(int argc, char **argv) { return 0; }
-      C_FILE
-
-      if paths.empty? && try_compile(main)
-        @headers << header
-        return true
-      end
-
-      paths.each do |path|
-        if try_compile(main, "-I#{path}")
-          @include_paths << path
-          @headers << header
-          return true
-        end
-      end
-      false
-    end
-
-
-    def try_library(libname, paths)
-      main = <<-C_FILE
-        int main(int argc, char **argv) { return 0; }
-      C_FILE
-
-      if paths.empty? && try_compile(main)
-        @libraries << libname
-        return true
-      end
-
-      paths.each do |path|
-        if try_compile(main, "-L#{path}", "-l#{libname}")
-          @library_paths << path
-          @libraries << libname
-        end
-      end
-    end
-
-    def try_compile(src, *opts)
-      Dir.mktmpdir do |dir|
-        path = File.join(dir, 'ffi-test.c')
-        File.open(path, "w") do |f|
-          f << src
-        end
-        begin
-          return system "cc #{opts.join(' ')} -o #{File.join(dir, 'ffi-test')} #{path} >& /dev/null"
-        rescue
-          return false
-        end
-      end
-    end
-
-    def create_rakefile(name)
-      lib_name = FFI.map_library_name(name)
-      pic_flags = '-fPIC'
-      so_flags = ''
-      ld_flags = ''
-      cc = 'cc'
-      cxx = 'c++'
-      iflags = @include_paths.uniq.map{ |p| "-I#{p}" }.join(' ')
-      defines = @functions.uniq.map { |f| "-DHAVE_#{f.upcase}=1" }.join(' ')
-      defines << " " + @headers.uniq.map { |h| "-DHAVE_#{h.upcase.sub(/\./, '_')}=1" }.join(' ')
-      
-      if FFI::Platform.mac?
-        pic_flags = ''
-        ld_flags += ' -dynamiclib '
-        
-      elsif FFI::Platform.name =~ /linux/
-        so_flags += " -shared -Wl,-soname,#{lib_name} "
-      end
-
-      cflags = "#{pic_flags} #{iflags} #{defines}".strip
-      ld_flags += so_flags
-      ld_flags += @library_paths.map { |path| "-L#{path}" }.join(' ')
-      ld_flags.strip!
-      
-      File.open('Rakefile', 'w') do |f|
-        f.puts <<-RAKEFILE
-
-require 'rake/clean'
-
-CC = '#{cc}'
-CXX = '#{cxx}'
-LD = FileList['*.cpp'].empty? ? CC : CXX
-CFLAGS = '#{cflags}'
-CXXFLAGS = '#{cflags}'
-LDFLAGS = '#{ld_flags}'
-LIBS = '#{@libraries.map {|l| "-l#{l}" }.join(" ")}' 
-
-OBJ_FILES = FileList['*.c', '*.cpp'].map { |f| f.gsub(/\.(c|cpp)$/, '.o') }
-
-CLEAN.include(OBJ_FILES)
-
-desc "Compile C file to object file"
-rule '.o' => [ '.c' ] do |t|
-  sh "\#{CC} \#{CFLAGS} -o \#{t.name} -c \#{t.source}"
-end
-
-desc "Compile C++ file to object file"
-rule '.o' => [ '.cpp' ] do |t|
-  sh "\#{CXX} \#{CXXFLAGS} -o \#{t.name} -c \#{t.source} "
-end
-
-desc "Compile to dynamic library"
-task :compile => "#{lib_name}"
-
-file "#{lib_name}" => OBJ_FILES do |t|
-  sh "\#{LD} \#{LDFLAGS} -o \#{t.name} \#{t.prerequisites.join(' ')} \#{LIBS}"
-end
-
-task :default => :compile
-
-    RAKEFILE
-      end
-    end
-
-  end
-end
-