Revision: 3413
Author: [email protected]
Date: Fri Mar 26 14:56:30 2010
Log: Architect is once again able to be built, but the easter egg in the
OLAP editor is broken, for now...
http://code.google.com/p/power-architect/source/detail?r=3413
Added:
/trunk/src/main/resources/license_in_comment.txt
Deleted:
/trunk/src/license_in_comment.txt
Modified:
/trunk/build.xml
=======================================
--- /dev/null
+++ /trunk/src/main/resources/license_in_comment.txt Fri Mar 26 14:56:30
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/>.
+ */
=======================================
--- /trunk/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/>.
- */
=======================================
--- /trunk/build.xml Wed Mar 24 15:38:38 2010
+++ /trunk/build.xml Fri Mar 26 14:56:30 2010
@@ -15,7 +15,13 @@
<property file="build.properties" />
<!-- The directory where the Java source files are -->
- <property name="src" value="src"/>
+ <property name="src" value="src/main/java"/>
+
+ <!-- The directory where resources are located (images, sounds, etc) -->
+ <property name="resources" value="src/main/resources"/>
+
+ <!-- The directory where the Java source files are -->
+ <property name="src.apt" value="${sqlpower.library.home}/src/apt/java"/>
<!-- The directory with all the JAR files that are required
by the Architect at runtime -->
@@ -67,6 +73,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
@@ -399,6 +408,7 @@
<!-- Compiles the application source files -->
<target name="compile" depends="init, copyfiles, build.sqlpower.library,
copy.sqlpower.library">
<mkdir dir="${build_tmp}"/>
+ <javac srcdir="${src.apt}" destdir="${build}"
classpathref="compile.classpath" debug="true"/>
<javac srcdir="${src}" destdir="${build}"
classpathref="compile.classpath" debug="true"/>
<apt srcdir="${src}"
destdir="${build_tmp}"
@@ -413,13 +423,13 @@
<fileset dir="${build_tmp}"/>
</move>
<copy todir="${build}">
- <fileset dir="${src}">
+ <fileset dir="${resources}">
<include name="**/*.png"/>
<include name="xsltStylesheets/**"/>
</fileset>
</copy>
<copy todir="${build}/">
- <fileset dir="src">
+ <fileset dir="${resources}">
<include name="**/messages*.properties"/>
</fileset>
</copy>
@@ -445,7 +455,7 @@
<target name="copyfiles" depends="init, architect.version.properties"
description="Copies non-source files that need to be in the
architect.jar">
<copy todir="${build}">
- <fileset dir="src/">
+ <fileset dir="${resources}/">
<include name="**"/>
<exclude name="**/*.java"/>
<exclude name="**/*.html"/>
@@ -518,11 +528,11 @@
<!-- Build MondrianModel -->
<target name="mondrianModel">
- <delete
file="src/ca/sqlpower/architect/olap/MondrianModel.java"></delete>
+ <delete
file="${src}/ca/sqlpower/architect/olap/MondrianModel.java"></delete>
<xslt
-
style="src/ca/sqlpower/architect/olap/xml-to-java-classes.xsl"
- in="src/ca/sqlpower/architect/olap/Mondrian.xml"
-
out="src/ca/sqlpower/architect/olap/MondrianModel.java"
+
style="${src}/ca/sqlpower/architect/olap/xml-to-java-classes.xsl"
+
in="${src}/ca/sqlpower/architect/olap/Mondrian.xml"
+
out="${src}/ca/sqlpower/architect/olap/MondrianModel.java"
classpathref="docbookclasspath">
</xslt>
</target>
@@ -531,8 +541,8 @@
<target name="mondrianNewValueMaker">
<delete
file="regress/ca/sqlpower/architect/util/MondrianNewValueMaker.java"></delete>
<xslt
-
style="src/ca/sqlpower/architect/olap/xml-to-new-value-maker.xsl"
- in="src/ca/sqlpower/architect/olap/Mondrian.xml"
+
style="${src}/ca/sqlpower/architect/olap/xml-to-new-value-maker.xsl"
+ in="${src}/ca/sqlpower/architect/olap/Mondrian.xml"
out="regress/ca/sqlpower/architect/util/MondrianNewValueMaker.java"
classpathref="docbookclasspath">
</xslt>
@@ -542,8 +552,8 @@
<target name="mondrianPersistenceTests">
<delete
file="regress/ca/sqlpower/architect/olap/MondrianModelTest.java"></delete>
<xslt
-
style="src/ca/sqlpower/architect/olap/xml-to-persister-tests.xsl"
- in="src/ca/sqlpower/architect/olap/Mondrian.xml"
+
style="${src}/ca/sqlpower/architect/olap/xml-to-persister-tests.xsl"
+ in="${src}/ca/sqlpower/architect/olap/Mondrian.xml"
out="regress/ca/sqlpower/architect/olap/MondrianModelTest.java"
classpathref="docbookclasspath">
</xslt>
@@ -551,22 +561,22 @@
<!-- Build MondrianXMLReader -->
<target name="mondrianParser">
- <delete
file="src/ca/sqlpower/architect/olap/MondrianXMLReader.java"></delete>
+ <delete
file="${src}/ca/sqlpower/architect/olap/MondrianXMLReader.java"></delete>
<xslt
-
style="src/ca/sqlpower/architect/olap/xml-to-parser.xsl"
- in="src/ca/sqlpower/architect/olap/Mondrian.xml"
-
out="src/ca/sqlpower/architect/olap/MondrianXMLReader.java"
+
style="${src}/ca/sqlpower/architect/olap/xml-to-parser.xsl"
+
in="${src}/ca/sqlpower/architect/olap/Mondrian.xml"
+
out="${src}/ca/sqlpower/architect/olap/MondrianXMLReader.java"
classpathref="docbookclasspath">
</xslt>
</target>
<!-- Build MondrianXMLWriter -->
<target name="mondrianFormatter">
- <delete
file="src/ca/sqlpower/architect/olap/MondrianXMLWriter.java"></delete>
+ <delete
file="${src}/ca/sqlpower/architect/olap/MondrianXMLWriter.java"></delete>
<xslt
-
style="src/ca/sqlpower/architect/olap/xml-to-formatter.xsl"
- in="src/ca/sqlpower/architect/olap/Mondrian.xml"
-
out="src/ca/sqlpower/architect/olap/MondrianXMLWriter.java"
+
style="${src}/ca/sqlpower/architect/olap/xml-to-formatter.xsl"
+ in="${src}/ca/sqlpower/architect/olap/Mondrian.xml"
+
out="${src}/ca/sqlpower/architect/olap/MondrianXMLWriter.java"
classpathref="docbookclasspath">
</xslt>
</target>
@@ -627,9 +637,9 @@
</fileset>
</copy>
- <mkdir dir="${build}/help/src/icons"/>
- <copy todir="${build}/help/src/icons" overwrite="true">
- <fileset dir="src/icons">
+ <mkdir dir="${build}/help/${resources}/icons"/>
+ <copy todir="${build}/help/${resources}/icons" overwrite="true">
+ <fileset dir="${resources}/icons">
<include name="*.gif"/>
<include name="*.png"/>
</fileset>
@@ -659,9 +669,9 @@
<include name="*.png"/>
</fileset>
</copy>
- <mkdir dir="${build}/ca/sqlpower/architect/doc/src/icons" />
- <copy todir="${build}/ca/sqlpower/architect/doc/src/icons"
overwrite="true">
- <fileset dir="src/icons">
+ <mkdir dir="${build}/ca/sqlpower/architect/doc/${resources}/icons"
/>
+ <copy todir="${build}/ca/sqlpower/architect/doc/${resources}/icons"
overwrite="true">
+ <fileset dir="${resources}/icons">
<include name="*.gif"/>
<include name="*.png"/>
</fileset>
@@ -764,7 +774,7 @@
supporturl="http://www.sqlpower.ca/forum";
customprocname="false"
stayalive="false"
- icon="src/icons/architect.ico">
+ icon="${resources}/icons/architect.ico">
<jre minVersion="1.5.0"
maxHeapSize="600"
/>
@@ -793,7 +803,7 @@
<copy todir="${staging.dir}/jdbc">
<fileset dir="jdbc_drivers" includes="*.jar"/>
- <fileset dir="src"
includes="default_database_types.ini"/>
+ <fileset dir="${src}"
includes="default_database_types.ini"/>
</copy>
<copy todir="${staging.dir}/doc" file="doc/ReleaseNotes.txt"/>
@@ -845,7 +855,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>
@@ -941,7 +950,7 @@
<langpack iso3="eng"/>
</locale>
<resources>
- <res id="Installer.image"
src="../src/icons/architect.png"/>
+ <res id="Installer.image"
src="../src/main/resources/icons/architect.png"/>
<res src="ArchitectShortcut.xml"
id="shortcutSpec.xml"/>
<res id="LicencePanel.licence"
src="../LICENSE" />
<res src="RegistrySpec.xml"
id="RegistrySpec.xml"/>
@@ -979,7 +988,7 @@
<fileset dir="../staging/"
targetdir="$INSTALL_PATH">
<include
name="LICENSE"/>
</fileset>
- <fileset dir="../src/icons"
targetdir="$INSTALL_PATH">
+ <fileset dir="../src/main/resources/icons"
targetdir="$INSTALL_PATH">
<include name="*.ico"/>
</fileset>
</pack>
@@ -1022,7 +1031,7 @@
<langpack iso3="eng"/>
</locale>
<resources>
- <res id="Installer.image"
src="../src/icons/architect.png"/>
+ <res id="Installer.image"
src="../src/main/resources/icons/architect.png"/>
<res src="ArchitectShortcut.xml"
id="shortcutSpec.xml"/>
<res id="LicencePanel.licence"
src="../LICENSE" />
<res src="RegistrySpec.xml"
id="RegistrySpec.xml"/>
@@ -1061,7 +1070,7 @@
<fileset dir="../staging/"
targetdir="$INSTALL_PATH">
<include
name="LICENSE"/>
</fileset>
- <fileset dir="../src/icons"
targetdir="$INSTALL_PATH">
+ <fileset dir="../src/main/resources/icons"
targetdir="$INSTALL_PATH">
<include
name="*.ico"/>
</fileset>
<fileset dir="../staging/"
targetdir="$INSTALL_PATH/uninstaller">
@@ -1096,7 +1105,7 @@
supporturl="http://www.sqlpower.ca/forum";
customprocname="false"
stayalive="false"
- icon="src/icons/architect.ico">
+ icon="${resources}/icons/architect.ico">
<singleInstance
mutexName="SQL Power Architect
Installer"
windowTitle="SQL Power Architect
Installer"
@@ -1120,7 +1129,7 @@
supporturl="http://www.sqlpower.ca/forum";
customprocname="false"
stayalive="false"
- icon="src/icons/architect.ico">
+ icon="${resources}/icons/architect.ico">
<singleInstance
mutexName="SQL Power Architect
Installer"
windowTitle="SQL Power Architect
Installer"
@@ -1150,7 +1159,7 @@
name="Power Architect"
version="${app.version}"
mainclass="ca.sqlpower.architect.swingui.ArchitectFrame"
- icon="src/icons/Power Architect.icns"
+ icon="${resources}/icons/Power Architect.icns"
jvmversion="1.5+"
shortname="Architect"
stubfile="osx_packaging_utils/PowerArchitectStub"
@@ -1176,7 +1185,7 @@
name="Power Architect JDBC"
version="${app.version}.jdbc"
mainclass="ca.sqlpower.architect.swingui.ArchitectFrame"
- icon="src/icons/Power Architect.icns"
+ icon="${resources}/icons/Power Architect.icns"
jvmversion="1.5+"
shortname="Architect"
stubfile="osx_packaging_utils/PowerArchitectStub"
@@ -1358,8 +1367,8 @@
<tarfileset dir="."
prefix="architect-src-only-${app.version}"
includes="${src}/**/*.java,
- ${src}/**/*.png,
- ${src}/**/*.gif,
+ ${resources}/**/*.png,
+ ${resources}/**/*.gif,
regress/**/*.java,
build.xml,
build.properties.example,
@@ -1493,17 +1502,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-tests.jar"
todir="${build.tests}"/>
+ <copy file="${sqlpower.library.home}/dist/sqlpower_library-apt.jar"
todir="${lib}"/>
</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.
