You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/10/05 23:33:56 UTC
svn commit: r453393 - /incubator/roller/trunk/build.xml
Author: snoopdave
Date: Thu Oct 5 14:33:55 2006
New Revision: 453393
URL: http://svn.apache.org/viewvc?view=rev&rev=453393
Log:
Further refinements to build target, make it copy web files, make it NOT generate database scripts
Modified:
incubator/roller/trunk/build.xml
Modified: incubator/roller/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/build.xml?view=diff&rev=453393&r1=453392&r2=453393
==============================================================================
--- incubator/roller/trunk/build.xml (original)
+++ incubator/roller/trunk/build.xml Thu Oct 5 14:33:55 2006
@@ -79,7 +79,7 @@
<target name="all" depends="generate,stage-webapp" description="Build all">
</target>
-<target name="build" depends="build-web" description="Compile only, no code generation">
+<target name="build" depends="copy-webapp" description="Compile code and copy files, no code generation">
</target>
<target name="rebuild" depends="clean,all" description="Clean and build all">
@@ -124,6 +124,9 @@
</hibernatedoclet>
+ <!-- copy database related files -->
+ <antcall target="stage-dbscripts" />
+
<!-- allow for custom generation work -->
&custom-gen-business;
@@ -354,9 +357,6 @@
<!-- Compile and jar Presentation Tier classes -->
<!-- ********************************************************************* -->
-<target name="build-web-all" depends="build-business-all, gen-web, build-web">
-</target>
-
<target name="build-web" depends="build-business" >
<mkdir dir="${build.compile.web}" />
@@ -397,7 +397,10 @@
<!-- Stage web application -->
<!-- ********************************************************************* -->
-<target name="stage-webapp" depends="build-web-all" description="Stage webapp, including jars">
+<target name="stage-webapp" depends="build-business-all, gen-web, build-web, copy-webapp" description="Stage webapp, including jars">
+</target>
+
+<target name="copy-webapp" depends="build-web" description="Stage webapp, including jars">
<mkdir dir="${build.webapp}/WEB-INF/lib"/>
<mkdir dir="${build.webapp}/WEB-INF/tlds"/>
@@ -443,9 +446,6 @@
<exclude name="**/*~"/>
</fileset>
</copy>
-
- <!-- copy database related files -->
- <antcall target="stage-dbscripts" />
<!-- Copy docs to staging -->
<copy todir="${build.webapp}/roller-ui/docs">