macos: rework the plist and rename apple to macos in repository

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94136b8c870eb2c78ef6bf65cec76533c9b5a6e4..b01730e8fcd1690b2d081fefb019385719e6d542 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -530,7 +530,7 @@ endif ()
 
 if (APPLE)
     install(DIRECTORY
-        setup/apple/Contents
+        setup/macos/Contents
         DESTINATION ${APPLE_INSTALL_PREFIX}
     )
     install(DIRECTORY
@@ -538,7 +538,7 @@ if (APPLE)
         DESTINATION ${APPLE_INSTALL_PREFIX}/Contents/Prefix/share
     )
     install(PROGRAMS
-        setup/apple/netradiant
+        setup/macos/NetRadiant
         DESTINATION ${APPLE_INSTALL_PREFIX}/Contents/MacOS
     )
 endif ()

diff --git a/setup/apple/.gitignore b/setup/apple/.gitignore
deleted file mode 100644 (file)
index e420ee4..0000000
--- a/setup/apple/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-target/*

diff --git a/setup/apple/Contents/Info.plist b/setup/apple/Contents/Info.plist
deleted file mode 100644 (file)
index 3a8348e..0000000
--- a/setup/apple/Contents/Info.plist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>CFBundleDevelopmentRegion</key>
-        <string>English</string>
-        <key>CFBundleDisplayName</key>
-        <string>NetRadiant</string>
-        <key>CFBundleExecutable</key>
-        <string>netradiant</string>
-        <key>CFBundleIconFile</key>
-        <string>netradiant.icns</string>
-        <key>CFBundleIdentifier</key>
-        <string>org.xonotic.netradiant</string>
-        <key>CFBundleName</key>
-        <string>NetRadiant</string>
-        <key>CFBundlePackageType</key>
-        <string>APPL</string>
-        <key>CFBundleShortVersionString</key>
-        <string>1.5.0</string>
-        <key>CFBundleVersion</key>
-        <string>1.5.0</string>
-        <key>LSMinimumSystemVersion</key>
-        <string>10.7</string>
-        <key>NSHighResolutionCapable</key>
-        <false/>
-</dict>
-</plist>

diff --git a/setup/apple/Contents/Resources/netradiant.icns b/setup/apple/Contents/Resources/netradiant.icns
deleted file mode 100644 (file)
index 339e718..0000000
Binary files a/setup/apple/Contents/Resources/netradiant.icns and /dev/null differ

diff --git a/setup/apple/netradiant b/setup/apple/netradiant
deleted file mode 100755 (executable)
index 68a151e..0000000
--- a/setup/apple/netradiant
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /usr/bin/env bash
-
-set -o physical
-
-script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
-
-bundle_dir="$(cd "${script_dir}/../Prefix"; pwd)"
-
-echo "Starting NetRadiant in ${bundle_dir}"
-
-cd "${bundle_dir}"
-
-export FC_DEBUG=1024
-
-# if bundled
-if [ -d "${bundle_dir}/share/icons/hicolor" ]
-then
-       export FONTCONFIG_PATH="${bundle_dir}/etc/fonts"
-
-       # export GDK_GL_LIBGL_PATH="${bundle_dir}/lib/libGL.1.dylib"
-       # export GDK_GL_LIBGLU_PATH="${bundle_dir}/lib/libGLU.1.dylib"
-
-       export GDK_PATH="${bundle_dir}"
-
-       export GDK_PIXBUF_MODULE_FILE="${bundle_dir}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
-
-       export GTK_IM_MODULE_FILE="${bundle_dir}/lib/gtk-2.0/2.10.0/immodules.cache"
-
-       export GOBJECT_PATH="${bundle_dir}"
-
-       export GTK_DATA_PREFIX="${bundle_dir}"
-       export GTK_EXE_PREFIX="${bundle_dir}"
-       export GTK_PATH="${bundle_dir}"
-fi
-
-if [ "$(defaults read -g AppleInterfaceStyle 2>/dev/null)" = 'Dark' ]
-then
-       color='dark'
-else
-       color='light'
-fi
-
-gtkrc_file="${bundle_dir}/share/themes/Mojave-${color}/gtk-2.0/gtkrc"
-
-if [ -f "${gtkrc_file}" ]
-then
-       export GTK2_RC_FILES="${gtkrc_file}"
-fi
-
-exec ./netradiant "${@}"

diff --git a/setup/macos/.gitignore b/setup/macos/.gitignore
new file mode 100644 (file)
index 0000000..e420ee4
--- /dev/null
+++ b/setup/macos/.gitignore
@@ -0,0 +1 @@
+target/*

diff --git a/setup/macos/Contents/Info.plist b/setup/macos/Contents/Info.plist
new file mode 100644 (file)
index 0000000..1cc3d74
--- /dev/null
+++ b/setup/macos/Contents/Info.plist
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+       <key>CFBundleInfoDictionaryVersion</key>
+       <string>6.0</string>
+       <key>CFBundlePackageType</key>
+       <string>APPL</string>
+       <key>CFBundleName</key>
+       <string>NetRadiant</string>
+       <key>CFBundleDisplayName</key>
+       <string>NetRadiant</string>
+       <key>CFBundleIdentifier</key>
+       <string>org.xonotic.netradiant</string>
+       <key>CFBundleExecutable</key>
+       <string>NetRadiant</string>
+       <key>CFBundleIconFile</key>
+       <string>netradiant.icns</string>
+       <key>CFBundleShortVersionString</key>
+       <string>1.5.0</string>
+       <key>CFBundleVersion</key>
+       <string>1.5.0</string>
+       <key>CFBundleDevelopmentRegion</key>
+       <string>English</string>
+       <key>CFBundleSignature</key>
+       <string>????</string>
+       <key>CFBundleTypeExtensions</key>
+       <array>
+               <string>map</string>
+       </array>
+       <key>NSHighResolutionCapable</key>
+       <false/>
+       <key>LSMinimumSystemVersion</key>
+       <string>10.7</string>
+</dict>
+</plist>

diff --git a/setup/macos/Contents/Resources/netradiant.icns b/setup/macos/Contents/Resources/netradiant.icns
new file mode 100644 (file)
index 0000000..339e718
Binary files /dev/null and b/setup/macos/Contents/Resources/netradiant.icns differ

diff --git a/setup/macos/NetRadiant b/setup/macos/NetRadiant
new file mode 100755 (executable)
index 0000000..68a151e
--- /dev/null
+++ b/setup/macos/NetRadiant
@@ -0,0 +1,50 @@
+#! /usr/bin/env bash
+
+set -o physical
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+
+bundle_dir="$(cd "${script_dir}/../Prefix"; pwd)"
+
+echo "Starting NetRadiant in ${bundle_dir}"
+
+cd "${bundle_dir}"
+
+export FC_DEBUG=1024
+
+# if bundled
+if [ -d "${bundle_dir}/share/icons/hicolor" ]
+then
+       export FONTCONFIG_PATH="${bundle_dir}/etc/fonts"
+
+       # export GDK_GL_LIBGL_PATH="${bundle_dir}/lib/libGL.1.dylib"
+       # export GDK_GL_LIBGLU_PATH="${bundle_dir}/lib/libGLU.1.dylib"
+
+       export GDK_PATH="${bundle_dir}"
+
+       export GDK_PIXBUF_MODULE_FILE="${bundle_dir}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+
+       export GTK_IM_MODULE_FILE="${bundle_dir}/lib/gtk-2.0/2.10.0/immodules.cache"
+
+       export GOBJECT_PATH="${bundle_dir}"
+
+       export GTK_DATA_PREFIX="${bundle_dir}"
+       export GTK_EXE_PREFIX="${bundle_dir}"
+       export GTK_PATH="${bundle_dir}"
+fi
+
+if [ "$(defaults read -g AppleInterfaceStyle 2>/dev/null)" = 'Dark' ]
+then
+       color='dark'
+else
+       color='light'
+fi
+
+gtkrc_file="${bundle_dir}/share/themes/Mojave-${color}/gtk-2.0/gtkrc"
+
+if [ -f "${gtkrc_file}" ]
+then
+       export GTK2_RC_FILES="${gtkrc_file}"
+fi
+
+exec ./netradiant "${@}"