<!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>[2056] MacRuby/branches/experimental/rakelib/builder.rake</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/2056">2056</a></dd>
<dt>Author</dt> <dd>lsansonetti@apple.com</dd>
<dt>Date</dt> <dd>2009-07-22 17:27:22 -0700 (Wed, 22 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>better code path to deal with extensions</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#MacRubybranchesexperimentalrakelibbuilderrake">MacRuby/branches/experimental/rakelib/builder.rake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="MacRubybranchesexperimentalrakelibbuilderrake"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/rakelib/builder.rake (2055 => 2056)</h4>
<pre class="diff"><span>
<span class="info">--- MacRuby/branches/experimental/rakelib/builder.rake 2009-07-23 00:06:31 UTC (rev 2055)
+++ MacRuby/branches/experimental/rakelib/builder.rake 2009-07-23 00:27:22 UTC (rev 2056)
</span><span class="lines">@@ -1,9 +1,6 @@
</span><span class="cx"> require File.expand_path('../builder', __FILE__)
</span><span class="cx"> require 'rake'
</span><span class="cx">
</span><del>-SUPPORTED_EXTENSIONS = ['ext/ripper', 'ext/digest']
-DIGESTS = %w{ sha1 md5 rmd160 bubblebabble sha2 }
-
</del><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">@@ -315,24 +312,37 @@
</span><span class="cx"> EXTMK_ARGS = "#{SCRIPT_ARGS} --extension --extstatic"
</span><span class="cx"> INSTRUBY_ARGS = "#{SCRIPT_ARGS} --data-mode=0644 --prog-mode=0755 --installed-list #{INSTALLED_LIST} --mantype=\"doc\" --sym-dest-dir=\"#{SYM_INSTDIR}\""
</span><span class="cx">
</span><ins>+EXTENSIONS = ['ripper']#, 'digest']
+def perform_extensions_target(target)
+ EXTENSIONS.map { |x| File.join('ext', x) }.each do |ext_dir|
+ Dir.glob(File.join(ext_dir, '**/extconf.rb')) do |p|
+ dir = File.dirname(p)
+ Dir.chdir(dir) do
+ srcdir = File.join(*dir.split(File::SEPARATOR).map { |x| '..' })
+ if !File.exist?('Makefile') or File.mtime('extconf.rb') > File.mtime('Makefile')
+ sh "#{srcdir}/miniruby -I#{srcdir} -I#{srcdir}/lib extconf.rb"
+ end
+ line = "/usr/bin/make top_srcdir=#{srcdir} ruby=\"#{srcdir}/miniruby -I#{srcdir} -I#{srcdir}/lib\""
+ case target
+ when :all
+ line << " libdir=#{srcdir}"
+ when :install
+ line << " install"
+ else
+ raise "invalid extensions target #{target}"
+ end
+ sh line
+ end
+ end
+ end
+end
+
</ins><span class="cx"> desc "Build extensions"
</span><span class="cx"> task :extensions => [:miniruby, "macruby:static"] do
</span><span class="cx"> =begin
</span><span class="cx"> sh "./miniruby -I./lib -I.ext/common -I./- -r./ext/purelib.rb ext/extmk.rb #{EXTMK_ARGS}"
</span><span class="cx"> =end
</span><del>- 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
- DIGESTS.each do |digest|
- Dir.chdir("ext/digest/#{digest}") do
- sh "../../../miniruby -I../../.. -I../../../lib extconf.rb"
- sh "/usr/bin/make top_srcdir=../../.. ruby=\"../../../miniruby -I../../.. -I../../../lib\" libdir=../../.."
- end
- end
- $stderr.puts "Skipping other extensions (for now)..."
</del><ins>+ perform_extensions_target(:all)
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> namespace :framework do
</span><span class="lines">@@ -375,16 +385,7 @@
</span><span class="cx">
</span><span class="cx"> desc "Install the framework"
</span><span class="cx"> task :install => :info_plist do
</span><del>- SUPPORTED_EXTENSIONS.each do |dirname|
- Dir.chdir(dirname) do
- sh "/usr/bin/make top_srcdir=../.. ruby=../../miniruby install"
- end
- end
- DIGESTS.each do |digest|
- Dir.chdir("ext/digest/#{digest}") do
- sh "/usr/bin/make top_srcdir=../.. ruby=../../miniruby install"
- end
- end
</del><ins>+ perform_extensions_target(:install)
</ins><span class="cx"> sh "./miniruby instruby.rb #{INSTRUBY_ARGS}"
</span><span class="cx"> end
</span><span class="cx"> end
</span></span></pre>
</div>
</div>
</body>
</html>