svn commit: r961554 - in /buildr/trunk: buildr.gemspec lib/buildr.rb

[to...@apache.org]

Author: toulmean
Date: Thu Jul  8 01:52:22 2010
New Revision: 961554

URL: http://svn.apache.org/viewvc?rev=961554&view=rev
Log:
fix for invalid path, and requiring the file only once

Modified:
    buildr/trunk/buildr.gemspec
    buildr/trunk/lib/buildr.rb

Modified: buildr/trunk/buildr.gemspec
URL: http://svn.apache.org/viewvc/buildr/trunk/buildr.gemspec?rev=961554&r1=961553&r2=961554&view=diff
==============================================================================
--- buildr/trunk/buildr.gemspec (original)
+++ buildr/trunk/buildr.gemspec Thu Jul  8 01:52:22 2010
@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require File.expand_path(__FILE__, '../lib/buildr/version.rb')
+require File.join(File.dirname(__FILE__), 'lib', 'buildr', 'version.rb')
 Gem::Specification.new do |spec|
   spec.name           = 'buildr'
   spec.version        = Buildr::VERSION

Modified: buildr/trunk/lib/buildr.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr.rb?rev=961554&r1=961553&r2=961554&view=diff
==============================================================================
--- buildr/trunk/lib/buildr.rb (original)
+++ buildr/trunk/lib/buildr.rb Thu Jul  8 01:52:22 2010
@@ -13,7 +13,9 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'buildr/version'
+unless defined?(Buildr::VERSION)
+  require 'buildr/version'
+end
 
 require 'buildr/core'
 require 'buildr/packaging'