From fc448c966eaf5e1f5d40698da608692762b21dfd Mon Sep 17 00:00:00 2001 From: Florian Juettner Date: Thu, 25 Oct 2012 16:03:04 +0200 Subject: [PATCH] use customized lib-dir, if provided --- lib/buildr/ivy_extension.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/buildr/ivy_extension.rb b/lib/buildr/ivy_extension.rb index 0398ec9..44be093 100644 --- a/lib/buildr/ivy_extension.rb +++ b/lib/buildr/ivy_extension.rb @@ -636,8 +636,12 @@ def add_prod_libs_to_distributeables(project) excludes = project.ivy.package_exclude types = project.ivy.package_type confs = project.ivy.package_conf + libdir = '' + if pkg.dirs.key? :lib + libdir = pkg.dirs[:lib] + end if deps = project.ivy.filter(confs, :type => types, :include => includes, :exclude => excludes) - pkg.add deps, :type => :lib, :path => '' + pkg.add deps, :type => :lib, :path => libdir info "Adding production libs from conf '#{confs.join(', ')}' to EAR '#{pkg.name}' in project '#{project.name}'" end end