svn commit: r1202956 - in /buildr/trunk: CHANGELOG buildr.gemspec

[to...@apache.org]

Author: toulmean
Date: Thu Nov 17 00:38:11 2011
New Revision: 1202956

URL: http://svn.apache.org/viewvc?rev=1202956&view=rev
Log:
BUILDR-614 Buildr development - Using rvm, bundler and OSX installs the wrong rjb (Russell Teabeault)

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/buildr.gemspec

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1202956&r1=1202955&r2=1202956&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Thu Nov 17 00:38:11 2011
@@ -42,6 +42,7 @@
 * Change: Upgrade to JRuby 1.6.2
 * Change: Move to Bundler to manage the project dependencies
 * Change: BUILDR-548 Remove support for JTestR as it is no longer maintained (Antoine Toulme)
+* Change: BUILDR-614 Buildr development - Using rvm, bundler and OSX installs the wrong rjb (Russell Teabeault)
 * Fixed:  ArtifactNamespace fails when using artifacts with classfier.
 * Fixed:  Buildr.artifacts() should handle any object with :to_spec method
           (i.e., any object that ActsAsArtifact)

Modified: buildr/trunk/buildr.gemspec
URL: http://svn.apache.org/viewvc/buildr/trunk/buildr.gemspec?rev=1202956&r1=1202955&r2=1202956&view=diff
==============================================================================
--- buildr/trunk/buildr.gemspec (original)
+++ buildr/trunk/buildr.gemspec Thu Nov 17 00:38:11 2011
@@ -61,7 +61,12 @@ for those one-off tasks, with a language
   spec.add_dependency 'json_pure',            '1.4.3'
   spec.add_dependency 'rubyforge',            '2.0.3'
   spec.add_dependency 'hoe',                  '2.3.3'
-  spec.add_dependency 'rjb',                  '1.3.3' if spec.platform.to_s == 'ruby'
+  if spec.platform.to_s == 'ruby'
+    if RUBY_PLATFORM.downcase.include?("darwin") && !ENV["rvm_ruby_string"].nil? && ENV["rvm_ruby_string"] != 'system' 
+        Gem.platforms = [Gem::Platform::RUBY] 
+    end
+    spec.add_dependency 'rjb',                  '1.3.3'
+  end
   spec.add_dependency 'rjb',                  '1.3.2' if spec.platform.to_s == 'x86-mswin32'
   spec.add_dependency 'atoulme-Antwrap',      '~> 0.7.2'
   spec.add_dependency 'diff-lcs',             '1.1.2'