[macruby-changes] [2048] MacRuby/branches/experimental

[source_changes at macosforge.org]

Revision: 2048
          http://trac.macosforge.org/projects/ruby/changeset/2048
Author:   pthomson at apple.com
Date:     2009-07-22 16:31:42 -0700 (Wed, 22 Jul 2009)
Log Message:
-----------
Beating Digest into submission.

Modified Paths:
--------------
    MacRuby/branches/experimental/ext/digest/digest.c
    MacRuby/branches/experimental/lib/mkmf.rb
    MacRuby/branches/experimental/rakelib/builder.rake

Modified: MacRuby/branches/experimental/ext/digest/digest.c
===================================================================
--- MacRuby/branches/experimental/ext/digest/digest.c	2009-07-22 23:31:40 UTC (rev 2047)
+++ MacRuby/branches/experimental/ext/digest/digest.c	2009-07-22 23:31:42 UTC (rev 2048)
@@ -71,7 +71,7 @@
  * Generates a hex-encoded version of a given _string_.
  */
 static VALUE
-rb_digest_s_hexencode(VALUE klass, VALUE str)
+rb_digest_s_hexencode(VALUE klass, SEL sel, VALUE str)
 {
     return hexencode_str_new(str);
 }
@@ -208,7 +208,7 @@
  * state before and after the process.
  */
 static VALUE
-rb_digest_instance_hexdigest(int argc, VALUE *argv, VALUE self)
+rb_digest_instance_hexdigest(VALUE self, SEL sel, int argc, VALUE *argv)
 {
     VALUE str, value;
 
@@ -275,7 +275,7 @@
     rb_str_buf_cat2(str, "#<");
     rb_str_buf_cat2(str, cname);
     rb_str_buf_cat2(str, ": ");
-    rb_str_buf_append(str, rb_digest_instance_hexdigest(0, 0, self));
+    rb_str_buf_append(str, rb_digest_instance_hexdigest(self, 0, 0, 0));
     rb_str_buf_cat2(str, ">");
     return str;
 }
@@ -407,7 +407,7 @@
  * Digest.hexencode(Digest::Class.new(*parameters).digest(string)).
  */
 static VALUE
-rb_digest_class_s_hexdigest(int argc, VALUE *argv, VALUE klass)
+rb_digest_class_s_hexdigest(VALUE klass, SEL sel, int argc, VALUE *argv)
 {
     return hexencode_str_new(rb_funcall2(klass, id_digest, argc, argv));
 }
@@ -586,7 +586,7 @@
     rb_mDigest = rb_define_module("Digest");
 
     /* module functions */
-    rb_define_module_function(rb_mDigest, "hexencode", rb_digest_s_hexencode, 1);
+    rb_objc_define_method(*(VALUE *)rb_mDigest, "hexencode", rb_digest_s_hexencode, 1);
 
     /*
      * module Digest::Instance
@@ -623,7 +623,7 @@
 
     /* class methods */
     rb_define_singleton_method(rb_cDigest_Class, "digest", rb_digest_class_s_digest, -1);
-    rb_define_singleton_method(rb_cDigest_Class, "hexdigest", rb_digest_class_s_hexdigest, -1);
+    rb_objc_define_method(*(VALUE *)rb_cDigest_Class, "hexdigest", rb_digest_class_s_hexdigest, -1);
 
     id_metadata = rb_intern("metadata");
 

Modified: MacRuby/branches/experimental/lib/mkmf.rb
===================================================================
--- MacRuby/branches/experimental/lib/mkmf.rb	2009-07-22 23:31:40 UTC (rev 2047)
+++ MacRuby/branches/experimental/lib/mkmf.rb	2009-07-22 23:31:42 UTC (rev 2048)
@@ -273,7 +273,7 @@
       begin
         log.print(open {yield})
         @log.close
-        File::open(tmplog) {|t| FileUtils.copy_stream(t, log)}
+        #File::open(tmplog) {|t| FileUtils.copy_stream(t, log)}
       ensure
         @log, @logfile, @orgout, @orgerr = log, *save
         @postpone -= 1
@@ -1923,7 +1923,7 @@
 COMPILE_C = config_string('COMPILE_C') || '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<'
 COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<'
 TRY_LINK = config_string('TRY_LINK') ||
-  "$(CC) #{OUTFLAG}conftest $(INCFLAGS) $(CPPFLAGS) " \
+  "$(CXX) #{OUTFLAG}conftest $(INCFLAGS) $(CPPFLAGS) " \
   "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"
 LINK_SO = config_string('LINK_SO') ||
   if CONFIG["DLEXT"] == $OBJEXT

Modified: MacRuby/branches/experimental/rakelib/builder.rake
===================================================================
--- MacRuby/branches/experimental/rakelib/builder.rake	2009-07-22 23:31:40 UTC (rev 2047)
+++ MacRuby/branches/experimental/rakelib/builder.rake	2009-07-22 23:31:42 UTC (rev 2048)
@@ -1,6 +1,8 @@
 require File.expand_path('../builder', __FILE__)
 require 'rake'
 
+SUPPORTED_EXTENSIONS = ['ext/ripper', 'ext/digest']
+
 # We monkey-patch the method that Rake uses to display the tasks so we can add
 # the build options.
 module Rake
@@ -317,10 +319,16 @@
 =begin
   sh "./miniruby -I./lib -I.ext/common -I./- -r./ext/purelib.rb ext/extmk.rb #{EXTMK_ARGS}"
 =end
-  Dir.chdir('ext/ripper') do
-    sh "../../miniruby -I../.. -I../../lib extconf.rb"
-    sh "/usr/bin/make top_srcdir=../.. ruby=\"../../miniruby -I../.. -I../../lib\" libdir=../.."
-  end
+	SUPPORTED_EXTENSIONS.each do |dirname|
+	  Dir.chdir(dirname) do
+	    sh "../../miniruby -I../.. -I../../lib extconf.rb"
+	    sh "/usr/bin/make top_srcdir=../.. ruby=\"../../miniruby -I../.. -I../../lib\" libdir=../.."
+	  end
+	end
+	Dir.chdir('ext/digest/sha1') do
+		sh "../../../miniruby -I../../.. -I../../../lib extconf.rb"
+    sh "/usr/bin/make top_srcdir=../../.. ruby=\"../../../miniruby -I../../.. -I../../../lib\" libdir=../../.."
+	end
   $stderr.puts "Skipping other extensions (for now)..."
 end
 
@@ -364,9 +372,12 @@
 
   desc "Install the framework"
   task :install => :info_plist do
-    Dir.chdir('ext/ripper') do
-      sh "/usr/bin/make top_srcdir=../.. ruby=../../miniruby install"
-    end
+		SUPPORTED_EXTENSIONS.each do |dirname|
+	    Dir.chdir(dirname) do
+	      sh "/usr/bin/make top_srcdir=../.. ruby=../../miniruby install"
+	    end
+		end
+		Dir.chdir('ext/digest/sha1') { sh "/usr/bin/make top_srcdir=../../.. ruby=../../../miniruby install" }
     sh "./miniruby instruby.rb #{INSTRUBY_ARGS}"
   end
 end
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090722/c7fd466c/attachment.html>