Fix tests

[debian/openrocket] / core / build.xml

diff --git a/core/build.xml b/core/build.xml
index 0ebe47092b7dc3a9b1d2c9d4aea9d590726f3b4f..205fb246bcfee2b454e7190dacc92f01925f5e31 100644 (file)
--- a/core/build.xml
+++ b/core/build.xml
@@ -1,6 +1,6 @@
 <project name="OpenRocket" basedir=".">
 
-       <property file="build.properties" />
+       <property file="resources/build.properties" />
        
        <property name="src.dir"        value="src"/>           <!-- Source directory -->
        <property name="src-test.dir"   value="test"/>          <!-- Test directory -->
@@ -32,7 +32,7 @@
        
        <path id="test-classpath">
                <path refid="classpath"/>
-               <pathelement location="${basedir}"/>
+               <pathelement location="${basedir}/resources"/>
                <pathelement location="${build-test.dir}"/>
                <pathelement location="${classes.dir}"/>
                <pathelement location="${src-test.dir}"/>
@@ -53,16 +53,14 @@
                <mkdir dir="${classes.dir}"/>
                <echo level="info">Compiling main classes</echo>
                <javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath"/>
-               <echo level="info">Copying build.properties</echo>
-               <copy file="build.properties" todir="${dist.dir}"/>
        </target>
        
        
        <!-- JAR -->
        <target name="jar" depends="build">
                <copy todir="${dist.dir}/">
-                       <fileset dir="." includes="LICENSE.TXT README.TXT ChangeLog ReleaseNotes build.properties fileformat.txt" />
-                       <fileset dir="." includes="datafiles/ pix/ l10n/" />
+                       <fileset dir="." includes="LICENSE.TXT README.TXT ChangeLog ReleaseNotes fileformat.txt" />
+                       <fileset dir="resources/" includes="datafiles/ pix/ l10n/ build.properties" />
                        <fileset dir="src/" includes="META-INF/" />
                </copy>
                <mkdir dir="${jar.dir}"/>
@@ -90,7 +88,7 @@
                        <fileset dir="." includes="*" excludes="*.log">
                                <type type="file"/>
                        </fileset>
-                       <fileset dir="." includes="datafiles/ lib/ lib-test/ pix/ src/ test/ l10n/"/>
+                       <fileset dir="" includes="resources/datafiles/ lib/ lib-test/ resources/pix/ src/ test/ resources/l10n/"/>
                </copy>
                <zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
                <delete dir="${build.dir}/${pkgname}"/>