Change OpenRocketViewer to tab layout with three tabs: overview, components, and...

[debian/openrocket] / build.xml

diff --git a/build.xml b/build.xml
index 0540b3dc611aa451d74ee2562ad63465ee2834a2..8709c84d1bfd2070183731523cdd3cb8ad2f938b 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -36,11 +36,7 @@
                <pathelement location="${build-test.dir}"/>
                <pathelement location="${classes.dir}"/>
                <pathelement location="${src-test.dir}"/>
-               <pathelement location="lib-test/junit-dep-4.8.2.jar"/>
-               <pathelement location="lib-test/hamcrest-core-1.3.0RC1.jar"/>
-               <pathelement location="lib-test/hamcrest-library-1.3.0RC1.jar"/>
-               <pathelement location="lib-test/jmock-2.6.0-RC2.jar"/>
-               <pathelement location="lib-test/jmock-junit4-2.6.0-RC2.jar"/>
+               <fileset dir="lib-test/" includes="*.jar"/>
        </path>
        
 
@@ -56,7 +52,9 @@
        <target name="build">
                <mkdir dir="${classes.dir}"/>
                <echo level="info">Compiling main classes</echo>
-               <javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath"/>
+               <javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath">
+                       <exclude name="/net/sf/openrocket/android/**/*"/>
+               </javac>
                <echo level="info">Copying build.properties</echo>
                <copy file="build.properties" todir="${dist.dir}"/>
        </target>
@@ -66,7 +64,8 @@
        <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/" />
+                       <fileset dir="." includes="datafiles/ pix/ l10n/" />
+                       <fileset dir="src/" includes="META-INF/" />
                </copy>
                <mkdir dir="${jar.dir}"/>
                <jar destfile="${jar.file}" basedir="${dist.dir}">
@@ -77,6 +76,7 @@
                        <zipfileset src="lib/miglayout15-swing.jar" />
                        <zipfileset src="lib/jcommon-1.0.16.jar" />
                        <zipfileset src="lib/jfreechart-1.0.13.jar" />
+                       <zipfileset src="lib/iText-5.0.2.jar" />
                </jar>
        </target>
        
@@ -89,10 +89,10 @@
                <mkdir dir="${build.dir}/${pkgname}"/>
                <mkdir dir="${jar.dir}"/>
                <copy todir="${build.dir}/${pkgname}">
-                       <fileset dir="." includes="*">
+                       <fileset dir="." includes="*" excludes="*.log">
                                <type type="file"/>
                        </fileset>
-                       <fileset dir="." includes="datafiles/ lib/ lib-test/ pix/ src/ test/"/>
+                       <fileset dir="." includes="datafiles/ lib/ lib-test/ pix/ src/ test/ l10n/"/>
                </copy>
                <zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
                <delete dir="${build.dir}/${pkgname}"/>
@@ -135,7 +135,7 @@
        <target name="todo" depends="checktodo"/>
        <target name="checktodo">
                <tempfile property="todo.file" prefix="checktodo-"/>
-               <echo>Checking project for critical TODOs.</echo>
+               <echo>Checking project for FIXMEs.</echo>
                <concat destfile="${todo.file}">
                        <fileset dir="${src.dir}">
                            <include name="**/*.java"/>
@@ -145,7 +145,7 @@
                        </fileset>
                        <filterchain>
                                <linecontainsregexp>
-                                       <regexp pattern="TODO:.*CRITICAL"/>
+                                       <regexp pattern="(FIXME|TODO:.*CRITICAL)"/>
                                </linecontainsregexp>
                        </filterchain>
                </concat>