Changes to the Spanish translations

[debian/openrocket] / build.xml

diff --git a/build.xml b/build.xml
index 394aea4ee87ea6393cdcb1b7f97cf8291b098f6b..30f62d25b5109c18b6956348dc39aa65dc75851f 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -23,7 +23,6 @@
        
        <!-- The main class of the application -->
        <property name="main-class"  value="net.sf.openrocket.startup.Startup"/>
-       <property name="main-dir" value="net/sf/openrocket/startup"/>
 
        
        <!-- Classpath definitions -->
@@ -36,8 +35,8 @@
                <pathelement location="${basedir}"/>
                <pathelement location="${build-test.dir}"/>
                <pathelement location="${classes.dir}"/>
-<!--           <pathelement location="${ant.library.dir}/junit4.jar"/> -->
-               <pathelement location="lib-test/junit-4.7.jar"/>
+               <pathelement location="${src-test.dir}"/>
+               <fileset dir="lib-test/" includes="*.jar"/>
        </path>
        
 
@@ -52,10 +51,9 @@
        <!-- BUILD -->
        <target name="build">
                <mkdir dir="${classes.dir}"/>
-               <echo>Compiling main classes</echo>
-               <javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" excludes="${main-dir}/*" classpathref="classpath"/>
-               <echo>Compiling startup classes</echo>
-               <javac debug="true" srcdir="${src.dir}/${main-dir}" destdir="${classes.dir}" source="1.4" classpathref="classpath"/>
+               <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>
        
@@ -64,7 +62,7 @@
        <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/" />
                </copy>
                <mkdir dir="${jar.dir}"/>
                <jar destfile="${jar.file}" basedir="${dist.dir}">
@@ -75,6 +73,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>
        
@@ -189,14 +188,15 @@ ${nonascii}</fail>
                
                <echo>Running unit tests</echo>
                <mkdir dir="tmp/rawtestoutput"/>
-               <junit fork="yes" forkmode="once" printsummary="true" failureproperty="junit.failure">
+               <junit fork="yes" forkmode="once" printsummary="false" failureproperty="junit.failure">
                        <classpath>
                                <path refid="test-classpath"/>
                                <path location="${basedir}"/>
                        </classpath>
                        <batchtest todir="tmp/rawtestoutput">
                                <fileset dir="${build-test.dir}">
-                                       <include name="**/*Test*.class" />
+                                       <include name="**/Test*.class" />
+                                       <include name="**/*Test.class" />
                                        <exclude name="**/*$*.class" />
                                        <exclude name="Test.class" />
                                </fileset>