mkmf-lite 0.1.0 → 0.2.0

data/CHANGES

@@ -1,2 +1,6 @@
+= 0.2.0 - 8-Jun-2010
+* Now works properly with JRuby (though it still requires a compiler
+  somewhere on your system).
+
 = 0.1.0 - 24-May-2010
 * Initial release.

data/README

@@ -1,7 +1,13 @@
-= Summary
+== Summary
   A light version of mkmf designed for use within programs.
 
-= Synopsis
+== Installation
+  gem install mkmf-lite
+
+== Prerequisites
+  A C compiler somewhere on your system.
+
+== Synopsis
   require 'mkmf/lite'
 
   class System
@@ -16,18 +22,26 @@
     end
   end
 
-= Description
+== Description
   The mkmf library that ships as part of the Ruby standard library is not
   meant for use as an internal library. It's strictly designed for building
   C extensions. It's huge, its methods sit in a global namespace, it contains
-  many methods you don't care about, and emits output to $stdout that cannot
+  many methods you don't care about, and it emits stuff to $stdout that cannot
   easily be disabled. Also, the source code is monstrous.
 
-  The mkmf-lite is a module, it's small, and it's designed to be mixed into
-  classes. It contains a handful of methods that, most likely, will be used
-  in conjunction with FFI. Also, the source code is quite readable.
+  The mkmf-lite library is a module, it's small, and it's designed to be mixed
+  into classes. It contains a handful of methods that, most likely, will be
+  used in conjunction with FFI. Also, the source code is quite readable.
+
+  It does not package C extensions, nor generate a log file or a Makefile. It
+  does, however, require that you have a C compiler somewhere on your system.
+
+== Known Issues
+  You may see this warning from JRuby 1.4.x and earlier:
+
+  warning: Useless use of a variable in void context.
 
-  It does not package C extensions, nor generate a log file or a Makefile.
+  You can ignore these (or, upgrade your Jruby).
 
 == License
   Artistic 2.0
@@ -41,5 +55,5 @@
   implied warranties, including, without limitation, the implied
   warranties of merchantability and fitness for a particular purpose.
 
-= Author
+== Author
   Daniel Berger

data/lib/mkmf/lite.rb

@@ -6,13 +6,32 @@ require 'ptools'
 module Mkmf
   module Lite
     # The version of the mkmf-lite library
-    MKMF_LITE_VERSION = '0.1.0'
+    MKMF_LITE_VERSION = '0.2.0'
 
     @@cpp_command   = Config::CONFIG['CC'] || Config::CONFIG['CPP']
-    @@cpp_outfile   = Config::CONFIG['CPPOUTFILE'] # -o conftest.i
-    @@cpp_libraries = Config::CONFIG['LIBS'] + Config::CONFIG['LIBRUBYARG']
+    @@cpp_outfile   = Config::CONFIG['CPPOUTFILE'] || "-o conftest.i"
     @@cpp_srcfile   = 'conftest.c'
 
+    if Config::CONFIG['LIBS']
+      @@cpp_libraries = Config::CONFIG['LIBS'] + Config::CONFIG['LIBRUBYARG']
+    else
+      # TODO: We should adjust this based on OS. For now we're using
+      # arguments I think you'll typically see set on Linux and BSD.
+      @@cpp_libraries = "-lrt -ldl -lcrypt -lm"
+    end
+
+    # JRuby, and possibly others
+    unless @@cpp_command
+      case Config::CONFIG['host_os']
+        when /msdos|mswin|win32|mingw|cygwin/i
+          @@cpp_command = File.which('cl') || File.which('gcc')
+        when /sunos|solaris|hpux/i
+          @@cpp_command = File.which('cc') || File.which('gcc')
+        else
+          @@cpp_command = 'gcc'
+      end
+    end
+
     # Check for the presence of the given +header+ file.
     #
     # Returns true if found, or false if not found.
@@ -71,7 +90,9 @@ module Mkmf
     def get_header_string(headers)
       headers = [headers] unless headers.is_a?(Array)
 
-      unless Config::CONFIG['COMMON_HEADERS'].empty?
+      common_headers = Config::CONFIG['COMMON_HEADERS']
+
+      unless common_headers.nil? || common_headers.empty?
         headers += Config::CONFIG['COMMON_HEADERS'].split
       end
 

data/mkmf-lite.gemspec

@@ -3,7 +3,7 @@ require 'rubygems'
 Gem::Specification.new do |spec|
   spec.name      = 'mkmf-lite'
   spec.summary   = 'A lighter version of mkmf designed for use as a library'
-  spec.version   = '0.1.0'
+  spec.version   = '0.2.0'
   spec.author    = 'Daniel J. Berger'
   spec.license   = 'Artistic 2.0'
   spec.email     = 'djberg96@gmail.com'

data/test/test_mkmf_lite.rb

@@ -22,7 +22,7 @@ class TC_Mkmf_Lite < Test::Unit::TestCase
   end
 
   test "version information" do
-    assert_equal('0.1.0', MKMF_LITE_VERSION)
+    assert_equal('0.2.0', MKMF_LITE_VERSION)
   end
 
   test "have_header basic functionality" do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mkmf-lite
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 -06:00
+date: 2010-06-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ptools
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: test-unit
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 2
         - 0
@@ -54,17 +59,17 @@ extra_rdoc_files:
 - README
 - MANIFEST
 files: 
+- MANIFEST
 - CHANGES
+- README
+- mkmf-lite.gemspec
+- test/test_mkmf_lite.rb
+- Rakefile
 - lib/mkmf/lite.rb
-- lib/mkmf/templates/have_func.erb
 - lib/mkmf/templates/have_func_pointer.erb
 - lib/mkmf/templates/have_header.erb
+- lib/mkmf/templates/have_func.erb
 - lib/mkmf/templates/have_struct_member.erb
-- MANIFEST
-- mkmf-lite.gemspec
-- Rakefile
-- README
-- test/test_mkmf_lite.rb
 has_rdoc: true
 homepage: http://www.rubyforge.org/projects/shards
 licenses: 
@@ -75,23 +80,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: shards
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A lighter version of mkmf designed for use as a library