svn commit: r617296 - in /incubator/buildr/trunk: CHANGELOG doc/css/default.css doc/pages/building.textile doc/pages/whats_new.textile lib/core/test.rb

[as...@apache.org]

Author: assaf
Date: Thu Jan 31 15:44:35 2008
New Revision: 617296

URL: http://svn.apache.org/viewvc?rev=617296&view=rev
Log:
BUILDR-33

Modified:
    incubator/buildr/trunk/CHANGELOG
    incubator/buildr/trunk/doc/css/default.css
    incubator/buildr/trunk/doc/pages/building.textile
    incubator/buildr/trunk/doc/pages/whats_new.textile
    incubator/buildr/trunk/lib/core/test.rb

Modified: incubator/buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/CHANGELOG?rev=617296&r1=617295&r2=617296&view=diff
==============================================================================
--- incubator/buildr/trunk/CHANGELOG (original)
+++ incubator/buildr/trunk/CHANGELOG Thu Jan 31 15:44:35 2008
@@ -6,6 +6,7 @@
 * Added: EAR packaging (Victor Hugo Borja).
 * Added: Profiles(.yaml), based on the code provided by Yanko Ivanov.
 * Added: Consolidated API for RJB and JRuby, replacing the now deprecated JavaWrapper.
+* Added: JRuby 1.1 support (Victor Hugo Borja, Nick Sieger).
 * Changed: Upgraded to Rake 0.8, RSpec 1.1, RJB 1.1, Facets 2.2, OpenJPA 1.0.1.
 * Changed: Resources are now copied to target/resources instead of target/classes, and target/test/resources instead of target/test-resources.
 * Changed: Test cases are not compiled into target/test/classes instead of target/test-classes.

Modified: incubator/buildr/trunk/doc/css/default.css
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/doc/css/default.css?rev=617296&r1=617295&r2=617296&view=diff
==============================================================================
--- incubator/buildr/trunk/doc/css/default.css (original)
+++ incubator/buildr/trunk/doc/css/default.css Thu Jan 31 15:44:35 2008
@@ -168,7 +168,7 @@
 
 ol.toc ol.toc {
   list-style: none;
-  margin: 0.3em 0 0.5em 0;
+  margin: 0.3em 0 0 0 !important;
   padding: 0;
 }
 

Modified: incubator/buildr/trunk/doc/pages/building.textile
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/doc/pages/building.textile?rev=617296&r1=617295&r2=617296&view=diff
==============================================================================
--- incubator/buildr/trunk/doc/pages/building.textile (original)
+++ incubator/buildr/trunk/doc/pages/building.textile Thu Jan 31 15:44:35 2008
@@ -186,7 +186,7 @@
 }}}
 
 
-h3. Java
+h3. Compiling Java
 
 The Java compiler looks for source files in the project's @src/main/java@
 directory, and defaults to compiling them into the @target/classes@ directory.
@@ -216,7 +216,7 @@
 mode.
 
 
-h3. Scala
+h3. Compiling Scala
 
 Before using the Scala compiler, you must first set the environment variable
 @SCALA_HOME@.

Modified: incubator/buildr/trunk/doc/pages/whats_new.textile
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/doc/pages/whats_new.textile?rev=617296&r1=617295&r2=617296&view=diff
==============================================================================
--- incubator/buildr/trunk/doc/pages/whats_new.textile (original)
+++ incubator/buildr/trunk/doc/pages/whats_new.textile Thu Jan 31 15:44:35 2008
@@ -18,6 +18,8 @@
 picked for JVM compilers (Java, Scala, etc), so resources are not copied to
 their own directory, @target/resources@.  The prepare task has been removed.
 
+"Read more about Javac and Scalac":building.html#compiling_java
+
 Not all languages have classpaths, so @compile.classpath@ is now known as
 @compile.dependencies@, but the old attribute still exists for backward
 compatibility.

Modified: incubator/buildr/trunk/lib/core/test.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/core/test.rb?rev=617296&r1=617295&r2=617296&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/core/test.rb (original)
+++ incubator/buildr/trunk/lib/core/test.rb Thu Jan 31 15:44:35 2008
@@ -538,7 +538,8 @@
     after_define do |project|
       test = project.test
       # Dependency on compiled code, its dependencies and resources.
-      test.with project.compile.dependencies, Array(project.compile.target) if project.compile.target
+      test.with project.compile.dependencies
+      test.with Array(project.compile.target) if project.compile.target
       test.with Array(project.resources.target)
       # Dependency on compiled tests and resources.  Dependencies added using with.
       test.dependencies.concat Array(test.compile.target) if test.compile.target