From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Wed, 11 Jan 2012 03:15:10 +0000 (+0000)
Subject: Creating resources/ source directory to hold l10n, pix, and datafiles.  Changes to... 
X-Git-Tag: upstream/12.03~1^2~140
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=d20fff2e6072b0bf1091287e12c2b5a3e6cc3baa;p=debian%2Fopenrocket

Creating resources/ source directory to hold l10n, pix, and datafiles.  Changes to build.xml to support it.  The directory moves will be done in separate svn move operations.

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 ffd8c2c2..712371a7 100644
--- 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 0ebe4709..cba98845 100644
--- 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}"/>