Changeset 17884 in josm

Timestamp:

2021-05-12T00:02:48+02:00 (4 years ago)

Author:

Don-vip

Message:

fix #20500 - drop old macOS appbundle generation code

Location:

trunk

Files:

• README (modified) (3 diffs)
• build.xml (modified) (1 diff)
• native/macosx/JOSM.app (deleted)
• tools/appbundler.jar (deleted)
• tools/xmltask.jar (deleted)

trunk/README

@@ -68 +68 @@
   - linux/                  files useful for Linux distributions, including Appdata files, .desktop
                             files, Debian/Ubuntu scripts, man pages, icons, etc.
-  - macosx/                 files needed to create the MacOS X package
+  - macosx/                 files needed to create the MacOS package
   - windows/                files needed to create the Windows installer
 - nodist/                   files not included in JOSM binary
@@ -151 +151 @@
     - animal-sniffer-ant-tasks.jar
                             used to build and check code signatures to ensure plugins binary compatibility 
-    - appbundler-1.0ea.jar  used to build Mac OS X package
     - checkstyle/           libs and config files for checkstyle (automatically detects code style
                             problems in source code); can be launched as an ant target in build.xml
@@ -159 +158 @@
     - spotbugs/             libs and config files for spotbugs (automatically detects common bugs and potential
                             problems in source code); can be launched as an ant target in build.xml
-    - xmltask.jar           used to edit XML files from Ant for the OSX package
 
 Third party libraries

trunk/build.xml

@@ -176 +176 @@
             </manifest>
         </jar>
-    </target>
-    <!-- Mac OS X target -->
-    <target name="mac" depends="init">
-        <!-- Using https://bitbucket.org/infinitekind/appbundler to create mac application bundle -->
-        <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${tools.dir}/appbundler.jar"/>
-        <!-- create MacOS X application bundle -->
-        <bundleapp outputdirectory="${bundle.outdir}" name="JOSM" displayname="JOSM" executablename="JOSM" identifier="org.openstreetmap.josm"
-                   mainclassname="org.openstreetmap.josm.gui.MainApplication"
-                   copyright="JOSM, and all its integral parts, are released under the GNU General Public License v2 or later"
-                   applicationCategory="public.app-category.utilities"
-                   shortversion="${version.entry.commit.revision} SVN"
-                   version="${version.entry.commit.revision} SVN"
-                   icon="native/macosx/JOSM.icns"
-                   highResolutionCapable="true">
-
-            <arch name="x86_64"/>
-            <arch name="i386"/>
-
-            <classpath file="${bundle.jar}"/>
-
-            <option value="-Xdock:icon=Contents/Resources/JOSM.icns"/>
-            <option value="-Xdock:name=JOSM"/>
-
-            <!-- OSX specific options, optional -->
-            <option value="-Dapple.laf.useScreenMenuBar=true"/>
-            <option value="-Dcom.apple.macos.use-file-dialog-packages=true"/>
-            <option value="-Dcom.apple.macos.useScreenMenuBar=true"/>
-            <option value="-Dcom.apple.mrj.application.apple.menu.about.name=JOSM"/>
-            <option value="-Dcom.apple.smallTabs=true"/>
-        </bundleapp>
-
-        <!-- appbundler lacks the possibility of defining our own keys or using a template, so update the .plist manually -->
-        <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask" classpath="${tools.dir}/xmltask.jar"/>
-
-        <xmltask source="${bundle.outdir}/JOSM.app/Contents/Info.plist" dest="${bundle.outdir}/JOSM.app/Contents/Info.plist" indent="false">
-            <!-- remove empty CFBundleDocumentTypes definition -->
-            <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="native/macosx/JOSM.app/Contents/Info.plist_template.xml" />
-        </xmltask>
-
-        <!-- create ZIP file with MacOS X application bundle -->
-        <zip destfile="${bundle.outdir}/josm-custom-macosx.zip" update="true">
-            <zipfileset dir="." includes="CONTRIBUTION README LICENSE"/>
-            <zipfileset dir="${bundle.outdir}" includes="JOSM.app/**/*" filemode="755" />
-        </zip>
-    </target>
-    <target name="distmac" depends="dist">
-        <antcall target="mac">
-            <param name="bundle.outdir" value="${dist.dir}"/>
-            <param name="bundle.jar" value="${dist.jar}"/>
-        </antcall>
     </target>
     <!-- Windows target -->