Changeset 16007 in josm for trunk

Timestamp:

2020-03-03T02:53:53+01:00 (5 years ago)

Author:

Don-vip

Message:

see #18140 - fix build errors

File:

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

trunk/build.xml

@@ -230 +230 @@
                    shortversion="${version.entry.commit.revision} SVN"
                    version="${version.entry.commit.revision} SVN"
-                   icon="macosx/JOSM.app/Contents/Resources/JOSM.icns"
+                   icon="native/macosx/JOSM.app/Contents/Resources/JOSM.icns"
                    highResolutionCapable="true">
 
@@ -258 +258 @@
             <remove path="/plist/dict/key[text()='CFBundleDocumentTypes']|/plist/dict/key[text()='CFBundleDocumentTypes']/following-sibling::array[1]"/>
             <!-- insert our own keys -->
-            <insert position="before" path="/plist/dict/key[1]" file="macosx/JOSM.app/Contents/Info.plist_template.xml" />
+            <insert position="before" path="/plist/dict/key[1]" file="native/macosx/JOSM.app/Contents/Info.plist_template.xml" />
         </xmltask>
 
@@ -275 +275 @@
     <!-- Windows target -->
     <target name="distwin" depends="dist">
-        <exec dir="windows" executable="./josm-setup-unix.sh">
+        <exec dir="native/windows" executable="./josm-setup-unix.sh">
             <arg value="${version.entry.commit.revision}"/>
             <arg value="${dist.jar}"/>
@@ -492 +492 @@
         </sequential>
     </macrodef>
-    <target name="test-compile" depends="test-init,compile,epsg">
+    <target name="test-compile" depends="test-init,compile,extract-libraries,epsg">
         <call-javac testfamily="unit">
             <cp-elements>