[seam-commits] Seam SVN: r7345 - in trunk: build and 1 other directories.

[seam-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-02-02 20:34:11 -0500 (Sat, 02 Feb 2008)
New Revision: 7345

Modified:
   trunk/build.xml
   trunk/build/build.xml
   trunk/build/common.build.xml
   trunk/doc/reference/en/modules/dependencies.xml
Log:
JBSEAM-1532

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2008-02-03 00:54:13 UTC (rev 7344)
+++ trunk/build/build.xml	2008-02-03 01:34:11 UTC (rev 7345)
@@ -157,8 +157,12 @@
 	
 	<target name="dependencyReport" depends="initpoms" description="Produce a dependency tree for the given module">
 		<fail unless="module" message="Must specify module e.g. core"/>
-		<maven target="-f poms/${module}.pom dependency:tree" basedir="${tmp.dir}">
-		</maven>
+		<dependencyReport module="${module}" />
+		<echo>Dependency Tree for ${module}</echo>
+	    <echo>-----------------------------</echo>
+		<concat>
+			<fileset file="${tmp.dir}/poms/${module}-dependency-report.txt"/>
+		</concat>
 	</target>
 	
 	<macrodef name="offline">

Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml	2008-02-03 00:54:13 UTC (rev 7344)
+++ trunk/build/common.build.xml	2008-02-03 01:34:11 UTC (rev 7345)
@@ -276,6 +276,57 @@
 	       	</sequential>
 		</macrodef>
 	
+	<macrodef name="dependencyReport">
+		<attribute name="module" />
+		<attribute name="pom" default="${tmp.dir}/poms/@{module}.pom" />
+		<attribute name="output" default="${tmp.dir}/poms/@{module}-dependency-report.txt" />
+		<sequential>
+			<maven target="-f @{pom} dependency:tree" basedir="${seam.dir}">
+				<arg line="-Doutput=@{output}" />
+				<arg line="-q" />
+			</maven>
+		</sequential>
+	</macrodef>
+	
+	<macrodef name="outputDependencyReport">
+		<attribute name="module" />
+		<attribute name="output" default="${seam.dir}/dependency-report.txt"/>
+		<sequential>
+			<dependencyReport module="@{module}" />
+			<concat append="true" destfile="@{output}">
+				<header>
+					
+					
+-----------------------------------------
+Dependency Tree for @{module}
+*****************************************
+-----------------------------------------
+					
+</header>
+				<fileset file="${tmp.dir}/poms/@{module}-dependency-report.txt"/>
+			</concat>
+		</sequential>
+	</macrodef>
+	
+	<target name="dependencyReport" depends="initpoms" description="Build dependency report for all modules">
+		<delete file="${seam.dir}/dependency-report.txt" />
+		<concat append="true" destfile="${seam.dir}/dependency-report.txt">					
+-----------------------------------------
+Dependencies for Seam ${complete.version}
+*****************************************
+-----------------------------------------
+
+		</concat>
+		<outputDependencyReport module="core" />
+		<outputDependencyReport module="debug" />
+		<outputDependencyReport module="ui" />
+		<outputDependencyReport module="remoting" />
+		<outputDependencyReport module="mail" />
+		<outputDependencyReport module="pdf" />
+		<outputDependencyReport module="ioc" />
+		<echo>Dependency Report written to ${seam.dir}/dependency-report.txt</echo>
+	</target>
+	
 	<target name="initdav">
 		<artifact:install-provider artifactId="wagon-webdav" version="1.0-beta-2"/>
 	</target>

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2008-02-03 00:54:13 UTC (rev 7344)
+++ trunk/build.xml	2008-02-03 01:34:11 UTC (rev 7345)
@@ -531,7 +531,7 @@
 		</copy>
 	</target>
 
-	<target name="extras">
+	<target name="extras" depends="dependencyReport">
 		<copy file="readme.txt" todir="${dist.dir}" />
 		<copy file="lgpl.txt" todir="${dist.dir}" />
 		<copy file="changelog.txt" todir="${dist.dir}" />
@@ -552,6 +552,7 @@
 				<![CDATA[${name}-${TODAY}]]>
 			</replacevalue>
 		</replace>
+		<copy file="dependency-report.txt" todir="${dist.dir}" />
 	</target>
 
 

Modified: trunk/doc/reference/en/modules/dependencies.xml
===================================================================
--- trunk/doc/reference/en/modules/dependencies.xml	2008-02-03 00:54:13 UTC (rev 7344)
+++ trunk/doc/reference/en/modules/dependencies.xml	2008-02-03 01:34:11 UTC (rev 7345)
@@ -15,8 +15,11 @@
     </para>
     
     <para>
-      Up to date version information is not included in the docs, but is provided 
-      in the <literal>/build/root.pom.xml</literal> Maven POM.  
+      Up to date version information and complete dependency information is not 
+      included in the docs, but is provided in the 
+      <literal>/dependency-report.txt</literal> which is generated from the 
+      Maven POMs stored in <literal>/build</literal>. You can generate this file
+      by running <literal>ant dependencyReport</literal>.
     </para>
     
     <section>