malloc 1.1.1 → 1.1.2

data/Rakefile

@@ -3,10 +3,11 @@ require 'date'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rake/packagetask'
+require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'malloc'
-PKG_VERSION = '1.1.1'
+PKG_VERSION = '1.1.2'
 CXX = ENV[ 'CXX' ] || 'g++'
 STRIP = ENV[ 'STRIP' ] || 'strip'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -27,16 +28,16 @@ HOMEPAGE = %q{http://wedesoft.github.com/malloc/}
 
 OBJ = CC_FILES.ext 'o'
 $CXXFLAGS = ENV[ 'CXXFLAGS' ] || ''
-$CXXFLAGS = "#{$CXXFLAGS} -fPIC"
-if Config::CONFIG[ 'rubyhdrdir' ]
-  $CXXFLAGS += "#{$CXXFLAGS} -I#{Config::CONFIG[ 'rubyhdrdir' ]} " +
-              "-I#{Config::CONFIG[ 'rubyhdrdir' ]}/#{Config::CONFIG[ 'arch' ]}"
+$CXXFLAGS = "#{$CXXFLAGS} -fPIC -DNDEBUG"
+if RbConfig::CONFIG[ 'rubyhdrdir' ]
+  $CXXFLAGS = "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'rubyhdrdir' ]} " +
+              "-I#{RbConfig::CONFIG[ 'rubyhdrdir' ]}/#{RbConfig::CONFIG[ 'arch' ]}"
 else
-  $CXXFLAGS += "#{$CXXFLAGS} -I#{Config::CONFIG[ 'archdir' ]}"
+  $CXXFLAGS = "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'archdir' ]}"
 end
-$LIBRUBYARG = Config::CONFIG[ 'LIBRUBYARG' ]
-$SITELIBDIR = Config::CONFIG[ 'sitelibdir' ]
-$SITEARCHDIR = Config::CONFIG[ 'sitearchdir' ]
+$LIBRUBYARG = RbConfig::CONFIG[ 'LIBRUBYARG' ]
+$SITELIBDIR = RbConfig::CONFIG[ 'sitelibdir' ]
+$SITEARCHDIR = RbConfig::CONFIG[ 'sitearchdir' ]
 
 task :default => :all
 
@@ -93,6 +94,7 @@ Rake::PackageTask.new PKG_NAME, PKG_VERSION do |p|
 end
 
 begin
+  require 'rubygems'
   require 'rubygems/builder'
   $SPEC = Gem::Specification.new do |s|
     s.name = PKG_NAME
@@ -162,7 +164,13 @@ rule '.o' => '.cc' do |t|
    sh "#{CXX} #{$CXXFLAGS} -c -o #{t.name} #{t.source}"
 end
 
-file 'ext/malloc.o' => [ 'ext/malloc.cc', 'ext/malloc.hh', 'ext/error.hh' ]
+file ".depends.mf" do |t|
+  sh "makedepend -f- -- #{$CXXFLAGS} -- #{CC_FILES.join ' '} > #{t.name}"
+end
+CC_FILES.each do |t|
+  file t.ext(".o") => t
+end
+import ".depends.mf"
 
 CLEAN.include 'ext/*.o'
-CLOBBER.include SO_FILE, 'doc', '.yardoc'
+CLOBBER.include SO_FILE, 'doc', '.yardoc', '.depends.mf'

data/ext/error.hh

@@ -1,5 +1,5 @@
 /* HornetsEye - Computer Vision with Ruby
-   Copyright (C) 2006, 2007, 2008, 2009   Jan Wedekind
+   Copyright (C) 2006, 2007, 2008, 2009, 2010   Jan Wedekind
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,20 +18,19 @@
 
 #include <exception>
 #include <sstream>
-#include <string>
 
 class Error: public std::exception
 {
 public:
   Error(void) {}
   Error( Error &e ): std::exception( e )
-  { m_message << e.m_message.str(); }
+    { m_message << e.m_message.str(); }
   virtual ~Error(void) throw() {}
   template< typename T >
   std::ostream &operator<<( const T &t )
-  { m_message << t; return m_message; }
-  std::ostream &operator<<( std::ostream& (*__pf)( std::ostream&) )
-  { (*__pf)( m_message ); return m_message; }
+    { m_message << t; return m_message; }
+  std::ostream &operator<<( std::ostream& (*__pf)(std::ostream&) )
+    { (*__pf)( m_message ); return m_message; }
   virtual const char* what(void) const throw() {
     temp = m_message.str();
     return temp.c_str();

data/ext/malloc.hh

@@ -16,7 +16,7 @@
 #ifndef MALLOC_HH
 #define MALLOC_HH
 
-#include <ruby.h>
+#include "rubyinc.hh"
 
 class Malloc
 {

data/ext/rubyinc.hh

@@ -0,0 +1,54 @@
+/* HornetsEye - Computer Vision with Ruby
+   Copyright (C) 2006, 2007   Jan Wedekind
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+#ifndef HORNETSEYE_RUBYINC_HH
+#define HORNETSEYE_RUBYINC_HH
+
+#ifdef RSHIFT
+#undef RSHIFT
+#endif
+
+#define gettimeofday rubygettimeofday
+#define timezone rubygettimezone
+#include <ruby.h>
+// #include <version.h>
+#undef timezone
+#undef gettimeofday
+#ifdef read
+#undef read
+#endif
+#ifdef write
+#undef write
+#endif
+#ifdef RGB
+#undef RGB
+#endif
+
+#ifndef RUBY_VERSION_NUMBER
+#define RUBY_VERSION_NUMBER ( RUBY_VERSION_MAJOR * 10000 + \
+                              RUBY_VERSION_MINOR * 100 + \
+                              RUBY_VERSION_TEENY )
+#endif
+
+#ifndef RUBY_METHOD_FUNC
+#define RUBY_METHOD_FUNC(func) ((VALUE (*)(ANYARGS))func)
+#endif
+
+#ifndef xfree
+#define xfree free
+#endif
+
+#endif
+

data/lib/malloc_ext.rb

@@ -90,21 +90,16 @@ module Hornetseye
       "Malloc(#{@size})"
     end
 
-    # Read data from memory
+    # Display information about this object
     #
-    # @example Convert data of Malloc object to string
+    # @example Displaying information about a Malloc object
     #   require 'malloc'
-    #   include Hornetseye
-    #   m = Malloc.new 5
-    #   m.write 'abcde'
-    #   m.to_s
-    #   "abcde"
-    #
-    # @return [String] A string containing the data.
+    #   Hornetseye::Malloc.new( 8 ).to_s
+    #   "Malloc(8)"
     #
-    # @see #read
+    # @return [String] A string with information about this object.
     def to_s
-      read @size
+      inspect
     end
 
     # Operator for doing pointer arithmetic

data/test/tc_malloc.rb

@@ -30,9 +30,7 @@ class TC_Malloc < Test::Unit::TestCase
   end
 
   def test_to_s
-    m = Hornetseye::Malloc.new 3
-    m.write 'abc'
-    assert_equal 'abc', m.to_s
+    assert_equal 'Malloc(32)', Hornetseye::Malloc.new( 32 ).to_s
   end
 
   def test_read_write

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-25 00:00:00 +01:00
+date: 2010-10-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,7 @@ files:
 - ext/malloc.cc
 - ext/init.cc
 - ext/malloc.hh
+- ext/rubyinc.hh
 - ext/error.hh
 - test/ts_malloc.rb
 - test/tc_malloc.rb