[svn-upgrade] Integrating new upstream version, jabref (2.3)

[debian/jabref.git] / build.xml

diff --git a/build.xml b/build.xml
index 53dfdb9ba86023e8f55ac8053e1f721a69841386..48550621001615ce0fa9bc1ab0c42bb38c2ea10e 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -22,8 +22,8 @@
    Compiler: Ant
    Authors:  Joerg K. Wegner, wegnerj@informatik.uni-tuebingen.de
              Morten O. Alver
-   Version:  $Revision: 2408 $
-             $Date: 2007-10-02 22:32:13 +0200 (Tue, 02 Oct 2007) $
+   Version:  $Revision: 2460 $
+             $Date: 2007-11-04 16:58:28 +0100 (Sun, 04 Nov 2007) $
              $Author: mortenalver $
 
    modified:
@@ -47,7 +47,7 @@
      ========================================================================================== -->
 
        <!-- some version information -->
-       <property name="jabref.version" value="2.3b3" />
+       <property name="jabref.version" value="2.3" />
        <property name="jabref.placeholder.version" value="@version@" />
        <!-- used by replace task -->
 
@@ -114,7 +114,7 @@
                <pathelement location="${library.directory}/antlr.jar" />
                <pathelement location="${library.directory}/antlr-3.0b5.jar" />
                <pathelement location="${library.directory}/looks-2.0.4.jar" />
-               <pathelement location="${library.directory}/forms-1.0.4.jar" />
+               <pathelement location="${library.directory}/forms-1.1.0.jar" />
                <pathelement location="${library.directory}/spin.jar" />
                <pathelement location="${library.directory}/glazedlists-1.7.0_java15.jar" />
                <pathelement location="${library.directory}/microba.jar" />
@@ -156,11 +156,17 @@
        <!-- Compiles project -->
        <target name="compile">
                <mkdir dir="${build.classes}" />
-               <javac debug="on" deprecation="on" destdir="${build.classes}" source="1.5" target="1.5">
+               <javac debug="off" deprecation="on" destdir="${build.classes}" source="1.5" target="1.5">
                        <src path="${java.dir}" />
                        <exclude name="tests/**" />
+                       <exclude name="**/JabRefMain.java" />
                        <classpath refid="classpath" />
                </javac>
+               <javac debug="off" deprecation="on" destdir="${build.classes}" source="1.4" target="1.4">
+                  <src path="${java.dir}" />
+                  <include name="**/JabRefMain.java" />
+                </javac>
+
        </target>
 
        <!-- Compiles only the tests -->
@@ -359,7 +365,7 @@ version=${jabref.version}</echo>
                <unjar src="${library.directory}/antlr.jar" dest="${build.tmp}" />
                <unjar src="${library.directory}/antlr-3.0b5.jar" dest="${build.tmp}" />
                <unjar src="${library.directory}/looks-2.0.4.jar" dest="${build.tmp}" />
-               <unjar src="${library.directory}/forms-1.0.4.jar" dest="${build.tmp}" />
+               <unjar src="${library.directory}/forms-1.1.0.jar" dest="${build.tmp}" />
                <unjar src="${library.directory}/spin.jar" dest="${build.tmp}" />
                <unjar src="${library.directory}/glazedlists-1.7.0_java15.jar" dest="${build.tmp}" />
                <unjar src="${library.directory}/microba.jar" dest="${build.tmp}" />