Modified the generation of the root LICENSE.txt file to include references to all other license files in the project.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473536 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 35 insertions, 3 deletions

diff --git a/java/build.xml b/java/build.xml
index 90a02520a0..d0c77777f9 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -188,13 +188,46 @@
                 <include name="RELEASE_NOTES.txt"/>
             </fileset>
             <fileset dir="${project.root}">
-                <include name="LICENSE.txt"/>
                 <include name="README.txt"/>
                 <include name="NOTICE.txt"/>
             </fileset>
         </copy>
+
+        <antcall target="createLicense">
+            <param name="fromdir" value="${todir}"/>
+            <param name="destdir" value="${todir}"/>
+        </antcall>
+
     </target>
 
+    <target name="createLicense">
+
+        <!-- Copy our main License file-->
+        <copy file="LICENSE.txt" todir="${destdir}"/>
+
+        <!-- Find all the license files-->
+        <fileset dir="${fromdir}" id="license.files">
+            <include name="**/${lib.dir}/**/license*"/>
+        </fileset>
+
+        <!-- Path to use to remove from the start of the license file name -->
+        <path path="${todir}${file.separator}" id="release.prepare.dir.id" />
+
+        <!-- Convert this path to use the platform file separator \ or / -->
+        <pathconvert refid="release.prepare.dir.id" property="release.prepare.path" dirsep="${file.separator}"/>
+
+        <!-- For each of the license files remove the release prepare path-->
+        <pathconvert refid="license.files" id="licenses.convert.path.id" property="licenses.convert" pathsep="${line.separator}" >
+            <map from="${release.prepare.path}${file.separator}" to=''/>
+        </pathconvert>
+
+
+        <!-- Add the list of licence files to the end of the main license file.-->
+        <echo file="${destdir}/LICENSE.txt" append="yes">
+            ${line.separator}Additional license files can be found here:${line.separator}${licenses.convert}
+        </echo>
+
+    </target>
 
     <target name="tgzandzip">
         <tar compression="gzip" longfile="gnu"
diff --git a/java/common.xml b/java/common.xml
index 2b6cc82016..91b7e8b92f 100644
--- a/java/common.xml
+++ b/java/common.xml
@@ -47,8 +47,7 @@
   <property name="launcher.sfx" value="-launch.jar"/>
 
   <property name="release.root.dir" value="${project.root}/${release.dir}"/>
-  <property name="resources.root.dir" value="${project.root}/${resources.dir}"/>
-
+  <property name="resources.root.dir" value="${project.root}/${resources.dir}"/>  
 
 
   <property name="dist.root" value="${build.dir}/dist"/>