roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r534891 - /roller/trunk/build.xml
Date Thu, 03 May 2007 14:29:56 GMT
Author: snoopdave
Date: Thu May  3 07:29:55 2007
New Revision: 534891

URL: http://svn.apache.org/viewvc?view=rev&rev=534891
Log:
Not generating dbscripts from the stage-web target broke the Hudson build, so now we generate
them conditionally -- stage-web will create them only if they do not exist. The gen-dbscripts
target is unchanged; it will always generate them.

Modified:
    roller/trunk/build.xml

Modified: roller/trunk/build.xml
URL: http://svn.apache.org/viewvc/roller/trunk/build.xml?view=diff&rev=534891&r1=534890&r2=534891
==============================================================================
--- roller/trunk/build.xml (original)
+++ roller/trunk/build.xml Thu May  3 07:29:55 2007
@@ -37,10 +37,9 @@
 <!-- ********************************************************************* -->
 <project name="roller" default="usage">
 
-<!--No longer need java15 check
-<available classname="java.lang.ProcessBuilder" property="java15.present" />
- -->
- 
+<available file="./build/webapp/WEB-INF/dbscripts/derby/createdb.sql" 
+    property="dbscripts-exist" />
+
 <!-- Bring in properties.xml -->
 &properties;
 
@@ -391,9 +390,9 @@
 <!-- Stage web application -->
 <!-- ********************************************************************* -->
 	
-<target name="stage-webapp" depends="gen-business, build-business, build-web, copy-webapp,
gen-web" description="Stage webapp, including jars">
+<target name="stage-webapp" depends="gen-business, build-business, build-web, gen-dbscripts-conditional,
copy-webapp, gen-web" description="Stage webapp, including jars">
 </target>
-    
+       
 <target name="copy-webapp" depends="build-web" description="Stage webapp without code
generation">
 
     <mkdir dir="${build.webapp}/WEB-INF/lib"/>
@@ -461,6 +460,10 @@
     <!-- With this approach we won't have to expand the script all the time.   -->
     <!-- ********************************************************************* -->
     
+    <target name="gen-dbscripts-conditional" unless="dbscripts-exist">
+        <antcall target="gen-dbscripts" />
+    </target>
+
     <!-- generate database scripts -->
     <target name="gen-dbscripts">
         



Mime
View raw message