mkrf 0.2.0 → 0.2.1

data/lib/mkrf.rb

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

data/lib/mkrf/availability.rb

@@ -26,8 +26,7 @@ module Mkrf
     # * <tt>:headers</tt> -- headers to load by default
     # * <tt>:compiler</tt> -- which compiler to use when determining availability
     # * <tt>:includes</tt> -- directories that should be searched for include files
-    def initialize(options = {})
-      
+    def initialize(options = {})      
       @loaded_libs = (options[:loaded_libs] || Config::CONFIG["LIBS"].gsub('-l', '').split).to_a
       @library_paths = (options[:library_paths] || "").to_a
       # Not sure what COMMON_HEADERS looks like when populated
@@ -74,6 +73,7 @@ module Mkrf
     def has_library?(library, function = "main", *paths)
       logger.info "Checking for library: #{library}"
       return true if library_already_loaded?(library)
+      return true if RUBY_PLATFORM =~ /mswin/ # TODO: find a way on windows
       # Should this be only found_library? or a specialized version with
       # path searching?
       found_library?(library, function)
@@ -139,12 +139,36 @@ module Mkrf
     
     # Returns a string of libraries formatted for compilation
     def library_compile_string
-      @loaded_libs.collect {|l| "-l#{l}"}.join(' ')
+      if RUBY_PLATFORM =~ /mswin/
+        @loaded_libs.join(' ')
+      else
+        @loaded_libs.collect {|l| "-l#{l}"}.join(' ')
+      end
     end
     
     # Returns a string of libraries directories formatted for compilation
     def library_paths_compile_string
-      @library_paths.collect {|l| "-L#{l}"}.join(' ')
+      if RUBY_PLATFORM =~ /mswin/
+        @library_paths.collect {|l| "/libpath:#{l}"}.join(' ')
+      else
+        @library_paths.collect {|l| "-L#{l}"}.join(' ')
+      end
+    end
+
+    def ldshared_string
+      if RUBY_PLATFORM =~ /mswin/
+        "link -nologo -incremental:no -debug -opt:ref -opt:icf -dll"
+      else
+        Config::CONFIG['LDSHARED']
+      end
+    end
+
+    def ld_outfile(filename) # :nodoc:
+      if RUBY_PLATFORM =~ /mswin/
+        "-out:#{filename}"
+      else
+        "-o #{filename}"
+      end
     end
 
     # Returns a string of include directories formatted for compilation
@@ -243,7 +267,7 @@ module Mkrf
     def header_include_string
       @headers.collect {|header| "#include <#{header}>"}.join('\n')
     end
-    
+
     def link_command
       # This current implementation just splats the library_paths in
       # unconditionally.  Is this problematic?

data/lib/mkrf/generator.rb

@@ -153,24 +153,34 @@ module Mkrf
     def defines_compile_string # :nodoc:
       @available.defines.collect {|define| "-D#{define}"}.join(' ')
     end
-    
+
+    def library_path(path) # :nodoc:
+      if RUBY_PLATFORM =~ /mswin/
+        "-libpath:#{path}"
+      else
+        "-L#{path}"
+      end
+    end
+
     def rakefile_contents # :nodoc:
+      objext = CONFIG['OBJEXT']
+
       <<-END_RAKEFILE
 # Generated by mkrf
 require 'rake/clean'
 
-CLEAN.include('*.o')
+CLEAN.include('*.#{objext}')
 CLOBBER.include('#{@extension_name}', 'mkrf.log')
 
 SRC = FileList[#{sources.join(',')}]
-OBJ = SRC.ext('o')
+OBJ = SRC.ext('#{objext}')
 CC = '#{@cc}'
 
 ADDITIONAL_OBJECTS = '#{objects}'
 
-LDSHARED = "#{CONFIG['LDSHARED']} #{ldshared}"
+LDSHARED = "#{@available.ldshared_string} #{ldshared}"
 
-LIBPATH =  "-L#{CONFIG['rubylibdir']} #{@available.library_paths_compile_string}"
+LIBPATH =  "#{library_path(CONFIG['libdir'])} #{@available.library_paths_compile_string}"
 
 INCLUDES = "#{@available.includes_compile_string}"
 
@@ -179,16 +189,17 @@ LIBS = "#{@available.library_compile_string}"
 CFLAGS = "#{cflags} #{defines_compile_string}"
 
 RUBYARCHDIR = "\#{ENV["RUBYARCHDIR"]}"
+LIBRUBYARG_SHARED = "#{CONFIG['LIBRUBYARG_SHARED']}"
 
 task :default => ['#{@extension_name}']
 
-rule '.o' => '.c' do |t|
-  sh "\#{CC} \#{CFLAGS} \#{INCLUDES} -c -o \#{t.name} \#{t.source}"
+rule '.#{objext}' => '.c' do |t|
+  sh "\#{CC} \#{CFLAGS} \#{INCLUDES} -c \#{t.source}"
 end
 
 desc "Build this extension"
 file '#{@extension_name}' => OBJ do
-  sh "\#{LDSHARED} \#{LIBPATH} -o #{@extension_name} \#{OBJ} \#{ADDITIONAL_OBJECTS} \#{LIBS}"
+  sh "\#{LDSHARED} \#{LIBPATH} #{@available.ld_outfile(@extension_name)} \#{OBJ} \#{ADDITIONAL_OBJECTS} \#{LIBS} \#{LIBRUBYARG_SHARED}"
 end
 
 desc "Install this extension"

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: mkrf
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-02-03 00:00:00 +09:00
+  version: 0.2.1
+date: 2007-04-14 00:00:00 +09:00
 summary: Generate Rakefiles to Build C Extensions to Ruby
 require_paths: 
 - lib
@@ -33,11 +33,11 @@ files:
 - README
 - CHANGELOG
 - MIT-LICENSE
-- lib/mkrf.rb
 - lib/mkrf
-- lib/mkrf/availability.rb
+- lib/mkrf.rb
 - lib/mkrf/rakehelper.rb
 - lib/mkrf/generator.rb
+- lib/mkrf/availability.rb
 - test/integration
 - test/sample_files
 - test/fixtures
@@ -96,17 +96,18 @@ files:
 - 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/syck-0.55/ext
+- test/sample_files/syck-0.55/tests
+- test/sample_files/syck-0.55/config
+- test/sample_files/syck-0.55/lib
 - test/sample_files/syck-0.55/CHANGELOG
 - test/sample_files/syck-0.55/configure.in
 - test/sample_files/syck-0.55/configure
 - test/sample_files/syck-0.55/TODO
 - test/sample_files/syck-0.55/config.h
 - test/sample_files/syck-0.55/config.status
-- test/sample_files/syck-0.55/tests
 - test/sample_files/syck-0.55/README
 - test/sample_files/syck-0.55/aclocal.m4
 - test/sample_files/syck-0.55/RELEASE
-- test/sample_files/syck-0.55/config
 - test/sample_files/syck-0.55/Makefile.am
 - test/sample_files/syck-0.55/config.h.in
 - test/sample_files/syck-0.55/README.BYTECODE
@@ -114,18 +115,17 @@ files:
 - test/sample_files/syck-0.55/bootstrap
 - test/sample_files/syck-0.55/README.EXT
 - test/sample_files/syck-0.55/Makefile
-- test/sample_files/syck-0.55/lib
 - test/sample_files/syck-0.55/stamp-h1
 - test/sample_files/syck-0.55/COPYING
 - test/sample_files/syck-0.55/ext/ruby
 - test/sample_files/syck-0.55/ext/ruby/ext
-- test/sample_files/syck-0.55/ext/ruby/CHANGELOG
-- test/sample_files/syck-0.55/ext/ruby/install.rb
 - test/sample_files/syck-0.55/ext/ruby/tests
-- test/sample_files/syck-0.55/ext/ruby/README
 - test/sample_files/syck-0.55/ext/ruby/samples
 - test/sample_files/syck-0.55/ext/ruby/lib
 - test/sample_files/syck-0.55/ext/ruby/yts
+- test/sample_files/syck-0.55/ext/ruby/CHANGELOG
+- test/sample_files/syck-0.55/ext/ruby/install.rb
+- test/sample_files/syck-0.55/ext/ruby/README
 - test/sample_files/syck-0.55/ext/ruby/ext/syck
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/gram.c
 - test/sample_files/syck-0.55/ext/ruby/ext/syck/bytecode.c
@@ -149,9 +149,9 @@ files:
 - test/sample_files/syck-0.55/ext/ruby/samples/okayNews-modules.rb
 - test/sample_files/syck-0.55/ext/ruby/samples/okayRpc-client.rb
 - test/sample_files/syck-0.55/ext/ruby/samples/okayRpc-server.rb
-- test/sample_files/syck-0.55/ext/ruby/lib/yaml.rb
 - test/sample_files/syck-0.55/ext/ruby/lib/okay
 - test/sample_files/syck-0.55/ext/ruby/lib/yaml
+- test/sample_files/syck-0.55/ext/ruby/lib/yaml.rb
 - test/sample_files/syck-0.55/ext/ruby/lib/okay.rb
 - test/sample_files/syck-0.55/ext/ruby/lib/yod.rb
 - test/sample_files/syck-0.55/ext/ruby/lib/okay/rpc.rb
@@ -230,9 +230,9 @@ files:
 - test/sample_files/libtrivial/ext
 - test/sample_files/libtrivial/ext/libtrivial.c
 - test/sample_files/libtrivial/ext/extconf.rb
+- test/fixtures/down_a_directory
 - test/fixtures/stdmkrf.h
 - test/fixtures/some_binary
-- test/fixtures/down_a_directory
 - test/fixtures/down_a_directory/header_down_a_directory.h
 - test/unit/test_generator.rb
 - test/unit/test_availability.rb