Mac OS X: Cleaned up bundle metadata for Doomsday and Shell

skyjake · Feb 16, 2013 · 1fbdd7d · 1fbdd7d
1 parent 623115c
commit 1fbdd7d
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 4 deletions.
diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro
@@ -690,7 +690,7 @@ macx {
 
     QMAKE_BUNDLE_DATA += mod res data startupfonts startupgfx
 
-    QMAKE_INFO_PLIST = ../build/mac/Info.plist
+    QMAKE_INFO_PLIST = res/macx/Info.plist
 
     # Since qmake is unable to copy directories as bundle data, let's copy
     # the frameworks manually.

diff --git a/doomsday/client/res/macx/English.lproj/InfoPlist.strings b/doomsday/client/res/macx/English.lproj/InfoPlist.strings
diff --git a/doomsday/build/mac/Info.plist → doomsday/client/res/macx/Info.plist b/doomsday/build/mac/Info.plist → doomsday/client/res/macx/Info.plist
@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
+	<key>CFBundleIdentifier</key>
+	<string>net.dengine.doomsday</string>
 	<key>CFBundleExecutable</key>
 	<string>Doomsday</string>
 	<key>CFBundleIconFile</key>

diff --git a/doomsday/tools/shell/shell-gui/res/macx/English.lproj/InfoPlist.strings b/doomsday/tools/shell/shell-gui/res/macx/English.lproj/InfoPlist.strings
diff --git a/doomsday/tools/shell/shell-gui/res/macx/Info.plist b/doomsday/tools/shell/shell-gui/res/macx/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//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>CFBundleExecutable</key>
+	<string>Doomsday Shell</string>
+	<key>CFBundleIdentifier</key>
+	<string>net.dengine.shell</string>
+	<key>CFBundleIconFile</key>
+	<string>shell.icns</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.10</string>
+</dict>
+</plist>
diff --git a/doomsday/tools/shell/shell-gui/shell-gui.pro b/doomsday/tools/shell/shell-gui/shell-gui.pro
@@ -13,7 +13,7 @@ TEMPLATE = app
 else:win32: TARGET = Doomsday-Shell
       else: TARGET = doomsday-shell
 
-VERSION = 1.0.0
+VERSION = $$DENG_VERSION
 
 # Build Configuration -------------------------------------------------------
 
@@ -62,6 +62,10 @@ RESOURCES += \
 
 macx {
     ICON = res/macx/shell.icns
+    QMAKE_INFO_PLIST = res/macx/Info.plist
+    QMAKE_BUNDLE_DATA += res
+    res.path = Contents/Resources
+    res.files = res/macx/English.lproj
 
     # Clean up previous deployment.
     doPostLink("rm -rf \"Doomsday Shell.app/Contents/PlugIns/\"")

diff --git a/doomsday/tools/shell/shell-text/shell-text.pro b/doomsday/tools/shell/shell-text/shell-text.pro
@@ -9,7 +9,7 @@ include(../../../config.pri)
 
 TEMPLATE = app
 TARGET   = doomsday-shell-text
-VERSION  = 1.0.0
+VERSION  = $$DENG_VERSION
 
 # Build Configuration -------------------------------------------------------
 

diff --git a/snowberry/buildapp.py b/snowberry/buildapp.py
@@ -28,7 +28,7 @@
     CFBundleShortVersionString = ver,
     CFBundleGetInfoString      = verstr,
     CFBundleExecutable         = name,
-    CFBundleIdentifier         = 'net.sourceforge.deng'
+    CFBundleIdentifier         = 'net.dengine.snowberry'
 )
 
 opts = dict(py2app = dict(