[seam-commits] Seam SVN: r7807 - trunk and 1 other directory.

[seam-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-04-03 07:34:45 -0400 (Thu, 03 Apr 2008)
New Revision: 7807

Modified:
   branches/Seam_2_0/build.xml
   trunk/build.xml
Log:
JBSEAM-2815

Modified: branches/Seam_2_0/build.xml
===================================================================
--- branches/Seam_2_0/build.xml	2008-04-03 11:17:41 UTC (rev 7806)
+++ branches/Seam_2_0/build.xml	2008-04-03 11:34:45 UTC (rev 7807)
@@ -53,7 +53,7 @@
 	<property name="dist.name" value="${name}-${complete.version}" />
 
 	<property name="dist.location" value="${basedir}/../" />
-	<property name="dist.dir" value="${dist.location}/${dist.name}" />
+	<property name="dist.dir" location="${dist.location}/${dist.name}" />
 	<property name="dist.ui.dir" value="${dist.dir}/ui" />
 	<property name="dist.doc.dir" value="${dist.dir}/doc" />
 	<property name="dist.api.dir" value="${dist.dir}/doc/api" />
@@ -76,6 +76,12 @@
 	<property name="dist.build.dir" value="${dist.dir}/build" />
 	<property name="dist.seamgen.dir" value="${dist.dir}/seam-gen" />
 	<property name="dist.ui.api.dir" value="${dist.dir}/doc/ui" />
+	
+	<condition property="in.dist.dir">
+		<equals arg1="${basedir}" arg2="${dist.dir}"/>
+	</condition>
+	
+	<echo>${basedir} : ${dist.dir}</echo>
 
 	<property name="deploy.dir" value="${jboss.home}/server/default/deploy" />
 	<property name="webroot.dir" value="${deploy.dir}/jbossweb-tomcat55.sar/ROOT.war" />
@@ -421,7 +427,7 @@
 
 	<!-- ########################## DIST TARGETS ###########################-->
 
-	<target name="cleandist" description="Cleans up the dist directory">
+	<target name="cleandist" description="Cleans up the dist directory" unless="in.dist.dir">
 		<delete dir="${dist.dir}" quiet="${quietclean}" />
 	</target>
 

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2008-04-03 11:17:41 UTC (rev 7806)
+++ trunk/build.xml	2008-04-03 11:34:45 UTC (rev 7807)
@@ -57,7 +57,7 @@
 	<property name="dist.name" value="${name}-${complete.version}" />
 
 	<property name="dist.location" value="${basedir}/../" />
-	<property name="dist.dir" value="${dist.location}/${dist.name}" />
+	<property name="dist.dir" location="${dist.location}/${dist.name}" />
 	<property name="dist.ui.dir" value="${dist.dir}/ui" />
 	<property name="dist.doc.dir" value="${dist.dir}/doc" />
 	<property name="dist.api.dir" value="${dist.dir}/doc/api" />
@@ -85,6 +85,10 @@
 
 	<property name="deploy.dir" value="${jboss.home}/server/default/deploy" />
 	<property name="webroot.dir" value="${deploy.dir}/jbossweb-tomcat55.sar/ROOT.war" />
+	
+	<condition property="in.dist.dir">
+		<equals arg1="${basedir}" arg2="${dist.dir}"/>
+	</condition>
 
 	<!-- Tests -->
 
@@ -455,7 +459,7 @@
 
 	<!-- ########################## DIST TARGETS ###########################-->
 
-	<target name="cleandist" description="Cleans up the dist directory">
+	<target name="cleandist" description="Cleans up the dist directory" unless="in.dist.dir">
 		<delete dir="${dist.dir}" quiet="${quietclean}" />
 	</target>