Revision: 3295
Author: [email protected]
Date: Fri Feb 12 14:29:16 2010
Log: The generated java files are now written to a 'generated' source
folder. This source folder is cleaned out when 'clean' is run from the
build file. This is to fix Hudson's compile errors.
http://code.google.com/p/power-architect/source/detail?r=3295
Added:
/trunk/generated
Modified:
/trunk/.classpath
/trunk/build.xml
=======================================
--- /trunk/.classpath Thu Feb 11 11:47:13 2010
+++ /trunk/.classpath Fri Feb 12 14:29:16 2010
@@ -5,6 +5,7 @@
<classpathentry kind="src" path="jdbc_drivers"/>
<classpathentry kind="src" path="ext-tools-home/resgen/src"/>
<classpathentry kind="src" path="example_code"/>
+ <classpathentry kind="src" path="generated"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src"
path="/sqlpower_library"/>
<classpathentry kind="lib" path="buildlib/ant.jar"/>
=======================================
--- /trunk/build.xml Thu Feb 11 11:47:13 2010
+++ /trunk/build.xml Fri Feb 12 14:29:16 2010
@@ -31,6 +31,9 @@
class files. -->
<property name="build_tmp" value="build_tmp"/>
+ <!-- The location where generated java files will be stored at.-->
+ <property name="generated" value="generated"/>
+
<property name="dist.base" value="dist"/>
<!-- The target build directory for compiled test classes.
@@ -403,7 +406,7 @@
debug="true"
compile="true"
factory="ca.sqlpower.object.annotation.SPAnnotationProcessorFactory"
- preprocessdir="src">
+ preprocessdir="${generated}">
</apt>
<delete dir="${build}"/>
<move todir="${build}">
@@ -795,6 +798,7 @@
<delete><fileset dir="${dist.dir}" includes="lib,SQL Power
Architect.app,architect.jar"/></delete>
<delete dir="webstart/lib"/>
<delete dir="${staging.dir}"/>
+ <delete dir="${generated}/ca"/>
<delete><fileset dir="." includes="mycoverage.db*"/></delete>
</target>
