From 8ceb18eea968578d035b78f96ab4d3612b34807f Mon Sep 17 00:00:00 2001
From: hanna <hanna@348d0f76-0448-11de-a6fe-93d51630548a>
Date: Tue, 2 Nov 2010 20:13:13 +0000
Subject: [PATCH] Adding packaging system support for external directories.

git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4618 348d0f76-0448-11de-a6fe-93d51630548a
---
 build.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 5b9115fa8..f054b36ea 100644
--- a/build.xml
+++ b/build.xml
@@ -601,12 +601,16 @@
     <!-- Build a package consisting of all supporting files -->
     <target name="package" depends="dist,stage" description="bundle up an executable for distribution">
       <mkdir dir="${dist.dir}/packages" />
-      <xslt in="${package.xml.dir}/${executable}.xml" out="${dist.dir}/packages/Build${executable}.xml" style="packages/CreatePackager.xsl" />
-      <ant antfile="${dist.dir}/packages/Build${executable}.xml" target="package" />
+      <xslt destdir="${dist.dir}/packages" style="packages/CreatePackager.xsl">
+          <flattenmapper/>
+          <include name="${package.xml.dir}/${executable}.xml"/>
+          <include name="${external.dir}/*/${executable}.xml" />
+      </xslt>
+      <ant antfile="${dist.dir}/packages/${executable}.xml" target="package" />
     </target>
 
     <target name="release" depends="package" description="release a build, putting each file in a location specified by the package">
-      <ant antfile="${dist.dir}/packages/Build${executable}.xml" target="release" />      
+      <ant antfile="${dist.dir}/packages/${executable}.xml" target="release" />      
     </target>
 
     <!-- Build a subset of picard with only those classes we need by completely abusing the packaging system -->