Revision: 3749
Author: [email protected]
Date: Fri Jul 16 09:19:53 2010
Log: The previous 2 commits to attempt to fix the Architect build were
wrong. The buildlib folder is not supposed to be deleted, there are
committed files within this directory that need to stay there. Instead, the
clean target should only delete the sqlpower_library*.jar files created at
build runtime.
Also, added sqlpower_library.jar to the SVN ignore list.
http://code.google.com/p/power-architect/source/detail?r=3749
Modified:
/trunk/build.xml
/trunk/buildlib
=======================================
--- /trunk/build.xml Fri Jul 16 09:05:40 2010
+++ /trunk/build.xml Fri Jul 16 09:19:53 2010
@@ -234,7 +234,6 @@
<mkdir dir="${build}"/>
<mkdir dir="${build_tmp}"/>
- <mkdir dir="${buildlib}"/>
<!-- get the version number from source code ArchitectUtils -->
<javac srcdir="${src}" destdir="${build}"
classpathref="compile.classpath"
includes="ca/sqlpower/architect/antbuild/ArchitectVersionTask.java"
debug="true"/>
@@ -875,7 +874,12 @@
<delete dir="${build}" failonerror="false"
includeemptydirs="true"/>
<delete dir="${build.tests}" failonerror="false"
includeemptydirs="true"/>
<delete dir="${build.examples}" failonerror="false"
includeemptydirs="true"/>
- <delete dir="${buildlib}" failonerror="false"
includeemptydirs="true"/>
+ <delete>
+ <fileset dir="buildlib">
+ <include name="sqlpower_library*.jar"/>
+ </fileset>
+ </delete>
+
<delete failonerror="false">
<fileset dir="${dist.dir}" includes="lib,SQL Power
Architect.app,architect.jar"/>
</delete>
