Changeset 2618 in josm for trunk/build.xml

Timestamp:

2009-12-12T16:38:28+01:00 (12 years ago)

Author:

Gubaer

Message:

fixed #4153: Upload dialog's "Upload to '$URL'" isn't updated when the API URL is changed in the preferences
fixed #3642: JOSM offers to use open changeset from a different server

File:

• trunk/build.xml (modified) (7 diffs)

trunk/build.xml

@@ -14 +14 @@
         <property name="src.dir" value="src" />
         <property name="build.dir" value="build"/>
-    <!-- build parameter: compression level (ant -Dclevel=N)
+        <!-- build parameter: compression level (ant -Dclevel=N)
              N ranges from 0 (no compression) to 9 (maximum compression)
              default: 9 -->
-    <condition property="clevel" value="${clevel}" else="9">
-        <isset property="clevel" />
-    </condition>
+        <condition property="clevel" value="${clevel}" else="9">
+                <isset property="clevel" />
+        </condition>
 
         <!-- Java classpath addition (all jar files to compile tests with this) -->
@@ -28 +28 @@
         </path>
 
-        
+
         <!--
           ** Used by Eclipse ant builder for updating 
           ** the REVISION file used by JOSM
-        -->       
+        -->
         <target name="create-revision-eclipse">
                 <property name="revision.dir" value="bin"/>
@@ -40 +40 @@
         <!--
           ** Creates the REVISION file to be included in the distribution
-          -->     
+          -->
         <target name="create-revision">
                 <property name="revision.dir" value="${build.dir}"/>
                 <exec append="false" output="REVISION.XML" executable="svn" failifexecutionfails="false">
-                                <env key="LANG" value="C"/>
-                                <arg value="info"/>
-                                <arg value="--xml"/>
-                                <arg value="."/>
+                        <env key="LANG" value="C"/>
+                        <arg value="info"/>
+                        <arg value="--xml"/>
+                        <arg value="."/>
                 </exec>
                 <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
                 <delete file="REVISION.XML" />
                 <tstamp>
-                      <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
+                        <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
                 </tstamp>
 
@@ -62 +62 @@
 Is-Local-Build: true
 Build-Date: ${build.tstamp}             
-</echo>                                         
+</echo>
         </target>
-                
+
 
         <target name="dist" depends="compile,create-revision">
@@ -78 +78 @@
                 <property name="version.entry.commit.revision" value="UNKNOWN"/>
                 <property name="version.entry.commit.date" value="UNKNOWN"/>
-            <echo>Revision ${version.entry.commit.revision}</echo>
+                <echo>Revision ${version.entry.commit.revision}</echo>
                 <copy file="CONTRIBUTION" todir="build"/>
                 <copy file="README" todir="build"/>
                 <copy file="LICENSE" todir="build"/>
 
-        <!-- styles -->
+                <!-- styles -->
                 <copy file="styles/standard/elemstyles.xml" todir="build/styles/standard"/>
 
-        <!-- css-->
+                <!-- css-->
                 <copy file="src/org/openstreetmap/josm/gui/help/help-browser.css" todir="build/org/openstreetmap/josm/gui/help"/>
 
@@ -92 +92 @@
                 <delete file="dist/josm-custom.jar"/>
                 <jar destfile="dist/josm-custom.jar" basedir="build" level="${clevel}">
-        <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
+                        <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
                         <manifest>
                                 <attribute name="Main-class" value="JOSM" />
@@ -166 +166 @@
                         <compilerarg value="-Xlint:unchecked"/>
                 </javac>
+                <javac srcdir="${src.dir}:${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
+                                                target="1.5" source="1.5" debug="on" encoding="UTF-8">
+                        <compilerarg value="-Xlint:deprecation"/>
+                        <compilerarg value="-Xlint:unchecked"/>
+                </javac>
         </target>
 
-    <target name="test" depends="test-compile">
-        <junit printsummary="yes">
-                <sysproperty key="josm.home" value="${test.dir}/config/unit-josm.home"/>
-            <classpath>
-                <path refid="test.classpath"/>
-                <pathelement path="${test.dir}/${build.dir}"/>
-                <pathelement path="${test.dir}/config"/>
-            </classpath>
-            <formatter type="plain"/>
-            <batchtest fork="no" todir="${test.dir}/report">
-                <fileset dir="${test.dir}/unit" includes="**/*.java"/>
-            </batchtest>
-        </junit>
-    </target>
+        <target name="test" depends="test-compile">
+                <junit printsummary="yes">
+                        <sysproperty key="josm.home" value="${test.dir}/config/unit-josm.home"/>
+                        <classpath>
+                                <path refid="test.classpath"/>
+                                <pathelement path="${test.dir}/${build.dir}"/>
+                                <pathelement path="${test.dir}/config"/>
+                        </classpath>
+                        <formatter type="plain"/>
+                        <batchtest fork="no" todir="${test.dir}/report">
+                                <fileset dir="${test.dir}/unit" includes="**/*.java"/>
+                        </batchtest>
+                </junit>
+        </target>
 
 </project>