RubyInline 3.11.2 → 3.11.3

data.tar.gz.sig

@@ -1 +1,2 @@
-��d6��jmM�
+r�Cۊ��u�ؗ��4�ܙ,�kl��#�룈�H�H�A�*F�xE+*gB���zU1Ŷ������#6txv…I�$#���.�
��⎕.:��
+�"*eo��K��#���n�0M

data/History.txt

@@ -1,3 +1,9 @@
+=== 3.11.3 / 2012-07-05
+
+* 1 bug fix:
+
+  * Fixes for non-mingw windoze builds. (imperator)
+
 === 3.11.2 / 2012-02-22
 
 * 1 bug fix:

data/lib/inline.rb

@@ -65,7 +65,7 @@ class CompilationError < RuntimeError; end
 # the current namespace.
 
 module Inline
-  VERSION = '3.11.2'
+  VERSION = '3.11.3'
 
   WINDOZE  = /mswin|mingw/ =~ RUBY_PLATFORM
   RUBINIUS = defined? RUBY_ENGINE
@@ -293,7 +293,8 @@ module Inline
                 0
               end
 
-      file, line = caller[1].split(/:/)
+      file, line = $1, $2 if caller[1] =~ /(.*?):(\d+)/
+
       result = "# line #{line.to_i + delta} \"#{file}\"\n" + result unless
         $DEBUG and not $TESTING
 
@@ -567,32 +568,44 @@ VALUE #{method}_equals(VALUE value) {
                             nil
                           end
 
+          windoze = WINDOZE and RUBY_PLATFORM =~ /mswin/
+          sane = ! windoze
           cmd = [ RbConfig::CONFIG['LDSHARED'],
                   flags,
-                  RbConfig::CONFIG['DLDFLAGS'],
-                  RbConfig::CONFIG['CCDLFLAGS'],
+                  (RbConfig::CONFIG['DLDFLAGS']         if sane),
+                  (RbConfig::CONFIG['CCDLFLAGS']        if sane),
                   RbConfig::CONFIG['CFLAGS'],
-                  RbConfig::CONFIG['LDFLAGS'],
+                  (RbConfig::CONFIG['LDFLAGS']          if sane),
                   '-I', hdrdir,
                   config_hdrdir,
                   '-I', RbConfig::CONFIG['includedir'],
-                  "-L#{RbConfig::CONFIG['libdir']}",
-                  '-o', so_name.inspect,
+                  ("-L#{RbConfig::CONFIG['libdir']}"    if sane),
+                  (['-o', so_name.inspect]              if sane),
                   File.expand_path(src_name).inspect,
                   libs,
-                  crap_for_windoze ].join(' ')
+                  crap_for_windoze,
+                  (RbConfig::CONFIG['LDFLAGS']          if windoze),
+                  (RbConfig::CONFIG['CCDLFLAGS']        if windoze),
+                ].compact.join(' ')
 
          # strip off some makefile macros for mingw 1.9
          cmd = cmd.gsub(/\$\(.*\)/, '') if RUBY_PLATFORM =~ /mingw/
-        
+
           # TODO: remove after osx 10.5.2
           cmd += ' -flat_namespace -undefined suppress' if
             RUBY_PLATFORM =~ /darwin9\.[01]/
           cmd += " 2> #{DEV_NULL}" if $TESTING and not $DEBUG
 
           warn "Building #{so_name} with '#{cmd}'" if $DEBUG
-          result = `#{cmd}`
+
+          result = if WINDOZE
+                     Dir.chdir(Inline.directory) { `#{cmd}` }
+                   else
+                     `#{cmd}`
+                   end
+
           warn "Output:\n#{result}" if $DEBUG
+
           if $? != 0 then
             bad_src_name = src_name + ".bad"
             File.rename src_name, bad_src_name
@@ -630,7 +643,7 @@ VALUE #{method}_equals(VALUE value) {
       # gawd windoze land sucks
       case RUBY_PLATFORM
       when /mswin32/ then
-        " -link /LIBPATH:\"#{RbConfig::CONFIG['libdir']}\" /DEFAULTLIB:\"#{RbConfig::CONFIG['LIBRUBY']}\" /INCREMENTAL:no /EXPORT:Init_#{module_name}"
+        " -link /OUT:\"#{self.so_name}\" /LIBPATH:\"#{RbConfig::CONFIG['libdir']}\" /DEFAULTLIB:\"#{RbConfig::CONFIG['LIBRUBY']}\" /INCREMENTAL:no /EXPORT:Init_#{module_name}"
       when /mingw32/ then
         c = RbConfig::CONFIG
         " -Wl,--enable-auto-import -L#{c['libdir']} -l#{c['RUBY_SO_NAME']}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RubyInline
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 3
   - 11
-  - 2
-  version: 3.11.2
+  - 3
+  version: 3.11.3
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-02-22 00:00:00 Z
+date: 2012-07-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ZenTest
@@ -61,11 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 7
         segments: 
-        - 2
-        - 11
-        version: "2.11"
+        - 3
+        - 0
+        version: "3.0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -91,11 +91,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 7
         segments: 
-        - 2
-        - 14
-        version: "2.14"
+        - 3
+        - 0
+        version: "3.0"
   type: :development
   version_requirements: *id004
 description: |-
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - A POSIX environment and a compiler for your language.
 rubyforge_project: rubyinline
-rubygems_version: 1.8.12
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Inline allows you to write foreign code within your ruby code