<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2048] MacRuby/branches/experimental</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/ruby/changeset/2048">2048</a></dd>
<dt>Author</dt> <dd>pthomson@apple.com</dd>
<dt>Date</dt> <dd>2009-07-22 16:31:42 -0700 (Wed, 22 Jul 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Beating Digest into submission.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#MacRubybranchesexperimentalextdigestdigestc">MacRuby/branches/experimental/ext/digest/digest.c</a></li>
<li><a href="#MacRubybranchesexperimentallibmkmfrb">MacRuby/branches/experimental/lib/mkmf.rb</a></li>
<li><a href="#MacRubybranchesexperimentalrakelibbuilderrake">MacRuby/branches/experimental/rakelib/builder.rake</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="MacRubybranchesexperimentalextdigestdigestc"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/ext/digest/digest.c (2047 => 2048)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">  * Generates a hex-encoded version of a given _string_.
</span><span class="cx">  */
</span><span class="cx"> static VALUE
</span><del>-rb_digest_s_hexencode(VALUE klass, VALUE str)
</del><ins>+rb_digest_s_hexencode(VALUE klass, SEL sel, VALUE str)
</ins><span class="cx"> {
</span><span class="cx">     return hexencode_str_new(str);
</span><span class="cx"> }
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx">  * state before and after the process.
</span><span class="cx">  */
</span><span class="cx"> static VALUE
</span><del>-rb_digest_instance_hexdigest(int argc, VALUE *argv, VALUE self)
</del><ins>+rb_digest_instance_hexdigest(VALUE self, SEL sel, int argc, VALUE *argv)
</ins><span class="cx"> {
</span><span class="cx">     VALUE str, value;
</span><span class="cx"> 
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx">     rb_str_buf_cat2(str, &quot;#&lt;&quot;);
</span><span class="cx">     rb_str_buf_cat2(str, cname);
</span><span class="cx">     rb_str_buf_cat2(str, &quot;: &quot;);
</span><del>-    rb_str_buf_append(str, rb_digest_instance_hexdigest(0, 0, self));
</del><ins>+    rb_str_buf_append(str, rb_digest_instance_hexdigest(self, 0, 0, 0));
</ins><span class="cx">     rb_str_buf_cat2(str, &quot;&gt;&quot;);
</span><span class="cx">     return str;
</span><span class="cx"> }
</span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx">  * Digest.hexencode(Digest::Class.new(*parameters).digest(string)).
</span><span class="cx">  */
</span><span class="cx"> static VALUE
</span><del>-rb_digest_class_s_hexdigest(int argc, VALUE *argv, VALUE klass)
</del><ins>+rb_digest_class_s_hexdigest(VALUE klass, SEL sel, int argc, VALUE *argv)
</ins><span class="cx"> {
</span><span class="cx">     return hexencode_str_new(rb_funcall2(klass, id_digest, argc, argv));
</span><span class="cx"> }
</span><span class="lines">@@ -586,7 +586,7 @@
</span><span class="cx">     rb_mDigest = rb_define_module(&quot;Digest&quot;);
</span><span class="cx"> 
</span><span class="cx">     /* module functions */
</span><del>-    rb_define_module_function(rb_mDigest, &quot;hexencode&quot;, rb_digest_s_hexencode, 1);
</del><ins>+    rb_objc_define_method(*(VALUE *)rb_mDigest, &quot;hexencode&quot;, rb_digest_s_hexencode, 1);
</ins><span class="cx"> 
</span><span class="cx">     /*
</span><span class="cx">      * module Digest::Instance
</span><span class="lines">@@ -623,7 +623,7 @@
</span><span class="cx"> 
</span><span class="cx">     /* class methods */
</span><span class="cx">     rb_define_singleton_method(rb_cDigest_Class, &quot;digest&quot;, rb_digest_class_s_digest, -1);
</span><del>-    rb_define_singleton_method(rb_cDigest_Class, &quot;hexdigest&quot;, rb_digest_class_s_hexdigest, -1);
</del><ins>+    rb_objc_define_method(*(VALUE *)rb_cDigest_Class, &quot;hexdigest&quot;, rb_digest_class_s_hexdigest, -1);
</ins><span class="cx"> 
</span><span class="cx">     id_metadata = rb_intern(&quot;metadata&quot;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="MacRubybranchesexperimentallibmkmfrb"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/lib/mkmf.rb (2047 => 2048)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx">       begin
</span><span class="cx">         log.print(open {yield})
</span><span class="cx">         @log.close
</span><del>-        File::open(tmplog) {|t| FileUtils.copy_stream(t, log)}
</del><ins>+        #File::open(tmplog) {|t| FileUtils.copy_stream(t, log)}
</ins><span class="cx">       ensure
</span><span class="cx">         @log, @logfile, @orgout, @orgerr = log, *save
</span><span class="cx">         @postpone -= 1
</span><span class="lines">@@ -1923,7 +1923,7 @@
</span><span class="cx"> COMPILE_C = config_string('COMPILE_C') || '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $&lt;'
</span><span class="cx"> COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $&lt;'
</span><span class="cx"> TRY_LINK = config_string('TRY_LINK') ||
</span><del>-  &quot;$(CC) #{OUTFLAG}conftest $(INCFLAGS) $(CPPFLAGS) &quot; \
</del><ins>+  &quot;$(CXX) #{OUTFLAG}conftest $(INCFLAGS) $(CPPFLAGS) &quot; \
</ins><span class="cx">   &quot;$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)&quot;
</span><span class="cx"> LINK_SO = config_string('LINK_SO') ||
</span><span class="cx">   if CONFIG[&quot;DLEXT&quot;] == $OBJEXT
</span></span></pre></div>
<a id="MacRubybranchesexperimentalrakelibbuilderrake"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/rakelib/builder.rake (2047 => 2048)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><span class="cx"> require File.expand_path('../builder', __FILE__)
</span><span class="cx"> require 'rake'
</span><span class="cx"> 
</span><ins>+SUPPORTED_EXTENSIONS = ['ext/ripper', 'ext/digest']
+
</ins><span class="cx"> # We monkey-patch the method that Rake uses to display the tasks so we can add
</span><span class="cx"> # the build options.
</span><span class="cx"> module Rake
</span><span class="lines">@@ -317,10 +319,16 @@
</span><span class="cx"> =begin
</span><span class="cx">   sh &quot;./miniruby -I./lib -I.ext/common -I./- -r./ext/purelib.rb ext/extmk.rb #{EXTMK_ARGS}&quot;
</span><span class="cx"> =end
</span><del>-  Dir.chdir('ext/ripper') do
-    sh &quot;../../miniruby -I../.. -I../../lib extconf.rb&quot;
-    sh &quot;/usr/bin/make top_srcdir=../.. ruby=\&quot;../../miniruby -I../.. -I../../lib\&quot; libdir=../..&quot;
-  end
</del><ins>+        SUPPORTED_EXTENSIONS.each do |dirname|
+          Dir.chdir(dirname) do
+            sh &quot;../../miniruby -I../.. -I../../lib extconf.rb&quot;
+            sh &quot;/usr/bin/make top_srcdir=../.. ruby=\&quot;../../miniruby -I../.. -I../../lib\&quot; libdir=../..&quot;
+          end
+        end
+        Dir.chdir('ext/digest/sha1') do
+                sh &quot;../../../miniruby -I../../.. -I../../../lib extconf.rb&quot;
+    sh &quot;/usr/bin/make top_srcdir=../../.. ruby=\&quot;../../../miniruby -I../../.. -I../../../lib\&quot; libdir=../../..&quot;
+        end
</ins><span class="cx">   $stderr.puts &quot;Skipping other extensions (for now)...&quot;
</span><span class="cx"> end
</span><span class="cx"> 
</span><span class="lines">@@ -364,9 +372,12 @@
</span><span class="cx"> 
</span><span class="cx">   desc &quot;Install the framework&quot;
</span><span class="cx">   task :install =&gt; :info_plist do
</span><del>-    Dir.chdir('ext/ripper') do
-      sh &quot;/usr/bin/make top_srcdir=../.. ruby=../../miniruby install&quot;
-    end
</del><ins>+                SUPPORTED_EXTENSIONS.each do |dirname|
+            Dir.chdir(dirname) do
+              sh &quot;/usr/bin/make top_srcdir=../.. ruby=../../miniruby install&quot;
+            end
+                end
+                Dir.chdir('ext/digest/sha1') { sh &quot;/usr/bin/make top_srcdir=../../.. ruby=../../../miniruby install&quot; }
</ins><span class="cx">     sh &quot;./miniruby instruby.rb #{INSTRUBY_ARGS}&quot;
</span><span class="cx">   end
</span><span class="cx"> end
</span></span></pre>
</div>
</div>

</body>
</html>