nobody at rubyforge.org
2006-Dec-12  00:43 UTC
[Wxruby-development] [783] trunk/wxruby2: Tweak load error handling so failures with binary lib are reported correctly
<!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" /><style
type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:'':'';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding:
6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[783] trunk/wxruby2: Tweak load error handling so failures with
binary lib are reported correctly</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>783</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2006-12-11 19:43:14 -0500 (Mon, 11 Dec
2006)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tweak load error handling so failures with binary lib are reported
correctly</pre>
<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2libwxrb">trunk/wxruby2/lib/wx.rb</a></li>
<li><a
href="#trunkwxruby2samplesminimalminimalrb">trunk/wxruby2/samples/minimal/minimal.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2libwxrb"></a>
<div class="modfile"><h4>Modified: trunk/wxruby2/lib/wx.rb
(782 => 783)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/lib/wx.rb        2006-12-12
00:14:41 UTC (rev 782)
+++
trunk/wxruby2/lib/wx.rb        2006-12-12
00:43:14 UTC (rev 783)
</span><span class="lines">@@ -7,14 +7,11 @@
</span><span class="cx"> # 2. It sets up the version
information
</span><span class="cx"> # 3. It loads in ruby extensions
to the core Wx classes.
</span><span class="cx"> 
</span><del>-begin
-  require ''wxruby2''
-rescue LoadError => e
-  warn "LoadError: unable to load wxruby2 binary. Searched:"
-  warn $LOAD_PATH.inspect
-  exit 1
-end
</del><span class="cx"> 
</span><ins>+# load the binary library
+require ''wxruby2''
+
+# alias the module
</ins><span class="cx"> Wx = Wxruby2
</span><span class="cx"> 
</span><span class="cx"> # Load the version information
(should be bundled with all released versions)
</span></span></pre></div>
<a id="trunkwxruby2samplesminimalminimalrb"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/samples/minimal/minimal.rb (782 => 783)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/samples/minimal/minimal.rb        2006-12-12
00:14:41 UTC (rev 782)
+++
trunk/wxruby2/samples/minimal/minimal.rb        2006-12-12
00:43:14 UTC (rev 783)
</span><span class="lines">@@ -6,9 +6,9 @@
</span><span class="cx">   require ''wx''
</span><span class="cx"> rescue LoadError => no_wx_err
</span><span class="cx">   begin
</span><del>-    require ''rubygems''
-    require ''wx''
-  rescue LoadError
</del><ins>+    require ''rubygems'' 
+    load ''wx''
+  rescue
</ins><span class="cx">     raise no_wx_err
</span><span class="cx">   end
</span><span class="cx"> end
</span></span></pre>
</div>
</div>
</body>
</html>
Possibly Parallel Threads
- [704] trunk/wxruby2/lib: Auto-load classes from lib/wx/classes; implement Window#paint in Ruby
- [778] trunk/wxruby2: Remove broken and deprecated LayoutConstraints, update samples & docs
- [782] trunk/wxruby2/samples/bigdemo: HtmlHelpWindow sample with helpfile
- [755] trunk/wxruby2/lib/wx/classes: Nicer more meaningful string representations of objects; hide Wxruby2
- [1003] trunk/wxruby2: Create correct WXWIDGETS_VERSION string constant instead of hardcoding
