Changeset 17884 in josm


Ignore:
Timestamp:
2021-05-12T00:02:48+02:00 (9 months ago)
Author:
Don-vip
Message:

fix #20500 - drop old macOS appbundle generation code

Location:
trunk
Files:
3 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/README

    r17794 r17884  
    6868  - linux/                  files useful for Linux distributions, including Appdata files, .desktop
    6969                            files, Debian/Ubuntu scripts, man pages, icons, etc.
    70   - macosx/                 files needed to create the MacOS X package
     70  - macosx/                 files needed to create the MacOS package
    7171  - windows/                files needed to create the Windows installer
    7272- nodist/                   files not included in JOSM binary
     
    151151    - animal-sniffer-ant-tasks.jar
    152152                            used to build and check code signatures to ensure plugins binary compatibility
    153     - appbundler-1.0ea.jar  used to build Mac OS X package
    154153    - checkstyle/           libs and config files for checkstyle (automatically detects code style
    155154                            problems in source code); can be launched as an ant target in build.xml
     
    159158    - spotbugs/             libs and config files for spotbugs (automatically detects common bugs and potential
    160159                            problems in source code); can be launched as an ant target in build.xml
    161     - xmltask.jar           used to edit XML files from Ant for the OSX package
    162160
    163161Third party libraries
  • trunk/build.xml

    r17853 r17884  
    176176            </manifest>
    177177        </jar>
    178     </target>
    179     <!-- Mac OS X target -->
    180     <target name="mac" depends="init">
    181         <!-- Using https://bitbucket.org/infinitekind/appbundler to create mac application bundle -->
    182         <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${tools.dir}/appbundler.jar"/>
    183         <!-- create MacOS X application bundle -->
    184         <bundleapp outputdirectory="${bundle.outdir}" name="JOSM" displayname="JOSM" executablename="JOSM" identifier="org.openstreetmap.josm"
    185                    mainclassname="org.openstreetmap.josm.gui.MainApplication"
    186                    copyright="JOSM, and all its integral parts, are released under the GNU General Public License v2 or later"
    187                    applicationCategory="public.app-category.utilities"
    188                    shortversion="${version.entry.commit.revision} SVN"
    189                    version="${version.entry.commit.revision} SVN"
    190                    icon="native/macosx/JOSM.icns"
    191                    highResolutionCapable="true">
    192 
    193             <arch name="x86_64"/>
    194             <arch name="i386"/>
    195 
    196             <classpath file="${bundle.jar}"/>
    197 
    198             <option value="-Xdock:icon=Contents/Resources/JOSM.icns"/>
    199             <option value="-Xdock:name=JOSM"/>
    200 
    201             <!-- OSX specific options, optional -->
    202             <option value="-Dapple.laf.useScreenMenuBar=true"/>
    203             <option value="-Dcom.apple.macos.use-file-dialog-packages=true"/>
    204             <option value="-Dcom.apple.macos.useScreenMenuBar=true"/>
    205             <option value="-Dcom.apple.mrj.application.apple.menu.about.name=JOSM"/>
    206             <option value="-Dcom.apple.smallTabs=true"/>
    207         </bundleapp>
    208 
    209         <!-- appbundler lacks the possibility of defining our own keys or using a template, so update the .plist manually -->
    210         <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask" classpath="${tools.dir}/xmltask.jar"/>
    211 
    212         <xmltask source="${bundle.outdir}/JOSM.app/Contents/Info.plist" dest="${bundle.outdir}/JOSM.app/Contents/Info.plist" indent="false">
    213             <!-- remove empty CFBundleDocumentTypes definition -->
    214             <remove path="/plist/dict/key[text()='CFBundleDocumentTypes']|/plist/dict/key[text()='CFBundleDocumentTypes']/following-sibling::array[1]"/>
    215             <!-- insert our own keys -->
    216             <insert position="before" path="/plist/dict/key[1]" file="native/macosx/JOSM.app/Contents/Info.plist_template.xml" />
    217         </xmltask>
    218 
    219         <!-- create ZIP file with MacOS X application bundle -->
    220         <zip destfile="${bundle.outdir}/josm-custom-macosx.zip" update="true">
    221             <zipfileset dir="." includes="CONTRIBUTION README LICENSE"/>
    222             <zipfileset dir="${bundle.outdir}" includes="JOSM.app/**/*" filemode="755" />
    223         </zip>
    224     </target>
    225     <target name="distmac" depends="dist">
    226         <antcall target="mac">
    227             <param name="bundle.outdir" value="${dist.dir}"/>
    228             <param name="bundle.jar" value="${dist.jar}"/>
    229         </antcall>
    230178    </target>
    231179    <!-- Windows target -->
Note: See TracChangeset for help on using the changeset viewer.