svn commit: r1394893 - in /buildr/trunk: buildr.gemspec lib/buildr/java/rjb.rb

[do...@apache.org]

Author: donaldp
Date: Sat Oct  6 01:48:55 2012
New Revision: 1394893

URL: http://svn.apache.org/viewvc?rev=1394893&view=rev
Log:
Add some TODO notes to indicate that when we update the rjb dependency we should remove the hack of setting the JVM_LIB environment variable

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

Modified: buildr/trunk/buildr.gemspec
URL: http://svn.apache.org/viewvc/buildr/trunk/buildr.gemspec?rev=1394893&r1=1394892&r2=1394893&view=diff
==============================================================================
--- buildr/trunk/buildr.gemspec (original)
+++ buildr/trunk/buildr.gemspec Sat Oct  6 01:48:55 2012
@@ -63,6 +63,7 @@ for those one-off tasks, with a language
   spec.add_dependency 'json_pure',            '1.7.5'
   spec.add_dependency 'rubyforge',            '2.0.4'
   spec.add_dependency 'hoe',                  '3.1.0'
+  # TODO: See note in rjb.rb when upgrading rjb
   spec.add_dependency 'rjb',                  '1.4.1' if ($platform.to_s == 'x86-mswin32' || $platform.to_s == 'ruby')
   spec.add_dependency 'atoulme-Antwrap',      '~> 0.7.2'
   spec.add_dependency 'diff-lcs',             '1.1.3'

Modified: buildr/trunk/lib/buildr/java/rjb.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/rjb.rb?rev=1394893&r1=1394892&r2=1394893&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/rjb.rb (original)
+++ buildr/trunk/lib/buildr/java/rjb.rb Sat Oct  6 01:48:55 2012
@@ -22,6 +22,7 @@ if RbConfig::CONFIG['host_os'] =~ /darwi
     # For JDK1.7 this file exists. We need to ensure JVM_LIB is set before loading rjb
     # As RJB uses it to determine which library to load.
     # SEE https://github.com/arton/rjb/issues/12#issuecomment-9179415
+    # TODO: Remove this after upgrade to RJB > 1.4.1 as it should be built in.
     if File.exist?("#{ENV['JAVA_HOME']}/jre/lib/server/libjvm.dylib")
       ENV['JVM_LIB'] = "#{ENV['JAVA_HOME']}/jre/lib/server/libjvm.dylib"
     end