hitimes 1.0.1 → 1.0.2

data/HISTORY

@@ -1,16 +1,23 @@
 = Changelog
+== Version 1.0.2 2009-06-28
+
+* Fix bug with time.h on linode (reported by Roger Pack) 
+* Fix potential garbage collection issue with Interval class
+* Windows gem is now a fat binary to support installing in 1.8 or 1.9 from the
+  same gem
+
 == Version 1.0.1 2009-06-12
 
 * Fix examples
-* performance tuning, new Metric classes are faster than old Timer class
+* performance tuning, new Hitimes::Metric derived classes are faster than old Timer class
 
 == Version 1.0.0 2009-06-12
 
 * Major version bump with complete refactor of the metric collection API
 * 3 types of metrics now instead of just 1 Timer
-  * ValueMetric
-  * TimedMetric
-  * TimedValueMetric
+  * Hitimes::ValueMetric
+  * Hitimes::TimedMetric
+  * Hitimes::TimedValueMetric
 * The ability to convert all metrics #to_hash
 * Updated documentation with examples using each metric type
 
@@ -23,7 +30,7 @@
 
 * Added new stat 'rate'
 * Added new stat method to_hash
-* Added MutexedStats class for threadsafe stats collection 
+* Added Hitimes::MutexedStats class for threadsafe stats collection 
   - not needed when used in MRI 1.8.x
 * remove stale dependency on mkrf
 
@@ -41,7 +48,7 @@
 == Version 0.2.0
 
 * Performance improvements
-* Added Stats class
+* Added Hitimes::Stats class
 
 == Version 0.1.0
 

data/Rakefile

@@ -59,5 +59,8 @@ Rake.application.tasks.each do |t|
   if t.name =~ /:clobber/ then
     task :clobber => [t.name] 
   end 
+  if t.name =~ /:clean/ then
+    task :clean => [t.name]
+  end
 end
 

data/ext/{extconf.rb → hitimes/extconf.rb}

@@ -12,4 +12,10 @@ else
   end
 end
 
-create_makefile('hitimes_ext')
+# put in a different location if on windows so we can have fat binaries
+parent_dir = "hitimes"
+if RUBY_PLATFORM =~ /(mswin|mingw)/i then
+  v = RUBY_VERSION.gsub(/\.\d$/,'')
+  parent_dir = File.join( parent_dir, v )
+end
+create_makefile("#{parent_dir}/hitimes_ext")

data/ext/{hitimes_instant_clock_gettime.c → hitimes/hitimes_instant_clock_gettime.c}

@@ -2,11 +2,14 @@
 
 #include "hitimes_interval.h"
 
-#include <sys/time.h>
+#include <time.h>
 #ifndef CLOCK_MONOTONIC
-# ifdef __linux__
-#    include <linux/time.h>
-# endif
+#  include <sys/time.h>
+#  ifndef CLOCK_MONOTONIC
+#    ifdef __linux__
+#      include <linux/time.h>
+#    endif
+#  endif
 #endif
 
 hitimes_instant_t hitimes_get_current_instant( )

data/ext/{hitimes_instant_windows.c → hitimes/hitimes_instant_windows.c}

@@ -7,7 +7,7 @@
  * returns the conversion factor, this value is used to convert
  * the value from hitimes_get_current_instant() into seconds
  */
-double hitimes_instant_conversion_factor()
+long double hitimes_instant_conversion_factor()
 {
     LARGE_INTEGER ticks_per_second;
     QueryPerformanceFrequency( &ticks_per_second );

data/ext/{hitimes_interval.c → hitimes/hitimes_interval.c}

@@ -16,10 +16,6 @@ VALUE cH_Interval;         /* class  Hitimes::Interval  */
 
 VALUE hitimes_interval_free(hitimes_interval_t* i) 
 {
-    if ( Qnil != i->duration ) {
-        rb_gc_unregister_address( &(i->duration) );
-        i->duration = Qnil;
-    }
     xfree( i );
     return Qnil;
 }
@@ -31,7 +27,7 @@ VALUE hitimes_interval_alloc(VALUE klass)
 
     i->start_instant = 0L;
     i->stop_instant  = 0L;
-    i->duration      = Qnil;
+    i->duration      = -1.0l;
 
     obj = Data_Wrap_Struct(klass, NULL, hitimes_interval_free, i);
     return obj;
@@ -50,7 +46,7 @@ VALUE hitimes_interval_now( VALUE self )
 
     i->start_instant = hitimes_get_current_instant( );
     i->stop_instant  = 0L;
-    i->duration      = Qnil;
+    i->duration      = -1.0l;
 
     obj = Data_Wrap_Struct(cH_Interval, NULL, hitimes_interval_free, i);
 
@@ -67,7 +63,7 @@ VALUE hitimes_interval_measure( VALUE self )
 {
     hitimes_instant_t before;
     hitimes_instant_t after;
-    double            duration;
+    long double       duration;
 
     if ( !rb_block_given_p() ) {
         rb_raise(eH_Error, "No block given to Interval.measure" );
@@ -99,7 +95,7 @@ VALUE hitimes_interval_split( VALUE self )
 
     second->start_instant = first->stop_instant;
     second->stop_instant  = 0L;
-    second->duration      = Qnil;
+    second->duration      = -1.0l;
 
     obj = Data_Wrap_Struct(cH_Interval, NULL, hitimes_interval_free, second);
 
@@ -124,7 +120,7 @@ VALUE hitimes_interval_start( VALUE self )
     if ( 0L == i->start_instant ) {
       i->start_instant = hitimes_get_current_instant( );
       i->stop_instant  = 0L;
-      i->duration      = Qnil;
+      i->duration      = -1.0l;
 
       rc = Qtrue;
     }
@@ -152,13 +148,9 @@ VALUE hitimes_interval_stop( VALUE self )
     }
 
     if ( 0L == i->stop_instant ) {
-      double d;
-
       i->stop_instant = hitimes_get_current_instant( );
-      d = ( i->stop_instant - i->start_instant ) / HITIMES_INSTANT_CONVERSION_FACTOR;
-      i->duration = rb_float_new( d );
-      rb_gc_register_address( &(i->duration) );
-      rc = i->duration;
+      i->duration = ( i->stop_instant - i->start_instant ) / HITIMES_INSTANT_CONVERSION_FACTOR;
+      rc = rb_float_new( i->duration );
     }
 
     return rc;
@@ -176,7 +168,6 @@ VALUE hitimes_interval_duration_so_far( VALUE self )
 {
     hitimes_interval_t *i;
     VALUE               rc = Qfalse;
-    double              d;
 
     Data_Get_Struct( self, hitimes_interval_t, i );
     if ( 0L == i->start_instant ) {
@@ -184,6 +175,7 @@ VALUE hitimes_interval_duration_so_far( VALUE self )
     }
 
     if ( 0L == i->stop_instant ) {
+        long double         d;
         hitimes_instant_t now = hitimes_get_current_instant( );
         d = ( now - i->start_instant ) / HITIMES_INSTANT_CONVERSION_FACTOR;
         rc = rb_float_new( d );
@@ -293,7 +285,6 @@ VALUE hitimes_interval_stop_instant( VALUE self )
 VALUE hitimes_interval_duration ( VALUE self )
 {
     hitimes_interval_t *i;
-    double             d;
 
     Data_Get_Struct( self, hitimes_interval_t, i );
 
@@ -301,22 +292,20 @@ VALUE hitimes_interval_duration ( VALUE self )
      * if stop has not yet been called, then return the amount of time so far
      */
     if ( 0L == i->stop_instant ) {
+        long double d;
         hitimes_instant_t now = hitimes_get_current_instant( );
         d = ( now - i->start_instant ) / HITIMES_INSTANT_CONVERSION_FACTOR;
         return rb_float_new( d );
-    }
-
+    } 
 
     /*
      * stop has been called, calculate the duration and save the result
      */
-    if ( Qnil == i->duration ) {
-        d = ( i->stop_instant - i->start_instant ) / HITIMES_INSTANT_CONVERSION_FACTOR;
-        i->duration = rb_float_new( d );
-        rb_gc_register_address( &(i->duration) );
+    if ( i->duration < 0.0 ) {
+        i->duration = ( i->stop_instant - i->start_instant ) / HITIMES_INSTANT_CONVERSION_FACTOR;
     }
 
-    return i->duration;
+    return rb_float_new( i->duration );
 }
 
 

data/ext/{hitimes_interval.h → hitimes/hitimes_interval.h}

@@ -10,14 +10,14 @@
 
 #include <ruby.h>
 
-#define NANOSECONDS_PER_SECOND  1e9
+#define NANOSECONDS_PER_SECOND  1e9l
 
 #ifdef USE_INSTANT_CLOCK_GETTIME
 #    define HITIMES_U64INT unsigned long long int
-#    define HITIMES_INSTANT_CONVERSION_FACTOR 1e9
+#    define HITIMES_INSTANT_CONVERSION_FACTOR 1e9l
 #elif USE_INSTANT_OSX
 #    define HITIMES_U64INT unsigned long long int
-#    define HITIMES_INSTANT_CONVERSION_FACTOR 1e9
+#    define HITIMES_INSTANT_CONVERSION_FACTOR 1e9l
 #elif USE_INSTANT_WINDOWS
 #    define HITIMES_U64INT unsigned __int64
 #    define HITIMES_INSTANT_CONVERSION_FACTOR hitimes_instant_conversion_factor()
@@ -34,12 +34,12 @@ typedef HITIMES_U64INT hitimes_instant_t;
 typedef struct hitimes_interval {
     hitimes_instant_t start_instant;
     hitimes_instant_t stop_instant;
-    VALUE             duration;
+    long double       duration;
 } hitimes_interval_t;
 
 /* all the backends must define this method */
 hitimes_instant_t hitimes_get_current_instant( );
-double hitimes_instant_conversion_factor( );
+long double hitimes_instant_conversion_factor( );
 
 /* init methods */
 void Init_hitimes_stats();

data/ext/{hitimes_stats.c → hitimes/hitimes_stats.c}

@@ -46,10 +46,11 @@ VALUE hitimes_stats_alloc(VALUE klass)
  */
 VALUE hitimes_stats_update( VALUE self, VALUE v )
 {
-    double           new_v = NUM2DBL( v );
+    long double      new_v;
     hitimes_stats_t *stats;
 
     Data_Get_Struct( self, hitimes_stats_t, stats );
+    new_v = NUM2DBL( v );
 
     if ( 0 == stats->count ) {
       stats->min = new_v;
@@ -76,7 +77,7 @@ VALUE hitimes_stats_update( VALUE self, VALUE v )
 VALUE hitimes_stats_mean( VALUE self )
 {
     hitimes_stats_t *stats;
-    double           mean = 0.0;
+    long double      mean = 0.0;
 
     Data_Get_Struct( self, hitimes_stats_t, stats );
 
@@ -106,7 +107,7 @@ VALUE hitimes_stats_mean( VALUE self )
 VALUE hitimes_stats_rate( VALUE self )
 {
     hitimes_stats_t *stats;
-    double           rate = 0.0;
+    long double      rate = 0.0;
 
     Data_Get_Struct( self, hitimes_stats_t, stats );
 
@@ -210,7 +211,7 @@ VALUE hitimes_stats_sumsq( VALUE self )
 VALUE hitimes_stats_stddev ( VALUE self )
 {
     hitimes_stats_t *stats;
-    double          stddev = 0.0;
+    long double     stddev = 0.0;
 
     Data_Get_Struct( self, hitimes_stats_t, stats );
     if ( stats->count > 1 ) {

data/ext/{hitimes_stats.h → hitimes/hitimes_stats.h}

@@ -18,11 +18,11 @@ extern VALUE cH_Stats;  /* Hitimes::Stats */
 
 
 typedef struct hitimes_stats {
-    double min;
-    double max;
-    double sum;
-    double sumsq;
-    long   count;
+    long double min;
+    long double max;
+    long double sum;
+    long double sumsq;
+    long long   count;
 } hitimes_stats_t;
 
 #endif

data/gemspec.rb

@@ -24,6 +24,7 @@ Hitimes::GEM_SPEC = Gem::Specification.new do |spec|
   spec.add_dependency("configuration", " ~> 0.0.5")
 
   spec.add_development_dependency( "json", "~> 1.1.3")
+  spec.add_development_dependency( "rake-compiler", "~> 0.5.0")
 
   if ext_conf = Configuration.for_if_exist?("extension") then
     spec.extensions <<  ext_conf.configs
@@ -51,6 +52,6 @@ end
 Hitimes::GEM_SPEC_WIN = Hitimes::GEM_SPEC.clone
 Hitimes::GEM_SPEC_WIN.platform = ::Gem::Platform.new( "i386-mswin32_60" )
 Hitimes::GEM_SPEC_WIN.extensions = []
-Hitimes::GEM_SPEC_WIN.files +=  ["lib/hitimes_ext.so"]
+Hitimes::GEM_SPEC_WIN.files +=  FileList["lib/hitimes/{1.8,1.9}/**.{dll,so}"].to_a
 
 Hitimes::SPECS = [ Hitimes::GEM_SPEC, Hitimes::GEM_SPEC_WIN ]

data/lib/hitimes.rb

@@ -18,7 +18,13 @@ module Hitimes
 end
 require 'hitimes/paths'
 require 'hitimes/version'
-require 'hitimes_ext'
+
+# support for fat binaries on windows
+if RUBY_PLATFORM =~ /(mswin|mingw)/i
+  require "hitimes/#{RUBY_VERSION.sub(/\.\d$/,'')}/hitimes_ext"
+else
+  require 'hitimes/hitimes_ext'
+end
 require 'hitimes/stats'
 require 'hitimes/mutexed_stats'
 require 'hitimes/metric'

data/lib/hitimes/version.rb

@@ -16,7 +16,7 @@ module Hitimes
     MINOR   = 0
 
     # Build number
-    BUILD   = 1
+    BUILD   = 2
 
     #
     # :call-seq:

data/spec/interval_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
 
-require 'hitimes_ext'
+require 'hitimes/hitimes_ext'
 
 describe Hitimes::Interval do
   it "has a 0 duration when newly created" do
@@ -85,13 +85,19 @@ describe Hitimes::Interval do
 
   end
 
-  it "only calculates duration once after stop is called" do
+  it "duration does not change after stop is calledd" do
     i = Hitimes::Interval.new
     i.start
-    i.stop
-    x = i.duration
+    x = i.stop
     y = i.duration
-    x.object_id.should == y.object_id
+    i.stop.should == false
+
+    z = i.duration
+
+    x.should == y
+    x.should == z
+
+    y.should == z
   end
 
   it "can return how much time has elapsed from the start without stopping the interval" do

data/spec/mutex_stats_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
 
-require 'hitimes_ext'
+require 'hitimes/hitimes_ext'
 require 'hitimes/mutexed_stats'
 
 describe Hitimes::MutexedStats do

data/spec/timed_metric_spec.rb

@@ -65,12 +65,12 @@ describe Hitimes::TimedMetric do
 
   it "keeps track of the min value" do
     2.times { @tm.start ; sleep 0.05 ; @tm.stop }
-    @tm.min.should be_close( 0.05, 0.001 )
+    @tm.min.should be_close( 0.05, 0.002 )
   end
 
   it "keeps track of the max value" do
     2.times { @tm.start ; sleep 0.05 ; @tm.stop }
-    @tm.max.should be_close( 0.05, 0.001 )
+    @tm.max.should be_close( 0.05, 0.002 )
   end
 
   it "keeps track of the sum value" do

data/spec/timed_value_metric_spec.rb

@@ -151,7 +151,7 @@ describe Hitimes::TimedValueMetric do
     it "has a rate" do
       5.times { |x| @tm.start ; sleep 0.05 ; @tm.stop( x ) }
       h = @tm.to_hash
-      h['rate'].should be_close( 40.0, 0.2 )
+      h['rate'].should be_close( 40.0, 0.3 )
     end
 
     it "has a unit_count" do

data/tasks/config.rb

@@ -27,7 +27,7 @@ Configuration.for('packaging') {
   proj_conf = Configuration.for('project')
   files {
     bin       FileList["bin/*"]
-    ext       FileList["ext/*.{c,h,rb}"]
+    ext       FileList["ext/hitimes/*.{c,h,rb}"]
     examples  FileList["examples/*.rb"]
     lib       FileList["lib/**/*.rb"]
     test      FileList["spec/**/*.rb", "test/**/*.rb"]
@@ -92,6 +92,7 @@ Configuration.for('rdoc') {
 #-----------------------------------------------------------------------
 Configuration.for('extension') {
   configs   Configuration.for('packaging').files.ext.find_all { |x| %w[ mkrf_conf.rb extconf.rb ].include?(File.basename(x)) }
+  cross_rbconfig YAML.load_file( File.expand_path("~/.rake-compiler/config.yml"))
 }
 
 #-----------------------------------------------------------------------

data/tasks/distribution.rake

@@ -35,12 +35,25 @@ if pkg_config = Configuration.for_if_exist?("packaging") then
     task :reinstall => [:uninstall, :repackage, :install]
 
     desc "package up a windows gem"
-    task :package_win => "ext:build_win" do
-      cp "ext/hitimes_ext.so", "lib", :verbose => true
+    task :package_win => :clean do
+      Configuration.for("extension").cross_rbconfig.keys.each do |rbconfig|
+        v = rbconfig.split("-").last
+        s = v.sub(/\.\d$/,'')
+        sh "rake ext:build_win-#{v}"
+        mkdir_p "lib/hitimes/#{s}", :verbose => true
+        cp "ext/hitimes/hitimes_ext.so", "lib/hitimes/#{s}/", :verbose => true
+      end
+
       Gem::Builder.new( Hitimes::GEM_SPEC_WIN ).build 
+      mkdir "pkg" unless File.directory?( 'pkg' )
       mv Dir["*.gem"].first, "pkg"
     end
 
+    task :clobber do
+      rm_rf "lib/hitimes/1.8"
+      rm_rf "lib/hitimes/1.9"
+    end
+
     desc "distribute copiously"
     task :copious => [:package, :package_win ] do
       gems = Hitimes::SPECS.collect { |s| "#{s.full_name}.gem" }

data/tasks/extension.rake

@@ -8,41 +8,59 @@ require 'pathname'
 if ext_config = Configuration.for_if_exist?('extension') then
   namespace :ext do  
     desc "Build the extension(s)"
-    task :build do
+    task :build => :clean do
       Hitimes::GEM_SPEC.extensions.each do |extension|
         path = Pathname.new(extension)
         parts = path.split
         conf = parts.last
         Dir.chdir(path.dirname) do |d| 
           ruby conf.to_s
-          #sh "rake default"
           sh "make" 
         end
       end
     end 
 
-    desc "Build the extension for windows"
-    task :build_win => :clobber do
+    def build_win( version = "1.8.6" )
+      ext_config = Configuration.for("extension")
+      rbconfig = ext_config.cross_rbconfig["rbconfig-#{version}"]
+      raise ArgumentError, "No cross compiler for version #{version}, we have #{ext_config.cross_rbconfig.keys.join(",")}" unless rbconfig
+      ruby_exe = if version =~ /1\.8/ then
+                   "ruby"
+                 else
+                   "ruby1.9"
+                 end
       Hitimes::GEM_SPEC.extensions.each do |extension|
         path = Pathname.new(extension)
         parts = path.split
         conf = parts.last
         Dir.chdir(path.dirname) do |d| 
-          cp "rbconfig-mingw.rb", "rbconfig.rb"
-          sh "ruby -I. extconf.rb"
+          cp "#{rbconfig}", "rbconfig.rb"
+          sh "#{ruby_exe} -I. extconf.rb"
           sh "make"
         end
       end
     end
 
+    win_builds = []
+    ext_config.cross_rbconfig.keys.each do |v|
+      s = v.split("-").last
+      desc "Build the extension for windows version #{s}"
+      win_bname = "build_win-#{s}"
+      win_builds << win_bname
+      task win_bname => :clean do
+        build_win( s )
+      end
+    end
+
     task :clean do
       ext_config.configs.each do |extension|
         path  = Pathname.new(extension)
         parts = path.split
         conf  = parts.last
         Dir.chdir(path.dirname) do |d| 
-          #sh "rake clean"
-          sh "make clean"
+          if File.exist?( "Makefile" ) then
+            sh "make clean"
+          end
         end 
       end 
     end 
@@ -53,10 +71,10 @@ if ext_config = Configuration.for_if_exist?('extension') then
         parts = path.split
         conf  = parts.last
         Dir.chdir(path.dirname) do |d| 
-          #sh "rake clobber"
           if File.exist?( "Makefile" ) then
             sh "make distclean"
           end
+          rm_f "rbconfig.rb"
         end 
       end 
     end

data/tasks/rubyforge.rake

@@ -31,6 +31,9 @@ if rf_conf = Configuration.for_if_exist?("rubyforge") then
 
       puts "Uploading to rubyforge..."
       files = FileList[File.join("pkg","#{Hitimes::GEM_SPEC.name}-#{Hitimes::VERSION}*.*")].to_a
+      files.each do |f|
+        puts "  * #{f}"
+      end
       rubyforge.login
       rubyforge.add_release(Hitimes::GEM_SPEC.rubyforge_project, Hitimes::GEM_SPEC.name, Hitimes::VERSION, *files)
       puts "done."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hitimes
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-13 00:00:00 -06:00
+date: 2009-06-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,22 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.3
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.5.0
+    version: 
 description: "Hitimes is a fast, high resolution timer library for recording performance metrics.  It uses the appropriate C method calls for each system to get the highest granularity time increments possible.    It currently supports any of the following systems:  * any system with the POSIX call <tt>clock_gettime()</tt>, * Mac OS X * Windows  Using Hitimes can be faster than using a series of +Time.new+ calls, and it will have a much higher granularity.   It is definitely faster than using +Process.times+."
 email: jeremy@copiousfreetime.org
 executables: []
 
 extensions: 
-- ext/extconf.rb
+- ext/hitimes/extconf.rb
 extra_rdoc_files: 
 - README
 - HISTORY
@@ -61,26 +71,18 @@ extra_rdoc_files:
 - lib/hitimes/value_metric.rb
 - lib/hitimes/version.rb
 - lib/hitimes.rb
-- ext/hitimes_ext.c
-- ext/hitimes_instant_clock_gettime.c
-- ext/hitimes_instant_osx.c
-- ext/hitimes_instant_windows.c
-- ext/hitimes_interval.c
-- ext/hitimes_stats.c
 files: 
 - examples/benchmarks.rb
 - examples/stats.rb
-- ext/hitimes_ext.c
-- ext/hitimes_instant_clock_gettime.c
-- ext/hitimes_instant_osx.c
-- ext/hitimes_instant_windows.c
-- ext/hitimes_interval.c
-- ext/hitimes_stats.c
-- ext/hitimes_interval.h
-- ext/hitimes_stats.h
-- ext/extconf.rb
-- ext/rbconfig-mingw.rb
-- ext/rbconfig.rb
+- ext/hitimes/hitimes_ext.c
+- ext/hitimes/hitimes_instant_clock_gettime.c
+- ext/hitimes/hitimes_instant_osx.c
+- ext/hitimes/hitimes_instant_windows.c
+- ext/hitimes/hitimes_interval.c
+- ext/hitimes/hitimes_stats.c
+- ext/hitimes/hitimes_interval.h
+- ext/hitimes/hitimes_stats.h
+- ext/hitimes/extconf.rb
 - lib/hitimes/metric.rb
 - lib/hitimes/mutexed_stats.rb
 - lib/hitimes/paths.rb

data/ext/rbconfig-mingw.rb

@@ -1,178 +0,0 @@
-
-# This file was created by mkconfig.rb when ruby was built.  Any
-# changes made to this file will be lost the next time ruby is built.
-
-module Config
-  RUBY_VERSION == "1.8.6" or
-    raise "ruby lib version (1.8.6) doesn't match executable version (#{RUBY_VERSION})"
-
-  TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/1.8/i386-mingw32")
-  DESTDIR = '' unless defined? DESTDIR
-  CONFIG = {}
-  CONFIG["DESTDIR"] = DESTDIR
-  CONFIG["INSTALL"] = '/opt/local/bin/ginstall -c'
-  CONFIG["prefix"] = (TOPDIR || DESTDIR + "#{ENV["HOME"]}/ruby-mingw32")
-  CONFIG["EXEEXT"] = ".exe"
-  CONFIG["ruby_install_name"] = "ruby"
-  CONFIG["RUBY_INSTALL_NAME"] = "ruby"
-  CONFIG["RUBY_SO_NAME"] = "msvcrt-ruby18"
-  CONFIG["SHELL"] = "/bin/sh"
-  CONFIG["PATH_SEPARATOR"] = ":"
-  CONFIG["PACKAGE_NAME"] = ""
-  CONFIG["PACKAGE_TARNAME"] = ""
-  CONFIG["PACKAGE_VERSION"] = ""
-  CONFIG["PACKAGE_STRING"] = ""
-  CONFIG["PACKAGE_BUGREPORT"] = ""
-  CONFIG["exec_prefix"] = "$(prefix)"
-  CONFIG["bindir"] = "$(exec_prefix)/bin"
-  CONFIG["sbindir"] = "$(exec_prefix)/sbin"
-  CONFIG["libexecdir"] = "$(exec_prefix)/libexec"
-  CONFIG["datarootdir"] = "$(prefix)/share"
-  CONFIG["datadir"] = "$(datarootdir)"
-  CONFIG["sysconfdir"] = "$(prefix)/etc"
-  CONFIG["sharedstatedir"] = "$(prefix)/com"
-  CONFIG["localstatedir"] = "$(prefix)/var"
-  CONFIG["includedir"] = "$(prefix)/include"
-  CONFIG["oldincludedir"] = "/usr/include"
-  CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)"
-  CONFIG["infodir"] = "$(datarootdir)/info"
-  CONFIG["htmldir"] = "$(docdir)"
-  CONFIG["dvidir"] = "$(docdir)"
-  CONFIG["pdfdir"] = "$(docdir)"
-  CONFIG["psdir"] = "$(docdir)"
-  CONFIG["libdir"] = "$(exec_prefix)/lib"
-  CONFIG["localedir"] = "$(datarootdir)/locale"
-  CONFIG["mandir"] = "$(datarootdir)/man"
-  CONFIG["ECHO_C"] = ""
-  CONFIG["ECHO_N"] = "-n"
-  CONFIG["ECHO_T"] = ""
-  CONFIG["LIBS"] = "-lwsock32 "
-  CONFIG["build_alias"] = "i686-darwin9.2.2"
-  CONFIG["host_alias"] = "i386-mingw32"
-  CONFIG["target_alias"] = "i386-mingw32"
-  CONFIG["MAJOR"] = "1"
-  CONFIG["MINOR"] = "8"
-  CONFIG["TEENY"] = "6"
-  CONFIG["build"] = "i686-pc-darwin9.2.2"
-  CONFIG["build_cpu"] = "i686"
-  CONFIG["build_vendor"] = "pc"
-  CONFIG["build_os"] = "darwin9.2.2"
-  CONFIG["host"] = "i386-pc-mingw32"
-  CONFIG["host_cpu"] = "i386"
-  CONFIG["host_vendor"] = "pc"
-  CONFIG["host_os"] = "mingw32"
-  CONFIG["target"] = "i386-pc-mingw32"
-  CONFIG["target_cpu"] = "i386"
-  CONFIG["target_vendor"] = "pc"
-  CONFIG["target_os"] = "mingw32"
-  CONFIG["CC"] = "i386-mingw32-gcc"
-  CONFIG["CFLAGS"] = "-g -O2 "
-  CONFIG["LDFLAGS"] = "-L. "
-  CONFIG["CPPFLAGS"] = ""
-  CONFIG["OBJEXT"] = "o"
-  CONFIG["CPP"] = "i386-mingw32-gcc -E"
-  CONFIG["GREP"] = "/usr/bin/grep"
-  CONFIG["EGREP"] = "/usr/bin/grep -E"
-  CONFIG["GNU_LD"] = "yes"
-  CONFIG["CPPOUTFILE"] = "-o conftest.i"
-  CONFIG["OUTFLAG"] = "-o "
-  CONFIG["YACC"] = "bison -y"
-  CONFIG["YFLAGS"] = ""
-  CONFIG["RANLIB"] = "i386-mingw32-ranlib"
-  CONFIG["AR"] = "i386-mingw32-ar"
-  CONFIG["AS"] = "i386-mingw32-as"
-  CONFIG["ASFLAGS"] = ""
-  CONFIG["NM"] = "i386-mingw32-nm"
-  CONFIG["WINDRES"] = "i386-mingw32-windres"
-  CONFIG["DLLWRAP"] = "i386-mingw32-dllwrap"
-  CONFIG["OBJDUMP"] = "i386-mingw32-objdump"
-  CONFIG["LN_S"] = "ln -s"
-  CONFIG["SET_MAKE"] = ""
-  CONFIG["INSTALL_PROGRAM"] = "$(INSTALL)"
-  CONFIG["INSTALL_SCRIPT"] = "$(INSTALL)"
-  CONFIG["INSTALL_DATA"] = "$(INSTALL) -m 644"
-  CONFIG["RM"] = "rm -f"
-  CONFIG["CP"] = "cp"
-  CONFIG["MAKEDIRS"] = "mkdir -p"
-  CONFIG["ALLOCA"] = ""
-  CONFIG["DLDFLAGS"] = " -Wl,--enable-auto-image-base,--enable-auto-import,--export-all"
-  CONFIG["ARCH_FLAG"] = ""
-  CONFIG["STATIC"] = ""
-  CONFIG["CCDLFLAGS"] = ""
-  CONFIG["LDSHARED"] = "i386-mingw32-gcc -shared -s"
-  CONFIG["DLEXT"] = "so"
-  CONFIG["DLEXT2"] = "dll"
-  CONFIG["LIBEXT"] = "a"
-  CONFIG["LINK_SO"] = ""
-  CONFIG["LIBPATHFLAG"] = " -L\"%s\""
-  CONFIG["RPATHFLAG"] = ""
-  CONFIG["LIBPATHENV"] = ""
-  CONFIG["TRY_LINK"] = ""
-  CONFIG["STRIP"] = "strip"
-  CONFIG["EXTSTATIC"] = ""
-  CONFIG["setup"] = "Setup"
-  CONFIG["MINIRUBY"] = "ruby -I#{ENV['HOME']}/pkgs/ruby-1.8.6-p114 -rfake"
-  CONFIG["PREP"] = "fake.rb"
-  CONFIG["RUNRUBY"] = "$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`"
-  CONFIG["EXTOUT"] = ".ext"
-  CONFIG["ARCHFILE"] = ""
-  CONFIG["RDOCTARGET"] = ""
-  CONFIG["XCFLAGS"] = " -DRUBY_EXPORT"
-  CONFIG["XLDFLAGS"] = " -Wl,--stack,0x02000000"
-  CONFIG["LIBRUBY_LDSHARED"] = "i386-mingw32-gcc -shared -s"
-  CONFIG["LIBRUBY_DLDFLAGS"] = " -Wl,--enable-auto-image-base,--enable-auto-import,--export-all -Wl,--out-implib=$(LIBRUBY)"
-  CONFIG["rubyw_install_name"] = "rubyw"
-  CONFIG["RUBYW_INSTALL_NAME"] = "rubyw"
-  CONFIG["LIBRUBY_A"] = "lib$(RUBY_SO_NAME)-static.a"
-  CONFIG["LIBRUBY_SO"] = "$(RUBY_SO_NAME).dll"
-  CONFIG["LIBRUBY_ALIASES"] = ""
-  CONFIG["LIBRUBY"] = "lib$(LIBRUBY_SO).a"
-  CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_SHARED)"
-  CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static"
-  CONFIG["LIBRUBYARG_SHARED"] = "-l$(RUBY_SO_NAME)"
-  CONFIG["SOLIBS"] = "$(LIBS)"
-  CONFIG["DLDLIBS"] = ""
-  CONFIG["ENABLE_SHARED"] = "yes"
-  CONFIG["MAINLIBS"] = ""
-  CONFIG["COMMON_LIBS"] = "m"
-  CONFIG["COMMON_MACROS"] = ""
-  CONFIG["COMMON_HEADERS"] = "windows.h winsock.h"
-  CONFIG["EXPORT_PREFIX"] = ""
-  CONFIG["MAKEFILES"] = "Makefile GNUmakefile"
-  CONFIG["arch"] = "i386-mingw32"
-  CONFIG["sitearch"] = "i386-msvcrt"
-  CONFIG["sitedir"] = "$(prefix)/lib/ruby/site_ruby"
-  CONFIG["configure_args"] = " '--host=i386-mingw32' '--target=i386-mingw32' '--build=i686-darwin9.2.2' '--prefix=#{ENV['HOME']}/ruby-mingw32' 'build_alias=i686-darwin9.2.2' 'host_alias=i386-mingw32' 'target_alias=i386-mingw32'"
-  CONFIG["NROFF"] = "/usr/bin/nroff"
-  CONFIG["MANTYPE"] = "doc"
-  CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
-  CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
-  CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
-  CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
-  CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
-  CONFIG["topdir"] = File.dirname(__FILE__)
-  MAKEFILE_CONFIG = {}
-  CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
-  def Config::expand(val, config = CONFIG)
-    val.gsub!(/\$\$|\$\(([^()]+)\)|\$\{([^{}]+)\}/) do |var|
-      if !(v = $1 || $2)
-	'$'
-      elsif key = config[v = v[/\A[^:]+(?=(?::(.*?)=(.*))?\z)/]]
-	pat, sub = $1, $2
-	config[v] = false
-	Config::expand(key, config)
-	config[v] = key
-	key = key.gsub(/#{Regexp.quote(pat)}(?=\s|\z)/n) {sub} if pat
-	key
-      else
-	var
-      end
-    end
-    val
-  end
-  CONFIG.each_value do |val|
-    Config::expand(val)
-  end
-end
-RbConfig = Config # compatibility for ruby-1.9
-CROSS_COMPILING = nil unless defined? CROSS_COMPILING

data/ext/rbconfig.rb

@@ -1,178 +0,0 @@
-
-# This file was created by mkconfig.rb when ruby was built.  Any
-# changes made to this file will be lost the next time ruby is built.
-
-module Config
-  RUBY_VERSION == "1.8.6" or
-    raise "ruby lib version (1.8.6) doesn't match executable version (#{RUBY_VERSION})"
-
-  TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/1.8/i386-mingw32")
-  DESTDIR = '' unless defined? DESTDIR
-  CONFIG = {}
-  CONFIG["DESTDIR"] = DESTDIR
-  CONFIG["INSTALL"] = '/opt/local/bin/ginstall -c'
-  CONFIG["prefix"] = (TOPDIR || DESTDIR + "#{ENV["HOME"]}/ruby-mingw32")
-  CONFIG["EXEEXT"] = ".exe"
-  CONFIG["ruby_install_name"] = "ruby"
-  CONFIG["RUBY_INSTALL_NAME"] = "ruby"
-  CONFIG["RUBY_SO_NAME"] = "msvcrt-ruby18"
-  CONFIG["SHELL"] = "/bin/sh"
-  CONFIG["PATH_SEPARATOR"] = ":"
-  CONFIG["PACKAGE_NAME"] = ""
-  CONFIG["PACKAGE_TARNAME"] = ""
-  CONFIG["PACKAGE_VERSION"] = ""
-  CONFIG["PACKAGE_STRING"] = ""
-  CONFIG["PACKAGE_BUGREPORT"] = ""
-  CONFIG["exec_prefix"] = "$(prefix)"
-  CONFIG["bindir"] = "$(exec_prefix)/bin"
-  CONFIG["sbindir"] = "$(exec_prefix)/sbin"
-  CONFIG["libexecdir"] = "$(exec_prefix)/libexec"
-  CONFIG["datarootdir"] = "$(prefix)/share"
-  CONFIG["datadir"] = "$(datarootdir)"
-  CONFIG["sysconfdir"] = "$(prefix)/etc"
-  CONFIG["sharedstatedir"] = "$(prefix)/com"
-  CONFIG["localstatedir"] = "$(prefix)/var"
-  CONFIG["includedir"] = "$(prefix)/include"
-  CONFIG["oldincludedir"] = "/usr/include"
-  CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)"
-  CONFIG["infodir"] = "$(datarootdir)/info"
-  CONFIG["htmldir"] = "$(docdir)"
-  CONFIG["dvidir"] = "$(docdir)"
-  CONFIG["pdfdir"] = "$(docdir)"
-  CONFIG["psdir"] = "$(docdir)"
-  CONFIG["libdir"] = "$(exec_prefix)/lib"
-  CONFIG["localedir"] = "$(datarootdir)/locale"
-  CONFIG["mandir"] = "$(datarootdir)/man"
-  CONFIG["ECHO_C"] = ""
-  CONFIG["ECHO_N"] = "-n"
-  CONFIG["ECHO_T"] = ""
-  CONFIG["LIBS"] = "-lwsock32 "
-  CONFIG["build_alias"] = "i686-darwin9.2.2"
-  CONFIG["host_alias"] = "i386-mingw32"
-  CONFIG["target_alias"] = "i386-mingw32"
-  CONFIG["MAJOR"] = "1"
-  CONFIG["MINOR"] = "8"
-  CONFIG["TEENY"] = "6"
-  CONFIG["build"] = "i686-pc-darwin9.2.2"
-  CONFIG["build_cpu"] = "i686"
-  CONFIG["build_vendor"] = "pc"
-  CONFIG["build_os"] = "darwin9.2.2"
-  CONFIG["host"] = "i386-pc-mingw32"
-  CONFIG["host_cpu"] = "i386"
-  CONFIG["host_vendor"] = "pc"
-  CONFIG["host_os"] = "mingw32"
-  CONFIG["target"] = "i386-pc-mingw32"
-  CONFIG["target_cpu"] = "i386"
-  CONFIG["target_vendor"] = "pc"
-  CONFIG["target_os"] = "mingw32"
-  CONFIG["CC"] = "i386-mingw32-gcc"
-  CONFIG["CFLAGS"] = "-g -O2 "
-  CONFIG["LDFLAGS"] = "-L. "
-  CONFIG["CPPFLAGS"] = ""
-  CONFIG["OBJEXT"] = "o"
-  CONFIG["CPP"] = "i386-mingw32-gcc -E"
-  CONFIG["GREP"] = "/usr/bin/grep"
-  CONFIG["EGREP"] = "/usr/bin/grep -E"
-  CONFIG["GNU_LD"] = "yes"
-  CONFIG["CPPOUTFILE"] = "-o conftest.i"
-  CONFIG["OUTFLAG"] = "-o "
-  CONFIG["YACC"] = "bison -y"
-  CONFIG["YFLAGS"] = ""
-  CONFIG["RANLIB"] = "i386-mingw32-ranlib"
-  CONFIG["AR"] = "i386-mingw32-ar"
-  CONFIG["AS"] = "i386-mingw32-as"
-  CONFIG["ASFLAGS"] = ""
-  CONFIG["NM"] = "i386-mingw32-nm"
-  CONFIG["WINDRES"] = "i386-mingw32-windres"
-  CONFIG["DLLWRAP"] = "i386-mingw32-dllwrap"
-  CONFIG["OBJDUMP"] = "i386-mingw32-objdump"
-  CONFIG["LN_S"] = "ln -s"
-  CONFIG["SET_MAKE"] = ""
-  CONFIG["INSTALL_PROGRAM"] = "$(INSTALL)"
-  CONFIG["INSTALL_SCRIPT"] = "$(INSTALL)"
-  CONFIG["INSTALL_DATA"] = "$(INSTALL) -m 644"
-  CONFIG["RM"] = "rm -f"
-  CONFIG["CP"] = "cp"
-  CONFIG["MAKEDIRS"] = "mkdir -p"
-  CONFIG["ALLOCA"] = ""
-  CONFIG["DLDFLAGS"] = " -Wl,--enable-auto-image-base,--enable-auto-import,--export-all"
-  CONFIG["ARCH_FLAG"] = ""
-  CONFIG["STATIC"] = ""
-  CONFIG["CCDLFLAGS"] = ""
-  CONFIG["LDSHARED"] = "i386-mingw32-gcc -shared -s"
-  CONFIG["DLEXT"] = "so"
-  CONFIG["DLEXT2"] = "dll"
-  CONFIG["LIBEXT"] = "a"
-  CONFIG["LINK_SO"] = ""
-  CONFIG["LIBPATHFLAG"] = " -L\"%s\""
-  CONFIG["RPATHFLAG"] = ""
-  CONFIG["LIBPATHENV"] = ""
-  CONFIG["TRY_LINK"] = ""
-  CONFIG["STRIP"] = "strip"
-  CONFIG["EXTSTATIC"] = ""
-  CONFIG["setup"] = "Setup"
-  CONFIG["MINIRUBY"] = "ruby -I#{ENV['HOME']}/pkgs/ruby-1.8.6-p114 -rfake"
-  CONFIG["PREP"] = "fake.rb"
-  CONFIG["RUNRUBY"] = "$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`"
-  CONFIG["EXTOUT"] = ".ext"
-  CONFIG["ARCHFILE"] = ""
-  CONFIG["RDOCTARGET"] = ""
-  CONFIG["XCFLAGS"] = " -DRUBY_EXPORT"
-  CONFIG["XLDFLAGS"] = " -Wl,--stack,0x02000000"
-  CONFIG["LIBRUBY_LDSHARED"] = "i386-mingw32-gcc -shared -s"
-  CONFIG["LIBRUBY_DLDFLAGS"] = " -Wl,--enable-auto-image-base,--enable-auto-import,--export-all -Wl,--out-implib=$(LIBRUBY)"
-  CONFIG["rubyw_install_name"] = "rubyw"
-  CONFIG["RUBYW_INSTALL_NAME"] = "rubyw"
-  CONFIG["LIBRUBY_A"] = "lib$(RUBY_SO_NAME)-static.a"
-  CONFIG["LIBRUBY_SO"] = "$(RUBY_SO_NAME).dll"
-  CONFIG["LIBRUBY_ALIASES"] = ""
-  CONFIG["LIBRUBY"] = "lib$(LIBRUBY_SO).a"
-  CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_SHARED)"
-  CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static"
-  CONFIG["LIBRUBYARG_SHARED"] = "-l$(RUBY_SO_NAME)"
-  CONFIG["SOLIBS"] = "$(LIBS)"
-  CONFIG["DLDLIBS"] = ""
-  CONFIG["ENABLE_SHARED"] = "yes"
-  CONFIG["MAINLIBS"] = ""
-  CONFIG["COMMON_LIBS"] = "m"
-  CONFIG["COMMON_MACROS"] = ""
-  CONFIG["COMMON_HEADERS"] = "windows.h winsock.h"
-  CONFIG["EXPORT_PREFIX"] = ""
-  CONFIG["MAKEFILES"] = "Makefile GNUmakefile"
-  CONFIG["arch"] = "i386-mingw32"
-  CONFIG["sitearch"] = "i386-msvcrt"
-  CONFIG["sitedir"] = "$(prefix)/lib/ruby/site_ruby"
-  CONFIG["configure_args"] = " '--host=i386-mingw32' '--target=i386-mingw32' '--build=i686-darwin9.2.2' '--prefix=#{ENV['HOME']}/ruby-mingw32' 'build_alias=i686-darwin9.2.2' 'host_alias=i386-mingw32' 'target_alias=i386-mingw32'"
-  CONFIG["NROFF"] = "/usr/bin/nroff"
-  CONFIG["MANTYPE"] = "doc"
-  CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
-  CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
-  CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
-  CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
-  CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
-  CONFIG["topdir"] = File.dirname(__FILE__)
-  MAKEFILE_CONFIG = {}
-  CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
-  def Config::expand(val, config = CONFIG)
-    val.gsub!(/\$\$|\$\(([^()]+)\)|\$\{([^{}]+)\}/) do |var|
-      if !(v = $1 || $2)
-	'$'
-      elsif key = config[v = v[/\A[^:]+(?=(?::(.*?)=(.*))?\z)/]]
-	pat, sub = $1, $2
-	config[v] = false
-	Config::expand(key, config)
-	config[v] = key
-	key = key.gsub(/#{Regexp.quote(pat)}(?=\s|\z)/n) {sub} if pat
-	key
-      else
-	var
-      end
-    end
-    val
-  end
-  CONFIG.each_value do |val|
-    Config::expand(val)
-  end
-end
-RbConfig = Config # compatibility for ruby-1.9
-CROSS_COMPILING = nil unless defined? CROSS_COMPILING