diff options
| author | Andre Heider | 2009-08-07 18:16:58 +0000 |
|---|---|---|
| committer | Andre Heider | 2009-08-07 18:16:58 +0000 |
| commit | 57e45de95bbc91bd54eecff8410646675589c799 (patch) | |
| tree | c836c1747601b71b8ce0002e86c8463c76fd2002 | |
| parent | 08b650c1a6fbcb5070090a1e14ba72b3e177efda (diff) | |
| download | scummvm-rg350-57e45de95bbc91bd54eecff8410646675589c799.tar.gz scummvm-rg350-57e45de95bbc91bd54eecff8410646675589c799.tar.bz2 scummvm-rg350-57e45de95bbc91bd54eecff8410646675589c799.zip | |
Merge creation of Info.plist into update-version.pl.
This fixes the static version info after branching (#2820503).
svn-id: r43101
| -rw-r--r-- | Makefile.common | 19 | ||||
| -rw-r--r-- | dists/iphone/Info.plist | 30 | ||||
| -rw-r--r-- | dists/macosx/Info.plist | 32 | ||||
| -rw-r--r-- | ports.mk | 4 | ||||
| -rwxr-xr-x | tools/update-version.pl | 2 |
5 files changed, 66 insertions, 21 deletions
diff --git a/Makefile.common b/Makefile.common index 51261d65d9..caf5ba22fa 100644 --- a/Makefile.common +++ b/Makefile.common @@ -144,25 +144,6 @@ endif ###################################################################### -# 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 ###################################################################### diff --git a/dists/iphone/Info.plist b/dists/iphone/Info.plist new file mode 100644 index 0000000000..1a0a8bf0b6 --- /dev/null +++ b/dists/iphone/Info.plist @@ -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> diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist new file mode 100644 index 0000000000..5600084eae --- /dev/null +++ b/dists/macosx/Info.plist @@ -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> @@ -42,7 +42,7 @@ deb: # 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 @@ bundle: scummvm-static $(srcdir)/dists/macosx/Info.plist 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)/ diff --git a/tools/update-version.pl b/tools/update-version.pl index ec0249c872..406f8bf045 100755 --- a/tools/update-version.pl +++ b/tools/update-version.pl @@ -35,6 +35,8 @@ my @subs_files = qw( 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 ); |