[Scummvm-cvs-logs] SF.net SVN: scummvm:[43101] scummvm/trunk
dhewg at users.sourceforge.net
dhewg at users.sourceforge.net
Fri Aug 7 20:17:01 CEST 2009
Revision: 43101
http://scummvm.svn.sourceforge.net/scummvm/?rev=43101&view=rev
Author: dhewg
Date: 2009-08-07 18:16:58 +0000 (Fri, 07 Aug 2009)
Log Message:
-----------
Merge creation of Info.plist into update-version.pl.
This fixes the static version info after branching (#2820503).
Modified Paths:
--------------
scummvm/trunk/Makefile.common
scummvm/trunk/ports.mk
scummvm/trunk/tools/update-version.pl
Added Paths:
-----------
scummvm/trunk/dists/iphone/Info.plist
scummvm/trunk/dists/macosx/Info.plist
Property Changed:
----------------
scummvm/trunk/dists/macosx/
Modified: scummvm/trunk/Makefile.common
===================================================================
--- scummvm/trunk/Makefile.common 2009-08-07 18:02:06 UTC (rev 43100)
+++ scummvm/trunk/Makefile.common 2009-08-07 18:16:58 UTC (rev 43101)
@@ -144,25 +144,6 @@
######################################################################
-# Create the files that depend on the version
-######################################################################
-
-VERSION_FILES = \
- $(srcdir)/dists/iphone/Info.plist \
- $(srcdir)/dists/macosx/Info.plist
-
-$(VERSION_FILES): %: %.in
- @echo "Creating $@"
- @cat $< | sed \
- -e "s/@VER_MAJOR@/$(VER_MAJOR)/g" \
- -e "s/@VER_MINOR@/$(VER_MINOR)/g" \
- -e "s/@VER_PATCH@/$(VER_PATCH)/g" \
- -e "s/@VER_EXTRA@/$(VER_EXTRA)/g" \
- -e "s/@VERSION@/$(VERSION)/g" \
- > $@
-
-
-######################################################################
# Distribution settings
######################################################################
Added: scummvm/trunk/dists/iphone/Info.plist
===================================================================
--- scummvm/trunk/dists/iphone/Info.plist (rev 0)
+++ scummvm/trunk/dists/iphone/Info.plist 2009-08-07 18:16:58 UTC (rev 43101)
@@ -0,0 +1,30 @@
+<?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>en</string>
+ <key>CFBundleExecutable</key>
+ <string>ScummVM</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.scummvm.scummvm</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>ScummVM</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0.0</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.1.0svn</string>
+ <key>CFBundleVersion</key>
+ <string>svn</string>
+ <key>CFBundleIconFile</key>
+ <string>icon.png</string>
+ <key>UIPrerenderedIcon</key>
+ <true/>
+</dict>
+</plist>
Property changes on: scummvm/trunk/dists/iphone/Info.plist
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Property changes on: scummvm/trunk/dists/macosx
___________________________________________________________________
Deleted: svn:ignore
- Info.plist
Added: scummvm/trunk/dists/macosx/Info.plist
===================================================================
--- scummvm/trunk/dists/macosx/Info.plist (rev 0)
+++ scummvm/trunk/dists/macosx/Info.plist 2009-08-07 18:16:58 UTC (rev 43101)
@@ -0,0 +1,32 @@
+<?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>CFBundleDisplayName</key>
+ <string>ScummVM</string>
+ <key>CFBundleExecutable</key>
+ <string>scummvm</string>
+ <key>CFBundleGetInfoString</key>
+ <string>1.1.0svn, Copyright 2001-2008 The ScummVM team</string>
+ <key>CFBundleIconFile</key>
+ <string>scummvm.icns</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.scummvm.scummvm</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>ScummVM</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.1.0svn</string>
+ <key>CFBundleVersion</key>
+ <string>1.1.0svn</string>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+ <key>NSHumanReadableCopyright</key>
+ <string>Copyright 2001-2008 The ScummVM team</string>
+</dict>
+</plist>
Property changes on: scummvm/trunk/dists/macosx/Info.plist
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: scummvm/trunk/ports.mk
===================================================================
--- scummvm/trunk/ports.mk 2009-08-07 18:02:06 UTC (rev 43100)
+++ scummvm/trunk/ports.mk 2009-08-07 18:16:58 UTC (rev 43101)
@@ -42,7 +42,7 @@
# Special target to create a application wrapper for Mac OS X
bundle_name = ScummVM.app
-bundle: scummvm-static $(srcdir)/dists/macosx/Info.plist
+bundle: scummvm-static
mkdir -p $(bundle_name)/Contents/MacOS
mkdir -p $(bundle_name)/Contents/Resources
echo "APPL????" > $(bundle_name)/Contents/PkgInfo
@@ -57,7 +57,7 @@
chmod 755 $(bundle_name)/Contents/MacOS/scummvm
$(STRIP) $(bundle_name)/Contents/MacOS/scummvm
-iphonebundle: iphone $(srcdir)/dists/iphone/Info.plist
+iphonebundle: iphone
mkdir -p $(bundle_name)
cp $(srcdir)/dists/iphone/Info.plist $(bundle_name)/
cp $(DIST_FILES_DOCS) $(bundle_name)/
Modified: scummvm/trunk/tools/update-version.pl
===================================================================
--- scummvm/trunk/tools/update-version.pl 2009-08-07 18:02:06 UTC (rev 43100)
+++ scummvm/trunk/tools/update-version.pl 2009-08-07 18:16:58 UTC (rev 43101)
@@ -35,6 +35,8 @@
dists/redhat/scummvm.spec
dists/scummvm.rc
dists/slackware/scummvm.SlackBuild
+ dists/macosx/Info.plist
+ dists/iphone/Info.plist
dists/wii/meta.xml
backends/platform/psp/README.PSP
);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list