Mercurial > hg > openttd

changeset 9680:375d9d25eaaa draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r13785) -Add: support for freedesktop.org desktop entry files
author skidd13 <skidd13@openttd.org>
date Tue, 22 Jul 2008 17:18:53 +0000
parents 4debbf193579
children 434976ffd38e
files Makefile.in config.lib media/openttd.desktop.in
diffstat 3 files changed, 80 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,12 +14,14 @@
 CONFIGURE_FILES = !!CONFIGURE_FILES!!
 LIPO = !!LIPO!!
 BIN_DIR = !!BIN_DIR!!
+MENU_DIR = !!MENU_DIR!!
 SRC_DIR = !!SRC_DIR!!
 ROOT_DIR = !!ROOT_DIR!!
 BUNDLE_DIR = "$(ROOT_DIR)/bundle"
 BUNDLES_DIR = "$(ROOT_DIR)/bundles"
 INSTALL_DIR = !!INSTALL_DIR!!
 INSTALL_BINARY_DIR = "$(INSTALL_DIR)/"!!BINARY_DIR!!
+INSTALL_MENU_DIR = "$(INSTALL_DIR)/$(MENU_DIR)"
 INSTALL_ICON_DIR = "$(INSTALL_DIR)/"!!ICON_DIR!!
 INSTALL_DATA_DIR = "$(INSTALL_DIR)/"!!DATA_DIR!!
 TTD = !!TTD!!
@@ -107,6 +109,7 @@
 	done
 	$(Q)rm -rf objs
 	$(Q)rm -f Makefile Makefile.am
+	$(Q)rm -f media/openttd.desktop
 	$(Q)rm -f $(CONFIG_CACHE_SOURCE_LIST) config.cache config.log
 	$(Q)rm -rf $(BUNDLE_DIR)
 	$(Q)rm -rf $(BUNDLES_DIR)
@@ -203,6 +206,9 @@
 	$(Q)cp "$(ROOT_DIR)/media/openttd.64.png" "$(BUNDLE_DIR)/media/"
 	$(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/"
 	$(Q)cp "$(ROOT_DIR)/media/openttd.32.bmp" "$(BUNDLE_DIR)/media/"
+ifdef MENU_DIR
+	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
+endif
 ifeq ($(shell if test -n "`ls -l \"$(BIN_DIR)/scenario/\"*.scn 2> /dev/null`"; then echo 1; fi), 1)
 	$(Q)cp "$(BIN_DIR)/scenario/"*.scn        "$(BUNDLE_DIR)/scenario/"
 endif
@@ -269,6 +275,12 @@
 	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(INSTALL_DATA_DIR)/docs"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/"* "$(INSTALL_ICON_DIR)"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.64.png" "$(INSTALL_ICON_DIR)"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.xpm" "$(INSTALL_ICON_DIR)"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.bmp" "$(INSTALL_ICON_DIR)"
+ifdef MENU_DIR
+	$(Q)install -d "$(INSTALL_MENU_DIR)"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.desktop" "$(INSTALL_MENU_DIR)"
+endif
 	$(Q)cp -R "$(BUNDLE_DIR)/scenario" "$(INSTALL_DATA_DIR)"
 endif # OSXAPP
--- a/config.lib
+++ b/config.lib
@@ -29,9 +29,11 @@
 	binary_dir="games"
 	data_dir="share/games/openttd"
 	icon_dir="share/pixmaps"
+	menu_dir="share/applications"
 	personal_dir="1"
 	shared_dir="1"
 	install_dir="/"
+	menu_group="Game;"
 	enable_debug="0"
 	enable_desync_debug="0"
 	enable_profiling="0"
@@ -48,6 +50,7 @@
 	enable_cocoa_quickdraw="1"
 	with_osx_sysroot="1"
 	with_application_bundle="1"
+	with_menu_entry="1"
 	with_sdl="1"
 	with_cocoa="1"
 	with_zlib="1"
@@ -86,9 +89,11 @@
 		binary_dir
 		data_dir
 		icon_dir
+		menu_dir
 		personal_dir
 		shared_dir
 		install_dir
+		menu_group
 		enable_debug
 		enable_desync_debug
 		enable_profiling
@@ -105,6 +110,7 @@
 		enable_cocoa_quickdraw
 		with_osx_sysroot
 		with_application_bundle
+		with_menu_entry
 		with_sdl
 		with_cocoa
 		with_zlib
@@ -191,6 +197,9 @@
 			--icon-dir)                   prevp_p="icon-dir";;
 			--icon-dir=*)                 icon_dir="$optarg";;
 
+			--menu-dir)                   prevp_p="menu_dir";;
+			--menu-dir=*)                 menu_dir="$optarg";;
+
 			--personal-dir)               prevp_p="personal-dir";;
 			--personal-dir=*)             personal_dir="$optarg";;
 			--without-personal-dir)       personal_dir="";;
@@ -204,6 +213,14 @@
 
 
 
+			--with-menu-entry)            with_menu_entry="1";;
+			--without-menu-entry)         with_menu_entry="0";;
+
+			--menu_group)                 prevp_p="menu_group";;
+			--menu_group=*)               menu_group="$optarg";;
+
+
+
 			--enable-debug)               enable_debug="1";;
 			--enable-debug=*)             enable_debug="$optarg";;
 			--enable-desync-debug)        enable_desync_debug="1";;
@@ -737,7 +754,7 @@
 			# First, are we a real OSX system, else we can't detect it
 			native=`LC_ALL=C uname | tr '[A-Z]' '[a-z]' | grep darwin`
 			# If $host doesn't match $build , we are cross-compiling
-			if [ -n "$native" ] && [ "$build" == "$host" ]; then
+			if [ -n "$native" ] && [ "$build" = "$host" ]; then
 				$cxx_build $SRC_DIR/os/macosx/G5_detector.cpp -o G5_detector
 				res=`./G5_detector`
 				rm -f G5_detector
@@ -849,6 +866,13 @@
 	else
 		log 1 "installation directory... none"
 	fi
+
+	if [ "$os" = "CYGWIN" ] || [ "$os" = "MINGW" ] || [ "$os" = "OS2" ] || [ "$os" = "WINCE" ] || [ "$os" = "PSP" ] || [ "$os" = "OSX" ] || [ "$os" = "MORPHOS" ]; then
+		# Don't create a .desktop file
+		with_menu_entry="0"
+		menu_dir=""
+		menu_group=""
+	fi
 }
 
 make_cflags_and_ldflags() {
@@ -2227,6 +2251,25 @@
 		s#!!GCC295!!#$gcc295#g;
 		s#!!DISTCC!!#$distcc#g;
 	"
+
+	if [ "$with_menu_entry" = "1" ]; then
+		SRC_REPLACE="$SRC_REPLACE
+			s#!!MENU_DIR!!#$prefix_dir/$menu_dir#g;
+		"
+	else
+		SRC_REPLACE="$SRC_REPLACE
+			s#!!MENU_DIR!!##g;
+		"
+	fi
+}
+
+generate_menu_item() {
+	MENU_REPLACE="
+		s#!!TTD!!#$TTD#g;
+		s#!!MENU_GROUP!!#$menu_group#g
+	"
+	echo "Generating menu item..."
+	< $ROOT_DIR/media/openttd.desktop.in sed "$MENU_REPLACE" > media/openttd.desktop
 }
 
 generate_main() {
@@ -2243,6 +2286,10 @@
 	cp $SOURCE_LIST config.cache.source.list
 	# Make sure config.cache is OLDER then config.cache.source.list
 	touch config.cache
+
+	if [ "$with_menu_entry" = "1" ]; then
+		generate_menu_item
+	fi
 }
 
 generate_lang() {
@@ -2341,6 +2388,9 @@
 	echo "                                 [share/games/openttd]"
 	echo "  --icon-dir=dir                 location of icons. Will be prefixed"
 	echo "                                 with the prefix-dir [share/pixmaps]"
+	echo "  --menu-dir=dir                 location of the menu item. (UNIX only, except OSX)"
+	echo "                                 Will be prefixed with the prefix-dir"
+	echo "                                 [share/applications]"
 	echo "  --personal-dir=dir             location of the personal directory"
 	echo "                                 [os-dependent default]"
 	echo "  --shared-dir=dir               location of shared data files"
@@ -2369,6 +2419,9 @@
 	echo "                                 (OSX ONLY)"
 	echo "  --without-application-bundle   disable generation of application bundle"
 	echo "                                 (OSX ONLY)"
+	echo "  --with-menu-entry              Generate a menu item on for UNIX desktops (Except OSX)"
+	echo "  --without-menu-entry           Don't generate a menu item"
+	echo "  --menu_group=group             Category in which the menu item will be placed (UNIX only, except OSX)"
 	echo "  --with-direct-music            enable direct music support (Win32 ONLY)"
 	echo "  --with-sort=sort               define a non-default location for sort"
 	echo "  --with-midi=midi               define which midi-player to use"
new file mode 100644
--- /dev/null
+++ b/media/openttd.desktop.in
@@ -0,0 +1,13 @@
+# $Id$
+# http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.1.html
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Version=1.1
+Name=OpenTTD
+GenericName=A clone of Transport Tycoon Deluxe
+Comment=A business simulation game
+Icon=openttd
+Exec=!!TTD!!
+Terminal=false
+Categories=!!MENU_GROUP!!