svn commit: r753067 - in /buildr/trunk: CHANGELOG lib/buildr/scala.rb

[as...@apache.org]

Author: assaf
Date: Thu Mar 12 23:59:29 2009
New Revision: 753067

URL: http://svn.apache.org/viewvc?rev=753067&view=rev
Log:
Change: BUILDR-237 Use MacPorts Scala on OS X.

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/lib/buildr/scala.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=753067&r1=753066&r2=753067&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Thu Mar 12 23:59:29 2009
@@ -21,6 +21,7 @@
 * Change: BUILDR-177 Moved cobertura and emma extensions to lib directory.
 * Change: BUILDR-187 Source code attachment for Eclipse .classpath.
 * Change: BUILDR-188 Source code attachment for IDEA .iml file (Marko Sibakov).
+* Change: BUILDR-237 Use MacPorts Scala on OS X.
 * Change: BUILDR-260: Upgrade to Scala 2.7.3 compatible dependencies:  
           ScalaSpecs 1.4.3, ScalaCheck 1.5 and ScalaTest 0.9.5
 * Change: Buildr now uses Jekyll to generate Web site/documentation:

Modified: buildr/trunk/lib/buildr/scala.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala.rb?rev=753067&r1=753066&r2=753067&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala.rb (original)
+++ buildr/trunk/lib/buildr/scala.rb Thu Mar 12 23:59:29 2009
@@ -14,9 +14,10 @@
 # the License.
 
 
+ENV['SCALA_HOME'] ||= '/opt/local/share/scala/' if File.exist?('/opt/local/share/scala/lib/scala-compiler.jar')
+Buildr.repositories.remote << 'http://scala-tools.org/repo-releases'
+
 require 'buildr/scala/compiler'
 require 'buildr/scala/tests'
 
-Buildr.repositories.remote << 'http://scala-tools.org/repo-releases'
-
 Object::Scala = Buildr::Scala