Creating resources/ source directory to hold l10n, pix, and datafiles. Changes to...

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@331 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/core/.classpath b/core/.classpath
index ffd8c2c28acc103f0463c56616f0d8245be22235..712371a7a8bcd79b904a76266a89def675ca6389 100644 (file)
--- a/core/.classpath
+++ b/core/.classpath
@@ -3,6 +3,7 @@
        <classpathentry excluding="net/sf/openrocket/android/" kind="src" path="src"/>
        <classpathentry kind="src" path="src-extra"/>
        <classpathentry kind="src" path="test"/>
+       <classpathentry kind="src" path="resources"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
                <accessrules>
                        <accessrule kind="nonaccessible" pattern="com/sun/**"/>

diff --git a/core/build.xml b/core/build.xml
index 0ebe47092b7dc3a9b1d2c9d4aea9d590726f3b4f..cba9884540b22527d35829137a65ec1736d71213 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 -->
@@ -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}"/>