Revision: 3401
Author: [email protected]
Date: Fri Mar 26 11:23:22 2010
Log: Updated the build.xml and moved the license file for changes to the
sqlpower-library. Architect should be compiling again.
http://code.google.com/p/power-architect/source/detail?r=3401
Added:
/branches/temp-for-history-error/src/main
/branches/temp-for-history-error/src/main/resources
/branches/temp-for-history-error/src/main/resources/license_in_comment.txt
Deleted:
/branches/temp-for-history-error/src/license_in_comment.txt
Modified:
/branches/temp-for-history-error/build.xml
/branches/temp-for-history-error/buildlib
/branches/temp-for-history-error/lib
=======================================
--- /dev/null
+++
/branches/temp-for-history-error/src/main/resources/license_in_comment.txt
Fri Mar 26 11:23:22 2010
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2008, SQL Power Group Inc.
+ *
+ * This file is part of Power*Architect.
+ *
+ * Power*Architect is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Power*Architect is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
=======================================
--- /branches/temp-for-history-error/src/license_in_comment.txt Tue Mar 25
08:51:41 2008
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2008, SQL Power Group Inc.
- *
- * This file is part of Power*Architect.
- *
- * Power*Architect is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Power*Architect is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
=======================================
--- /branches/temp-for-history-error/build.xml Tue Mar 23 13:58:01 2010
+++ /branches/temp-for-history-error/build.xml Fri Mar 26 11:23:22 2010
@@ -67,6 +67,9 @@
<fileset dir="lib">
<include name="*.jar"/>
</fileset>
+ <fileset dir="${sqlpower.library.home}/dist">
+ <include name="sqlpower_library-tests.jar"/>
+ </fileset>
</path>
<!-- When the build runs on a Mac, we can create the .dmg disk image
@@ -845,7 +848,6 @@
<path id="test.classpath"
description="All the run-time dependencies of the Architect code,
including the compiles Architect code itself">
<pathelement location="${build}"/>
- <pathelement location="${sqlpower.library.home}/build/tests"/>
<fileset dir="lib">
<include name="*.jar"/>
</fileset>
@@ -1493,17 +1495,16 @@
<target name="build.sqlpower.library"
depends="check.sqlpower.library.dir" if="buildSQLPowerLibrary">
<echo message="Attempting to build sqlpower-library
project..."/>
- <ant dir="${sqlpower.library.home}" target="clean">
- <property name="build"
value="${sqlpower.library.home}/build"/>
+ <ant inheritall="false" dir="${sqlpower.library.home}"
target="clean">
</ant>
- <ant dir="${sqlpower.library.home}" target="jar">
- <property name="build"
value="${sqlpower.library.home}/build"/>
- <property name="dist.dir"
value="${sqlpower.library.home}/dist"/>
+ <ant inheritall="false" dir="${sqlpower.library.home}"
target="jar">
</ant>
</target>
<target name="copy.sqlpower.library"
depends="check.sqlpower.library.dir">
<copy file="${sqlpower.library.home}/dist/sqlpower_library.jar"
todir="${lib}"/>
+ <copy file="${sqlpower.library.home}/dist/sqlpower_library-apt.jar"
todir="${lib}"/>
+ <copy file="${sqlpower.library.home}/dist/sqlpower_library-tests.jar"
todir="buildlib"/>
</target>
<target name="architect.version.properties" depends="init">
To unsubscribe from this group, send email to
architect-commits+unsubscribegooglegroups.com or reply to this email with the words
"REMOVE ME" as the subject.
