Author: boisvert
Date: Fri Jul 9 16:59:05 2010
New Revision: 962611
URL: http://svn.apache.org/viewvc?rev=962611&view=rev
Log:
Fix broken _buildr bootstrap: buildr.gemspec may be eval()'ed making __FILE__
undefined.
Now rely on Buildr::VERSION being defined apriori if buildr.gemspec is
eval()'ed.
Modified:
buildr/trunk/_buildr
buildr/trunk/buildr.gemspec
Modified: buildr/trunk/_buildr
URL:
http://svn.apache.org/viewvc/buildr/trunk/_buildr?rev=962611&r1=962610&r2=962611&view=diff
==============================================================================
--- buildr/trunk/_buildr (original)
+++ buildr/trunk/_buildr Fri Jul 9 16:59:05 2010
@@ -19,6 +19,8 @@
require 'rubygems'
$LOAD_PATH << File.join(File.dirname(__FILE__), 'lib') <<
File.join(File.dirname(__FILE__), 'addon')
+
+require 'buildr/version'
spec = Gem::Specification.load(File.join(File.dirname(__FILE__),
'buildr.gemspec'))
# To avoid a warning about the version_requirements deprecation, we use this
method inline.
def version_required(gem_def)
Modified: buildr/trunk/buildr.gemspec
URL:
http://svn.apache.org/viewvc/buildr/trunk/buildr.gemspec?rev=962611&r1=962610&r2=962611&view=diff
==============================================================================
--- buildr/trunk/buildr.gemspec (original)
+++ buildr/trunk/buildr.gemspec Fri Jul 9 16:59:05 2010
@@ -13,7 +13,10 @@
# License for the specific language governing permissions and limitations under
# the License.
-require File.join(File.dirname(__FILE__), 'lib', 'buildr', 'version.rb')
+unless defined?(Buildr::VERSION)
+ require File.join(File.dirname(__FILE__), 'lib', 'buildr', 'version.rb')
+end
+
Gem::Specification.new do |spec|
spec.name = 'buildr'
spec.version = Buildr::VERSION
@@ -57,7 +60,7 @@ for those one-off tasks, with a language
spec.add_dependency 'rubyforge', '2.0.3'
spec.add_dependency 'hoe', '2.3.3'
spec.add_dependency 'rjb', '1.2.5' if spec.platform.to_s ==
'ruby'
- spec.add_dependency 'rjb', '1.2.5' if spec.platform.to_s ==
'x86-mswin32'
+ spec.add_dependency 'rjb', '1.2.5' if spec.platform.to_s ==
'x86-mswin32'
spec.add_dependency 'Antwrap', '0.7.0'
spec.add_dependency 'rspec', '>= 1.2.9'
spec.add_dependency 'xml-simple', '1.0.12'
