Author: donaldp
Date: Mon Jul 25 10:56:27 2011
New Revision: 1150627
URL: http://svn.apache.org/viewvc?rev=1150627&view=rev
Log:
BUILDR-600 Centralize the common ad internal requires into one location
Removed:
buildr/trunk/lib/buildr/core.rb
buildr/trunk/lib/buildr/ide.rb
buildr/trunk/lib/buildr/java.rb
buildr/trunk/lib/buildr/packaging.rb
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/addon/buildr/antlr.rb
buildr/trunk/addon/buildr/cobertura.rb
buildr/trunk/addon/buildr/drb.rb
buildr/trunk/addon/buildr/emma.rb
buildr/trunk/addon/buildr/hibernate.rb
buildr/trunk/addon/buildr/javacc.rb
buildr/trunk/addon/buildr/jdepend.rb
buildr/trunk/addon/buildr/jetty.rb
buildr/trunk/addon/buildr/openjpa.rb
buildr/trunk/addon/buildr/protobuf.rb
buildr/trunk/addon/buildr/xmlbeans.rb
buildr/trunk/lib/buildr.rb
buildr/trunk/lib/buildr/clojure.rb
buildr/trunk/lib/buildr/core/application.rb
buildr/trunk/lib/buildr/core/build.rb
buildr/trunk/lib/buildr/core/cc.rb
buildr/trunk/lib/buildr/core/checks.rb
buildr/trunk/lib/buildr/core/common.rb
buildr/trunk/lib/buildr/core/compile.rb
buildr/trunk/lib/buildr/core/environment.rb
buildr/trunk/lib/buildr/core/filter.rb
buildr/trunk/lib/buildr/core/generate.rb
buildr/trunk/lib/buildr/core/help.rb
buildr/trunk/lib/buildr/core/linux.rb
buildr/trunk/lib/buildr/core/osx.rb
buildr/trunk/lib/buildr/core/project.rb
buildr/trunk/lib/buildr/core/run.rb
buildr/trunk/lib/buildr/core/shell.rb
buildr/trunk/lib/buildr/core/test.rb
buildr/trunk/lib/buildr/core/transports.rb
buildr/trunk/lib/buildr/core/util.rb
buildr/trunk/lib/buildr/groovy/doc.rb
buildr/trunk/lib/buildr/groovy/shell.rb
buildr/trunk/lib/buildr/ide/eclipse.rb
buildr/trunk/lib/buildr/ide/eclipse/java.rb
buildr/trunk/lib/buildr/ide/eclipse/plugin.rb
buildr/trunk/lib/buildr/ide/eclipse/scala.rb
buildr/trunk/lib/buildr/ide/idea.rb
buildr/trunk/lib/buildr/java/ant.rb
buildr/trunk/lib/buildr/java/bdd.rb
buildr/trunk/lib/buildr/java/cobertura.rb
buildr/trunk/lib/buildr/java/commands.rb
buildr/trunk/lib/buildr/java/compiler.rb
buildr/trunk/lib/buildr/java/deprecated.rb
buildr/trunk/lib/buildr/java/doc.rb
buildr/trunk/lib/buildr/java/emma.rb
buildr/trunk/lib/buildr/java/jruby.rb
buildr/trunk/lib/buildr/java/packaging.rb
buildr/trunk/lib/buildr/java/pom.rb
buildr/trunk/lib/buildr/java/test_result.rb
buildr/trunk/lib/buildr/java/tests.rb
buildr/trunk/lib/buildr/packaging/archive.rb
buildr/trunk/lib/buildr/packaging/artifact.rb
buildr/trunk/lib/buildr/packaging/artifact_namespace.rb
buildr/trunk/lib/buildr/packaging/artifact_search.rb
buildr/trunk/lib/buildr/packaging/gems.rb
buildr/trunk/lib/buildr/packaging/package.rb
buildr/trunk/lib/buildr/packaging/tar.rb
buildr/trunk/lib/buildr/packaging/zip.rb
buildr/trunk/lib/buildr/packaging/ziptask.rb
buildr/trunk/lib/buildr/run.rb
buildr/trunk/lib/buildr/scala/bdd.rb
buildr/trunk/lib/buildr/scala/compiler.rb
buildr/trunk/lib/buildr/scala/doc.rb
buildr/trunk/lib/buildr/scala/shell.rb
buildr/trunk/lib/buildr/scala/tests.rb
buildr/trunk/lib/buildr/shell.rb
Modified: buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Mon Jul 25 10:56:27 2011
@@ -1,4 +1,5 @@
1.4.7 (Pending)
+* Change: BUILDR-600 Centralize the common ad internal requires into one
location.
* 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)
Modified: buildr/trunk/addon/buildr/antlr.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/addon/buildr/antlr.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/addon/buildr/antlr.rb (original)
+++ buildr/trunk/addon/buildr/antlr.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/java'
-
-
module Buildr
# Provides ANTLR grammar generation tasks. Require explicitly using
<code>require "buildr/antlr"</code>.
module ANTLR
Modified: buildr/trunk/addon/buildr/cobertura.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/addon/buildr/cobertura.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/addon/buildr/cobertura.rb (original)
+++ buildr/trunk/addon/buildr/cobertura.rb Mon Jul 25 10:56:27 2011
@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
if Buildr::VERSION < '1.5'
Buildr.application.deprecated "'buildr/cobertura', use
'buildr/java/cobertura' instead"
require 'buildr/java/cobertura'
Modified: buildr/trunk/addon/buildr/drb.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/addon/buildr/drb.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/addon/buildr/drb.rb (original)
+++ buildr/trunk/addon/buildr/drb.rb Mon Jul 25 10:56:27 2011
@@ -13,11 +13,9 @@
# License for the specific language governing permissions and limitations under
# the License.
-
require 'delegate'
require 'drb/drb'
-
module Buildr
# This addon allows you start a DRb server hosting a buildfile, so that
Modified: buildr/trunk/addon/buildr/emma.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/addon/buildr/emma.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/addon/buildr/emma.rb (original)
+++ buildr/trunk/addon/buildr/emma.rb Mon Jul 25 10:56:27 2011
@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
if Buildr::VERSION < '1.5'
Buildr.application.deprecated "'buildr/emma', use 'buildr/java/emma' instead"
require 'buildr/java/emma'
Modified: buildr/trunk/addon/buildr/hibernate.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/addon/buildr/hibernate.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/addon/buildr/hibernate.rb (original)
+++ buildr/trunk/addon/buildr/hibernate.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/java'
-
-
module Buildr
# Provides Hibernate Doclet and schema export tasks. Require explicitly
using <code>require "buildr/hibernate"</code>.
Modified: buildr/trunk/addon/buildr/javacc.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/addon/buildr/javacc.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/addon/buildr/javacc.rb (original)
+++ buildr/trunk/addon/buildr/javacc.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/java'
-
-
module Buildr
# Provides JavaCC compile tasks. Require explicitly using <code>require
"buildr/javacc"</code>.
module JavaCC
Modified: buildr/trunk/addon/buildr/jdepend.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/addon/buildr/jdepend.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/addon/buildr/jdepend.rb (original)
+++ buildr/trunk/addon/buildr/jdepend.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/java'
-
-
module Buildr
# Addes the <code>jdepend:swing</code>, <code>jdepend:text</code> and
<code>jdepend:xml</code> tasks.
Modified: buildr/trunk/addon/buildr/jetty.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/addon/buildr/jetty.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/addon/buildr/jetty.rb (original)
+++ buildr/trunk/addon/buildr/jetty.rb Mon Jul 25 10:56:27 2011
@@ -13,15 +13,10 @@
# License for the specific language governing permissions and limitations under
# the License.
-
require 'uri'
require 'net/http'
-require 'buildr/core/project'
-require 'buildr/java'
-require 'buildr/packaging'
require 'thread'
-
module Buildr
# Provides a collection of tasks and methods for using Jetty, specifically
as a server
Modified: buildr/trunk/addon/buildr/openjpa.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/addon/buildr/openjpa.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/addon/buildr/openjpa.rb (original)
+++ buildr/trunk/addon/buildr/openjpa.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/java'
-
-
module Buildr
# Provides OpenJPA bytecode enhancement and Mapping tool task. Require
explicitly using <code>require "buildr/openjpa"</code>.
Modified: buildr/trunk/addon/buildr/protobuf.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/addon/buildr/protobuf.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/addon/buildr/protobuf.rb (original)
+++ buildr/trunk/addon/buildr/protobuf.rb Mon Jul 25 10:56:27 2011
@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
module Buildr
# Provides Protocol buffer code generation tasks.
Modified: buildr/trunk/addon/buildr/xmlbeans.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/addon/buildr/xmlbeans.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/addon/buildr/xmlbeans.rb (original)
+++ buildr/trunk/addon/buildr/xmlbeans.rb Mon Jul 25 10:56:27 2011
@@ -13,11 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/java'
-require 'buildr/java/ant'
-
-
module Buildr
# Provides XMLBeans schema compiler. Require explicitly using <code>require
"buildr/xmlbeans"</code>.
Modified: buildr/trunk/lib/buildr.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr.rb (original)
+++ buildr/trunk/lib/buildr.rb Mon Jul 25 10:56:27 2011
@@ -17,12 +17,75 @@ unless defined?(Buildr::VERSION)
require 'buildr/version'
end
-require 'buildr/core'
-require 'buildr/packaging'
-require 'buildr/java'
-require 'buildr/ide'
+require 'rake'
+require 'rbconfig'
+require 'pathname'
+autoload :Tempfile, 'tempfile'
+autoload :YAML, 'yaml'
+autoload :REXML, 'rexml/document'
+autoload :XmlSimple, 'xmlsimple'
+autoload :Builder, 'builder' # A different kind of buildr, one we use to
create XML.
+require 'highline/import'
+autoload :RSpec, 'rspec'
+require 'erb'
+require 'find'
+require 'uri'
+require 'stringio'
+require 'fileutils'
+require 'yaml' # From test_result.rb: necessary to require YAML even if it is
mentioned by autoload as it fails on some platforms.
+require 'rspec/core/formatters/base_formatter' # From test_result.rb
+
+
+require 'buildr/core/util'
+require 'buildr/core/common'
+require 'buildr/core/application'
+require 'buildr/core/jrebel'
+require 'buildr/core/project'
+require 'buildr/core/environment'
+require 'buildr/core/help'
+require 'buildr/core/checks'
+require 'buildr/core/build'
+require 'buildr/core/filter'
+require 'buildr/core/compile'
+require 'buildr/core/test'
require 'buildr/shell'
+require 'buildr/java/commands'
+require 'buildr/core/shell'
require 'buildr/run'
+require 'buildr/core/run'
+require 'buildr/core/transports'
+require 'buildr/java/pom'
+require 'buildr/core/generate'
+require 'buildr/core/cc'
+require 'buildr/core/doc'
+require 'buildr/core/osx' if RUBY_PLATFORM =~ /darwin/
+require 'buildr/core/linux' if RUBY_PLATFORM =~ /linux/
+require 'buildr/packaging/version_requirement'
+require 'buildr/packaging/artifact_namespace'
+require 'buildr/packaging/artifact'
+require 'buildr/packaging/package'
+require 'buildr/packaging/archive'
+require 'buildr/packaging/ziptask'
+require 'buildr/packaging/tar'
+require 'buildr/packaging/gems'
+require 'buildr/packaging/zip'
+require RUBY_PLATFORM == 'java' ? 'buildr/java/jruby' : 'buildr/java/rjb'
+require 'buildr/java/ant'
+require 'buildr/java/compiler'
+require 'buildr/java/external'
+require 'buildr/java/tests'
+require 'buildr/java/test_result'
+require 'buildr/java/bdd'
+require 'buildr/java/packaging'
+require 'buildr/java/commands'
+require 'buildr/java/doc'
+require 'buildr/java/deprecated'
+require 'buildr/ide/idea'
+require 'buildr/ide/eclipse'
+# Order is significant for auto-detection, from most specific to least
+require 'buildr/ide/eclipse/plugin'
+require 'buildr/ide/eclipse/scala'
+require 'buildr/ide/eclipse/java'
# Methods defined in Buildr are both instance methods (e.g. when included in
Project)
# and class methods when invoked like Buildr.artifacts().
Modified: buildr/trunk/lib/buildr/clojure.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/clojure.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/clojure.rb (original)
+++ buildr/trunk/lib/buildr/clojure.rb Mon Jul 25 10:56:27 2011
@@ -14,8 +14,6 @@
# the License.
-require 'buildr/core/util'
-
module Buildr::Clojure
REQUIRES = ArtifactNamespace.for(self) do |ns|
Modified: buildr/trunk/lib/buildr/core/application.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/application.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/application.rb (original)
+++ buildr/trunk/lib/buildr/core/application.rb Mon Jul 25 10:56:27 2011
@@ -36,15 +36,10 @@
# SOFTWARE.
-require 'rake'
-require 'highline/import'
-require 'buildr/core/util'
-
# Gem::user_home is nice, but ENV['HOME'] lets you override from the
environment.
ENV['HOME'] ||= File.expand_path(Gem::user_home)
ENV['BUILDR_ENV'] ||= 'development'
-
module Buildr
# Provide settings that come from three sources.
Modified: buildr/trunk/lib/buildr/core/build.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/build.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/build.rb (original)
+++ buildr/trunk/lib/buildr/core/build.rb Mon Jul 25 10:56:27 2011
@@ -13,13 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/core/project'
-require 'buildr/core/common'
-require 'buildr/core/checks'
-require 'buildr/core/environment'
-
-
module Buildr
class Options
Modified: buildr/trunk/lib/buildr/core/cc.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/cc.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/cc.rb (original)
+++ buildr/trunk/lib/buildr/core/cc.rb Mon Jul 25 10:56:27 2011
@@ -13,11 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-require 'buildr/core/common'
-require 'buildr/core/project'
-require 'buildr/core/build'
-require 'buildr/core/compile'
-
module Buildr
class CCTask < Rake::Task
attr_accessor :delay
Modified: buildr/trunk/lib/buildr/core/checks.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/checks.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/checks.rb (original)
+++ buildr/trunk/lib/buildr/core/checks.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/core/project'
-autoload :RSpec, 'rspec'
-
module Buildr
# Methods added to Project to allow checking the build.
module Checks
Modified: buildr/trunk/lib/buildr/core/common.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/common.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/common.rb (original)
+++ buildr/trunk/lib/buildr/core/common.rb Mon Jul 25 10:56:27 2011
@@ -13,11 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'rake'
-require 'buildr/core/util'
-
-
module Buildr
# :call-seq:
Modified: buildr/trunk/lib/buildr/core/compile.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/compile.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/compile.rb (original)
+++ buildr/trunk/lib/buildr/core/compile.rb Mon Jul 25 10:56:27 2011
@@ -13,11 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/core/common'
-require 'find'
-
-
module Buildr
# The underlying compiler used by CompileTask.
Modified: buildr/trunk/lib/buildr/core/environment.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/environment.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/environment.rb (original)
+++ buildr/trunk/lib/buildr/core/environment.rb Mon Jul 25 10:56:27 2011
@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
module Buildr
# Collection of options for controlling Buildr.
Modified: buildr/trunk/lib/buildr/core/filter.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/filter.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/filter.rb (original)
+++ buildr/trunk/lib/buildr/core/filter.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'erb'
-
-
module Buildr
# A filter knows how to copy files from one directory to another, applying
mappings to the
@@ -364,7 +360,6 @@ module Buildr
else
bnd = config.instance_eval { binding }
end
- require 'erb'
ERB.new(content).result(bnd)
end
Modified: buildr/trunk/lib/buildr/core/generate.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/generate.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/generate.rb (original)
+++ buildr/trunk/lib/buildr/core/generate.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/java/pom'
-
-
module Buildr
module Generate #:nodoc:
Modified: buildr/trunk/lib/buildr/core/help.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/help.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/help.rb (original)
+++ buildr/trunk/lib/buildr/core/help.rb Mon Jul 25 10:56:27 2011
@@ -13,11 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/core/common'
-require 'buildr/core/project'
-
-
module Buildr
module Help #:nodoc:
Modified: buildr/trunk/lib/buildr/core/linux.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/linux.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/linux.rb (original)
+++ buildr/trunk/lib/buildr/core/linux.rb Mon Jul 25 10:56:27 2011
@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
# Let's see if we can use notify-send. Must be running from console in
verbose mode.
if $stdout.isatty && verbose
system("which notify-send > /dev/null 2>/dev/null")
Modified: buildr/trunk/lib/buildr/core/osx.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/osx.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/osx.rb (original)
+++ buildr/trunk/lib/buildr/core/osx.rb Mon Jul 25 10:56:27 2011
@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
# Let's see if we can use Growl. Must be running from console in verbose mode.
if $stdout.isatty && verbose
def growl_notify(type, title, message)
Modified: buildr/trunk/lib/buildr/core/project.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/project.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/project.rb (original)
+++ buildr/trunk/lib/buildr/core/project.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/core/util'
-
-
module Buildr
# Symbolic mapping for directory layout. Used for both the default and
custom layouts.
Modified: buildr/trunk/lib/buildr/core/run.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/run.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/run.rb (original)
+++ buildr/trunk/lib/buildr/core/run.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-require 'buildr/run'
-require 'buildr/java/commands'
-require 'buildr/core/util'
-
module Buildr
module Run
Modified: buildr/trunk/lib/buildr/core/shell.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/shell.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/shell.rb (original)
+++ buildr/trunk/lib/buildr/core/shell.rb Mon Jul 25 10:56:27 2011
@@ -13,11 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/shell'
-require 'buildr/java/commands'
-require 'buildr/core/util'
-
module Buildr
module Shell
Modified: buildr/trunk/lib/buildr/core/test.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/test.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/test.rb (original)
+++ buildr/trunk/lib/buildr/core/test.rb Mon Jul 25 10:56:27 2011
@@ -13,12 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/core/project'
-require 'buildr/core/build'
-require 'buildr/core/compile'
-
-
module Buildr
# The underlying test framework used by TestTask.
Modified: buildr/trunk/lib/buildr/core/transports.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/transports.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/transports.rb (original)
+++ buildr/trunk/lib/buildr/core/transports.rb Mon Jul 25 10:56:27 2011
@@ -13,20 +13,16 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'uri'
require 'net/http'
# PATCH: On Windows, Net::SSH 2.0.2 attempts to load the Pageant DLLs which
break on JRuby.
$LOADED_FEATURES << 'net/ssh/authentication/pageant.rb' if RUBY_PLATFORM =~
/java/
-gem 'net-ssh' ; Net.autoload :SSH, 'net/ssh'
-gem 'net-sftp' ; Net.autoload :SFTP, 'net/sftp'
+Net.autoload :SSH, 'net/ssh'
+Net.autoload :SFTP, 'net/sftp'
autoload :CGI, 'cgi'
require 'digest/md5'
require 'digest/sha1'
-require 'stringio'
autoload :ProgressBar, 'buildr/core/progressbar'
-
# Not quite open-uri, but similar. Provides read and write methods for the
resource represented by the URI.
# Currently supports reads for URI::HTTP and writes for URI::SFTP. Also
provides convenience methods for
# downloads and uploads.
Modified: buildr/trunk/lib/buildr/core/util.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/util.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/util.rb (original)
+++ buildr/trunk/lib/buildr/core/util.rb Mon Jul 25 10:56:27 2011
@@ -13,17 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'rbconfig'
-require 'pathname'
-autoload :Tempfile, 'tempfile'
-autoload :YAML, 'yaml'
-autoload :REXML, 'rexml/document'
-gem 'xml-simple' ; autoload :XmlSimple, 'xmlsimple'
-gem 'builder' ; autoload :Builder, 'builder' # A different kind of buildr, one
we use to create XML.
-require 'highline/import'
-
-
module Buildr
module Util
Modified: buildr/trunk/lib/buildr/groovy/doc.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/groovy/doc.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/groovy/doc.rb (original)
+++ buildr/trunk/lib/buildr/groovy/doc.rb Mon Jul 25 10:56:27 2011
@@ -13,9 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-require 'buildr/core/doc'
-require 'buildr/groovy/compiler' # ensure Groovy dependencies are ready
-
module Buildr
module Doc
Modified: buildr/trunk/lib/buildr/groovy/shell.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/groovy/shell.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/groovy/shell.rb (original)
+++ buildr/trunk/lib/buildr/groovy/shell.rb Mon Jul 25 10:56:27 2011
@@ -13,8 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-require 'buildr/shell'
-
module Buildr
module Groovy
class GroovySH < Buildr::Shell::Base
Modified: buildr/trunk/lib/buildr/ide/eclipse.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/ide/eclipse.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/ide/eclipse.rb (original)
+++ buildr/trunk/lib/buildr/ide/eclipse.rb Mon Jul 25 10:56:27 2011
@@ -13,11 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/core/project'
-require 'buildr/packaging'
-
-
module Buildr
module Eclipse #:nodoc:
include Extension
@@ -426,8 +421,4 @@ class Buildr::Project
include Buildr::Eclipse
end
-# Order is significant for auto-detection, from most specific to least
-require 'buildr/ide/eclipse/plugin'
-require 'buildr/ide/eclipse/scala'
-require 'buildr/ide/eclipse/java'
Modified: buildr/trunk/lib/buildr/ide/eclipse/java.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/ide/eclipse/java.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/ide/eclipse/java.rb (original)
+++ buildr/trunk/lib/buildr/ide/eclipse/java.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/core/project'
-require 'buildr/core/common'
-
module Buildr
module Eclipse
module Java
Modified: buildr/trunk/lib/buildr/ide/eclipse/plugin.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/ide/eclipse/plugin.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/ide/eclipse/plugin.rb (original)
+++ buildr/trunk/lib/buildr/ide/eclipse/plugin.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/core/project'
-require 'buildr/core/common'
-
module Buildr
module Eclipse
module Plugin
Modified: buildr/trunk/lib/buildr/ide/eclipse/scala.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/ide/eclipse/scala.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/ide/eclipse/scala.rb (original)
+++ buildr/trunk/lib/buildr/ide/eclipse/scala.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/core/project'
-require 'buildr/core/common'
-
module Buildr
module Eclipse
module Scala
Modified: buildr/trunk/lib/buildr/ide/idea.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/ide/idea.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/ide/idea.rb (original)
+++ buildr/trunk/lib/buildr/ide/idea.rb Mon Jul 25 10:56:27 2011
@@ -13,12 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/core/project'
-require 'buildr/packaging'
-require 'stringio'
-
-
module Buildr
module IntellijIdea
def self.new_document(value)
Modified: buildr/trunk/lib/buildr/java/ant.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/ant.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/ant.rb (original)
+++ buildr/trunk/lib/buildr/java/ant.rb Mon Jul 25 10:56:27 2011
@@ -17,9 +17,6 @@
gem 'atoulme-Antwrap'
autoload :Antwrap, 'antwrap'
autoload :Logger, 'logger'
-require 'buildr/core/project'
-require 'buildr/core/help'
-
module Buildr
module Ant
Modified: buildr/trunk/lib/buildr/java/bdd.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/bdd.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/bdd.rb (original)
+++ buildr/trunk/lib/buildr/java/bdd.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/java/tests'
-require 'buildr/java/test_result'
-
module Buildr
# Mixin for test frameworks using src/spec/{lang}
Modified: buildr/trunk/lib/buildr/java/cobertura.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/cobertura.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/cobertura.rb (original)
+++ buildr/trunk/lib/buildr/java/cobertura.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/java'
-
-
module Buildr
# Provides the <code>cobertura:html</code>, <code>cobertura:xml</code> and
<code>cobertura:check</code> tasks.
Modified: buildr/trunk/lib/buildr/java/commands.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/commands.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/commands.rb (original)
+++ buildr/trunk/lib/buildr/java/commands.rb Mon Jul 25 10:56:27 2011
@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
# Base module for all things Java.
module Java
Modified: buildr/trunk/lib/buildr/java/compiler.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/compiler.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/compiler.rb (original)
+++ buildr/trunk/lib/buildr/java/compiler.rb Mon Jul 25 10:56:27 2011
@@ -13,13 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/core/project'
-require 'buildr/core/common'
-require 'buildr/core/compile'
-require 'buildr/packaging'
-
-
module Buildr
module Compiler
Modified: buildr/trunk/lib/buildr/java/deprecated.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/deprecated.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/deprecated.rb (original)
+++ buildr/trunk/lib/buildr/java/deprecated.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/core/project'
-
-
module Java
# *Deprecated:* In earlier versions, Java.wrapper served as a wrapper around
RJB/JRuby.
Modified: buildr/trunk/lib/buildr/java/doc.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/doc.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/doc.rb (original)
+++ buildr/trunk/lib/buildr/java/doc.rb Mon Jul 25 10:56:27 2011
@@ -13,8 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-require 'buildr/core/doc'
-
module Buildr
module Doc
Modified: buildr/trunk/lib/buildr/java/emma.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/emma.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/emma.rb (original)
+++ buildr/trunk/lib/buildr/java/emma.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/java'
-
-
module Buildr
# Provides the <code>emma:html</code> and <code>emma:xml</code> tasks.
Modified: buildr/trunk/lib/buildr/java/jruby.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/jruby.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/jruby.rb (original)
+++ buildr/trunk/lib/buildr/java/jruby.rb Mon Jul 25 10:56:27 2011
@@ -13,11 +13,9 @@
# License for the specific language governing permissions and limitations under
# the License.
-
require 'java'
require 'jruby'
-
# Buildr runs along side a JVM, using either RJB or JRuby. The Java module
allows
# you to access Java classes and create Java objects.
#
Modified: buildr/trunk/lib/buildr/java/packaging.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/packaging.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/packaging.rb (original)
+++ buildr/trunk/lib/buildr/java/packaging.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/packaging'
-
-
module Buildr
module Packaging #:nodoc:
Modified: buildr/trunk/lib/buildr/java/pom.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/pom.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/pom.rb (original)
+++ buildr/trunk/lib/buildr/java/pom.rb Mon Jul 25 10:56:27 2011
@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
module Buildr
class POM
Modified: buildr/trunk/lib/buildr/java/test_result.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/test_result.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/test_result.rb (original)
+++ buildr/trunk/lib/buildr/java/test_result.rb Mon Jul 25 10:56:27 2011
@@ -13,11 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-# necessary to require YAML even if it is mentioned by autoload as it fails on
some platforms.
-require 'yaml'
-require 'fileutils'
-require 'rspec/core/formatters/base_formatter'
-
module Buildr #:nodoc:
module TestFramework
Modified: buildr/trunk/lib/buildr/java/tests.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/tests.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/tests.rb (original)
+++ buildr/trunk/lib/buildr/java/tests.rb Mon Jul 25 10:56:27 2011
@@ -14,12 +14,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/core/build'
-require 'buildr/core/compile'
-require 'buildr/java/ant'
-
-
module Buildr
class TestFramework::Java < TestFramework::Base
Modified: buildr/trunk/lib/buildr/packaging/archive.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/archive.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/archive.rb (original)
+++ buildr/trunk/lib/buildr/packaging/archive.rb Mon Jul 25 10:56:27 2011
@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
module Buildr
# Base class for ZipTask, TarTask and other archives.
Modified: buildr/trunk/lib/buildr/packaging/artifact.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/artifact.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/artifact.rb (original)
+++ buildr/trunk/lib/buildr/packaging/artifact.rb Mon Jul 25 10:56:27 2011
@@ -13,13 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/core/project'
-require 'buildr/core/transports'
-require 'buildr/packaging/artifact_namespace'
-require 'fileutils'
-
-
module Buildr
desc 'Download all artifacts'
Modified: buildr/trunk/lib/buildr/packaging/artifact_namespace.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/artifact_namespace.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/artifact_namespace.rb (original)
+++ buildr/trunk/lib/buildr/packaging/artifact_namespace.rb Mon Jul 25 10:56:27
2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/packaging/version_requirement'
-
-
module Buildr
# An ArtifactNamespace is a hierarchical dictionary used to manage
ArtifactRequirements.
Modified: buildr/trunk/lib/buildr/packaging/artifact_search.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/artifact_search.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/artifact_search.rb (original)
+++ buildr/trunk/lib/buildr/packaging/artifact_search.rb Mon Jul 25 10:56:27
2011
@@ -14,8 +14,7 @@
# the License.
-require 'hpricot'
-
+autoload :Hpricot, 'hpricot'
module Buildr
Modified: buildr/trunk/lib/buildr/packaging/gems.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/gems.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/gems.rb (original)
+++ buildr/trunk/lib/buildr/packaging/gems.rb Mon Jul 25 10:56:27 2011
@@ -13,13 +13,9 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/packaging/package'
-require 'buildr/packaging/archive'
-gem 'rubyforge' ; autoload :RubyForge, 'rubyforge'
+autoload :RubyForge, 'rubyforge'
Gem.autoload :Package, 'rubygems/package'
-
module Buildr
class PackageGemTask < ArchiveTask
Modified: buildr/trunk/lib/buildr/packaging/package.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/package.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/package.rb (original)
+++ buildr/trunk/lib/buildr/packaging/package.rb Mon Jul 25 10:56:27 2011
@@ -13,12 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/core/project'
-require 'buildr/core/compile'
-require 'buildr/packaging/artifact'
-
-
module Buildr
# Methods added to Project to support packaging and tasks for packaging,
# installing and uploading packages.
Modified: buildr/trunk/lib/buildr/packaging/tar.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/tar.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/tar.rb (original)
+++ buildr/trunk/lib/buildr/packaging/tar.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,8 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/packaging/archive'
-gem 'minitar' ; autoload :Archive, 'archive/tar/minitar'
-
+autoload :Archive, 'archive/tar/minitar'
+autoload :Zlib, 'zlib'
module Buildr
Modified: buildr/trunk/lib/buildr/packaging/zip.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/zip.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/zip.rb (original)
+++ buildr/trunk/lib/buildr/packaging/zip.rb Mon Jul 25 10:56:27 2011
@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
if RUBY_VERSION >= '1.9.0' # Required to properly load RubyZip under Ruby 1.9
$LOADED_FEATURES.unshift 'ftools'
require 'fileutils'
Modified: buildr/trunk/lib/buildr/packaging/ziptask.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/ziptask.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/ziptask.rb (original)
+++ buildr/trunk/lib/buildr/packaging/ziptask.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/packaging/archive'
-
-
module Buildr
# The ZipTask creates a new Zip file. You can include any number of files
and and directories,
Modified: buildr/trunk/lib/buildr/run.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/run.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/run.rb (original)
+++ buildr/trunk/lib/buildr/run.rb Mon Jul 25 10:56:27 2011
@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
module Buildr
module Run
include Extension
Modified: buildr/trunk/lib/buildr/scala/bdd.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/bdd.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/bdd.rb (original)
+++ buildr/trunk/lib/buildr/scala/bdd.rb Mon Jul 25 10:56:27 2011
@@ -13,12 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/core/build'
-require 'buildr/core/compile'
-require 'buildr/java/bdd'
-require 'buildr/scala/tests'
-
module Buildr::Scala
# Specs is a Scala based BDD framework.
Modified: buildr/trunk/lib/buildr/scala/compiler.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/compiler.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/compiler.rb (original)
+++ buildr/trunk/lib/buildr/scala/compiler.rb Mon Jul 25 10:56:27 2011
@@ -13,11 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-require 'buildr/core/project'
-require 'buildr/core/common'
-require 'buildr/core/compile'
-require 'buildr/packaging'
-
module Buildr::Scala
DEFAULT_VERSION = '2.9.0-1'
Modified: buildr/trunk/lib/buildr/scala/doc.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/doc.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/doc.rb (original)
+++ buildr/trunk/lib/buildr/scala/doc.rb Mon Jul 25 10:56:27 2011
@@ -13,9 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-require 'buildr/core/doc'
-require 'buildr/scala/compiler' # ensure Scala dependencies are ready
-
module Buildr
module Doc
Modified: buildr/trunk/lib/buildr/scala/shell.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/shell.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/shell.rb (original)
+++ buildr/trunk/lib/buildr/scala/shell.rb Mon Jul 25 10:56:27 2011
@@ -13,10 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/shell'
-require 'buildr/java/commands'
-
module Buildr
module Scala
class ScalaShell < Buildr::Shell::Base
Modified: buildr/trunk/lib/buildr/scala/tests.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/tests.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/tests.rb (original)
+++ buildr/trunk/lib/buildr/scala/tests.rb Mon Jul 25 10:56:27 2011
@@ -13,13 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
-require 'buildr/core/build'
-require 'buildr/core/compile'
-require 'buildr/java/ant'
-require 'buildr/java/tests'
-
-
module Buildr::Scala
# Scala::Check is available when using Scala::Test or Scala::Specs
module Check
Modified: buildr/trunk/lib/buildr/shell.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/shell.rb?rev=1150627&r1=1150626&r2=1150627&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/shell.rb (original)
+++ buildr/trunk/lib/buildr/shell.rb Mon Jul 25 10:56:27 2011
@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations under
# the License.
-
module Buildr
module Shell
include Extension
