Author: donaldp
Date: Tue Nov 5 23:11:16 2013
New Revision: 1539183
URL: http://svn.apache.org/r1539183
Log:
Remove direct integration of assets pipeline and webapp dir and return to
behaviour as 1.4.12
Modified:
buildr/trunk/lib/buildr/core/assets.rb
buildr/trunk/lib/buildr/ide/idea.rb
buildr/trunk/lib/buildr/java/packaging.rb
Modified: buildr/trunk/lib/buildr/core/assets.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/assets.rb?rev=1539183&r1=1539182&r2=1539183&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/assets.rb (original)
+++ buildr/trunk/lib/buildr/core/assets.rb Tue Nov 5 23:11:16 2013
@@ -31,7 +31,7 @@ module Buildr #:nodoc:
def paths
unless @paths
@paths = []
- @paths << project._(:source, :main, :webapp) if
File.exist?(project._(:source, :main, :webapp))
+ @paths << project._(:source, :main, :assets) if
File.exist?(project._(:source, :main, :assets))
end
@paths
end
@@ -40,11 +40,6 @@ module Buildr #:nodoc:
def initialize(*args) #:nodoc:
super
- end
-
- private
-
- def add_enhance_actions
enhance do
paths = self.paths.flatten.compact
if paths.size > 0
@@ -54,21 +49,14 @@ module Buildr #:nodoc:
end.each do |a|
a.invoke if a.respond_to?(:invoke)
end.each do |asset|
- source_dir = asset.to_s
- Dir["#{source_dir}/*"].each do |f|
- f = f[source_dir.length + 1, 10000]
- source = "#{asset}/#{f}"
- target = "#{name}/#{f}"
- if !File.exist?(target) || File.mtime(target) <
File.mtime(source)
- mkdir_p File.dirname(target)
- cp source, target
- end
- end
+ cp_r Dir["#{asset}/*"], "#{name}/"
end
end
end
end
+ private
+
def out_of_date?(stamp)
super ||
self.paths.any? { |n| n.respond_to?(:needed?) && n.needed? }
@@ -89,17 +77,10 @@ module Buildr #:nodoc:
project.assets.paths
end
- after_define do |project|
- # This is used to add actions after project is defined so that files
are copied
- # as the last action and don't block tasks that try and filter into
target dir
- # from the source dir
- project.assets.send(:add_enhance_actions)
- end
-
# Access the asset task
def assets
if @assets.nil?
- @assets = AssetsTask.define_task(project._(:target, :main, :webapp)
=> [])
+ @assets = AssetsTask.define_task(project._(:target, :main, :assets)
=> [])
@assets.project = self
project.task('assets').enhance([@assets])
project.build.enhance([@assets])
Modified: buildr/trunk/lib/buildr/ide/idea.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/ide/idea.rb?rev=1539183&r1=1539182&r2=1539183&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/ide/idea.rb (original)
+++ buildr/trunk/lib/buildr/ide/idea.rb Tue Nov 5 23:11:16 2013
@@ -299,6 +299,7 @@ module Buildr #:nodoc:
def add_web_facet(options = {})
name = options[:name] || "Web"
default_webroots = {}
+ default_webroots[buildr_project._(:source, :main, :webapp)] = "/" if
File.exist?(buildr_project._(:source, :main, :webapp))
buildr_project.assets.paths.each {|p| default_webroots[p] = "/" }
webroots = options[:webroots] || default_webroots
default_deployment_descriptors = []
Modified: buildr/trunk/lib/buildr/java/packaging.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/packaging.rb?rev=1539183&r1=1539182&r2=1539183&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/packaging.rb (original)
+++ buildr/trunk/lib/buildr/java/packaging.rb Tue Nov 5 23:11:16 2013
@@ -684,10 +684,10 @@ module Buildr #:nodoc:
# Add libraries in WEB-INF lib, and classes in WEB-INF classes
war.with :classes=>[compile.target, resources.target].compact
war.with :libs=>compile.dependencies
+ webapp = path_to(:source, :main, :webapp)
+ war.with webapp if File.exist?(webapp)
war.enhance([assets])
- if !assets.paths.empty? || File.exist?(_(:source, :main, :webapp))
- war.include assets.to_s, :as => '.'
- end
+ war.include assets.to_s, :as => '.' unless assets.paths.empty?
end
end
