[macruby-changes] [318] MacRuby/trunk/sample-macruby/HotCocoa
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jul 7 18:31:56 PDT 2008
Revision: 318
http://trac.macosforge.org/projects/ruby/changeset/318
Author: rich at infoether.com
Date: 2008-07-07 18:31:56 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
allow paths globally or relative to samples dir
Modified Paths:
--------------
MacRuby/trunk/sample-macruby/HotCocoa/box.rb
MacRuby/trunk/sample-macruby/HotCocoa/button.rb
MacRuby/trunk/sample-macruby/HotCocoa/combo_box.rb
MacRuby/trunk/sample-macruby/HotCocoa/font.rb
MacRuby/trunk/sample-macruby/HotCocoa/label.rb
MacRuby/trunk/sample-macruby/HotCocoa/movie_view.rb
MacRuby/trunk/sample-macruby/HotCocoa/popup_action.rb
MacRuby/trunk/sample-macruby/HotCocoa/secure_text_field.rb
MacRuby/trunk/sample-macruby/HotCocoa/segmented_control.rb
MacRuby/trunk/sample-macruby/HotCocoa/table_view.rb
MacRuby/trunk/sample-macruby/HotCocoa/web_view.rb
Modified: MacRuby/trunk/sample-macruby/HotCocoa/box.rb
===================================================================
--- MacRuby/trunk/sample-macruby/HotCocoa/box.rb 2008-07-08 01:25:44 UTC (rev 317)
+++ MacRuby/trunk/sample-macruby/HotCocoa/box.rb 2008-07-08 01:31:56 UTC (rev 318)
@@ -1,5 +1,9 @@
-$:.unshift "../lib"
-require 'hotcocoa'
+begin
+ require 'hotcocoa'
+rescue LoadError => e
+ $:.unshift "../../lib"
+ require 'hotcocoa'
+end
include HotCocoa
Modified: MacRuby/trunk/sample-macruby/HotCocoa/button.rb
===================================================================
--- MacRuby/trunk/sample-macruby/HotCocoa/button.rb 2008-07-08 01:25:44 UTC (rev 317)
+++ MacRuby/trunk/sample-macruby/HotCocoa/button.rb 2008-07-08 01:31:56 UTC (rev 318)
@@ -1,5 +1,9 @@
-$:.unshift "../lib"
-require 'hotcocoa'
+begin
+ require 'hotcocoa'
+rescue LoadError => e
+ $:.unshift "../../lib"
+ require 'hotcocoa'
+end
include HotCocoa
Modified: MacRuby/trunk/sample-macruby/HotCocoa/combo_box.rb
===================================================================
--- MacRuby/trunk/sample-macruby/HotCocoa/combo_box.rb 2008-07-08 01:25:44 UTC (rev 317)
+++ MacRuby/trunk/sample-macruby/HotCocoa/combo_box.rb 2008-07-08 01:31:56 UTC (rev 318)
@@ -1,5 +1,9 @@
-$:.unshift "../lib"
-require 'hotcocoa'
+begin
+ require 'hotcocoa'
+rescue LoadError => e
+ $:.unshift "../../lib"
+ require 'hotcocoa'
+end
include HotCocoa
Modified: MacRuby/trunk/sample-macruby/HotCocoa/font.rb
===================================================================
--- MacRuby/trunk/sample-macruby/HotCocoa/font.rb 2008-07-08 01:25:44 UTC (rev 317)
+++ MacRuby/trunk/sample-macruby/HotCocoa/font.rb 2008-07-08 01:31:56 UTC (rev 318)
@@ -1,5 +1,9 @@
-$:.unshift "../lib"
-require 'hotcocoa'
+begin
+ require 'hotcocoa'
+rescue LoadError => e
+ $:.unshift "../../lib"
+ require 'hotcocoa'
+end
include HotCocoa
Modified: MacRuby/trunk/sample-macruby/HotCocoa/label.rb
===================================================================
--- MacRuby/trunk/sample-macruby/HotCocoa/label.rb 2008-07-08 01:25:44 UTC (rev 317)
+++ MacRuby/trunk/sample-macruby/HotCocoa/label.rb 2008-07-08 01:31:56 UTC (rev 318)
@@ -1,5 +1,9 @@
-$:.unshift "../lib"
-require 'hotcocoa'
+begin
+ require 'hotcocoa'
+rescue LoadError => e
+ $:.unshift "../../lib"
+ require 'hotcocoa'
+end
include HotCocoa
Modified: MacRuby/trunk/sample-macruby/HotCocoa/movie_view.rb
===================================================================
--- MacRuby/trunk/sample-macruby/HotCocoa/movie_view.rb 2008-07-08 01:25:44 UTC (rev 317)
+++ MacRuby/trunk/sample-macruby/HotCocoa/movie_view.rb 2008-07-08 01:31:56 UTC (rev 318)
@@ -1,7 +1,11 @@
framework 'qtkit'
-$:.unshift "../lib"
-require 'hotcocoa'
+begin
+ require 'hotcocoa'
+rescue LoadError => e
+ $:.unshift "../../lib"
+ require 'hotcocoa'
+end
include HotCocoa
Modified: MacRuby/trunk/sample-macruby/HotCocoa/popup_action.rb
===================================================================
--- MacRuby/trunk/sample-macruby/HotCocoa/popup_action.rb 2008-07-08 01:25:44 UTC (rev 317)
+++ MacRuby/trunk/sample-macruby/HotCocoa/popup_action.rb 2008-07-08 01:31:56 UTC (rev 318)
@@ -1,5 +1,9 @@
-$:.unshift "../lib"
-require 'hotcocoa'
+begin
+ require 'hotcocoa'
+rescue LoadError => e
+ $:.unshift "../../lib"
+ require 'hotcocoa'
+end
include HotCocoa
Modified: MacRuby/trunk/sample-macruby/HotCocoa/secure_text_field.rb
===================================================================
--- MacRuby/trunk/sample-macruby/HotCocoa/secure_text_field.rb 2008-07-08 01:25:44 UTC (rev 317)
+++ MacRuby/trunk/sample-macruby/HotCocoa/secure_text_field.rb 2008-07-08 01:31:56 UTC (rev 318)
@@ -1,5 +1,9 @@
-$:.unshift "../lib"
-require 'hotcocoa'
+begin
+ require 'hotcocoa'
+rescue LoadError => e
+ $:.unshift "../../lib"
+ require 'hotcocoa'
+end
include HotCocoa
Modified: MacRuby/trunk/sample-macruby/HotCocoa/segmented_control.rb
===================================================================
--- MacRuby/trunk/sample-macruby/HotCocoa/segmented_control.rb 2008-07-08 01:25:44 UTC (rev 317)
+++ MacRuby/trunk/sample-macruby/HotCocoa/segmented_control.rb 2008-07-08 01:31:56 UTC (rev 318)
@@ -1,5 +1,9 @@
-$:.unshift "../lib"
-require 'hotcocoa'
+begin
+ require 'hotcocoa'
+rescue LoadError => e
+ $:.unshift "../../lib"
+ require 'hotcocoa'
+end
include HotCocoa
Modified: MacRuby/trunk/sample-macruby/HotCocoa/table_view.rb
===================================================================
--- MacRuby/trunk/sample-macruby/HotCocoa/table_view.rb 2008-07-08 01:25:44 UTC (rev 317)
+++ MacRuby/trunk/sample-macruby/HotCocoa/table_view.rb 2008-07-08 01:31:56 UTC (rev 318)
@@ -1,5 +1,9 @@
-$:.unshift "../lib"
-require 'hotcocoa'
+begin
+ require 'hotcocoa'
+rescue LoadError => e
+ $:.unshift "../../lib"
+ require 'hotcocoa'
+end
include HotCocoa
Modified: MacRuby/trunk/sample-macruby/HotCocoa/web_view.rb
===================================================================
--- MacRuby/trunk/sample-macruby/HotCocoa/web_view.rb 2008-07-08 01:25:44 UTC (rev 317)
+++ MacRuby/trunk/sample-macruby/HotCocoa/web_view.rb 2008-07-08 01:31:56 UTC (rev 318)
@@ -1,7 +1,11 @@
framework 'webkit'
-$:.unshift "../lib"
-require 'hotcocoa'
+begin
+ require 'hotcocoa'
+rescue LoadError => e
+ $:.unshift "../../lib"
+ require 'hotcocoa'
+end
include HotCocoa
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macruby-changes/attachments/20080707/a3760c4b/attachment.html
More information about the macruby-changes
mailing list