Updated Branches: refs/heads/master 219ab6987 -> 56b8cad9a
Updated templates for the new splash-screen names. Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/commit/56b8cad9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/56b8cad9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/56b8cad9 Branch: refs/heads/master Commit: 56b8cad9a53df0abd8df8de6d965a92e25673e54 Parents: 219ab69 Author: Shazron Abdullah <shaz...@apache.org> Authored: Mon Apr 30 14:24:58 2012 -0700 Committer: Shazron Abdullah <shaz...@apache.org> Committed: Mon Apr 30 14:24:58 2012 -0700 ---------------------------------------------------------------------- .../TemplateInfo.plist | 12 ++-- .../___PROJECTNAME___.xcodeproj/project.pbxproj | 55 ++++++++++---- 2 files changed, 45 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/56b8cad9/Cordova-based Application.xctemplate/TemplateInfo.plist ---------------------------------------------------------------------- diff --git a/Cordova-based Application.xctemplate/TemplateInfo.plist b/Cordova-based Application.xctemplate/TemplateInfo.plist index 854db01..790514c 100644 --- a/Cordova-based Application.xctemplate/TemplateInfo.plist +++ b/Cordova-based Application.xctemplate/TemplateInfo.plist @@ -231,7 +231,7 @@ <key>PathType</key> <string>Group</string> </dict> - <key>Resources/splash/Default.png</key> + <key>Resources/splash/Default~iphone.png</key> <dict> <key>Group</key> <array> @@ -239,11 +239,11 @@ <string>splash</string> </array> <key>Path</key> - <string>./Resources/splash/Default.png</string> + <string>./Resources/splash/Default~iphone.png</string> <key>PathType</key> <string>Group</string> </dict> - <key>Resources/splash/defa...@2x.png</key> + <key>Resources/splash/Default@2x~iphone.png</key> <dict> <key>Group</key> <array> @@ -251,7 +251,7 @@ <string>splash</string> </array> <key>Path</key> - <string>./Resources/splash/defa...@2x.png</string> + <string>./Resources/splash/Default@2x~iphone.png</string> <key>PathType</key> <string>Group</string> </dict> @@ -286,8 +286,8 @@ <string>Resources/icons/icon.png</string> <string>Resources/icons/i...@2x.png</string> <string>Resources/icons/icon-72.png</string> - <string>Resources/splash/Default.png</string> - <string>Resources/splash/defa...@2x.png</string> + <string>Resources/splash/Default~iphone.png</string> + <string>Resources/splash/Default@2x~iphone.png</string> <string>Resources/Capture.bundle</string> <string>Cordova.plist</string> <string>Classes/AppDelegate.h</string> http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/56b8cad9/Cordova-based Application/___PROJECTNAME___.xcodeproj/project.pbxproj ---------------------------------------------------------------------- diff --git a/Cordova-based Application/___PROJECTNAME___.xcodeproj/project.pbxproj b/Cordova-based Application/___PROJECTNAME___.xcodeproj/project.pbxproj index 197c1bb..733fea3 100755 --- a/Cordova-based Application/___PROJECTNAME___.xcodeproj/project.pbxproj +++ b/Cordova-based Application/___PROJECTNAME___.xcodeproj/project.pbxproj @@ -30,13 +30,15 @@ 3053AC6F109B7857006FCFE7 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 3053AC6E109B7857006FCFE7 /* VERSION */; }; 305D5FD1115AB8F900A74A75 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 305D5FD0115AB8F900A74A75 /* MobileCoreServices.framework */; }; 3072F99713A8081B00425683 /* Capture.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 3072F99613A8081B00425683 /* Capture.bundle */; }; + 3088BBBD154F3926009F9C59 /* Default-Landscape@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 3088BBB7154F3926009F9C59 /* Default-Landscape@2x~ipad.png */; }; + 3088BBBE154F3926009F9C59 /* Default-Landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 3088BBB8154F3926009F9C59 /* Default-Landscape~ipad.png */; }; + 3088BBBF154F3926009F9C59 /* Default-Portrait@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 3088BBB9154F3926009F9C59 /* Default-Portrait@2x~ipad.png */; }; + 3088BBC0154F3926009F9C59 /* Default-Portrait~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 3088BBBA154F3926009F9C59 /* Default-Portrait~ipad.png */; }; + 3088BBC1154F3926009F9C59 /* Default@2x~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 3088BBBB154F3926009F9C59 /* Default@2x~iphone.png */; }; + 3088BBC2154F3926009F9C59 /* Default~iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 3088BBBC154F3926009F9C59 /* Default~iphone.png */; }; 308D05371370CCF300D202BF /* icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 308D052E1370CCF300D202BF /* icon-72.png */; }; 308D05381370CCF300D202BF /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 308D052F1370CCF300D202BF /* icon.png */; }; 308D05391370CCF300D202BF /* i...@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 308D05301370CCF300D202BF /* i...@2x.png */; }; - 308D053A1370CCF300D202BF /* Default-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 308D05321370CCF300D202BF /* Default-Landscape.png */; }; - 308D053B1370CCF300D202BF /* Default-Portrait.png in Resources */ = {isa = PBXBuildFile; fileRef = 308D05331370CCF300D202BF /* Default-Portrait.png */; }; - 308D053C1370CCF300D202BF /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 308D05341370CCF300D202BF /* Default.png */; }; - 308D053D1370CCF300D202BF /* defa...@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 308D05351370CCF300D202BF /* defa...@2x.png */; }; 30A0434814DC770100060A13 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 30A0434314DC770100060A13 /* Localizable.strings */; }; 30A0434914DC770100060A13 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 30A0434614DC770100060A13 /* Localizable.strings */; }; 30E1352710E2C1420031B30D /* Cordova.plist in Resources */ = {isa = PBXBuildFile; fileRef = 30E1352610E2C1420031B30D /* Cordova.plist */; }; @@ -65,6 +67,13 @@ remoteGlobalIDString = 686357A9141002F100DF4CF2; remoteInfo = CordovaLibTests; }; + 3088BBB4154F38EF009F9C59 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 301BF52D109A57CC0062928A /* CordovaLib.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 303A4068152124BB00182201; + remoteInfo = CordovaLibApp; + }; 30E47BC2136F595F00DBB853 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 301BF52D109A57CC0062928A /* CordovaLib.xcodeproj */; @@ -102,13 +111,15 @@ 305D5FD0115AB8F900A74A75 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; }; 3072F99613A8081B00425683 /* Capture.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Capture.bundle; path = Resources/Capture.bundle; sourceTree = "<group>"; }; 307D28A1123043350040C0FA /* CordovaBuildSettings.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = CordovaBuildSettings.xcconfig; sourceTree = "<group>"; }; + 3088BBB7154F3926009F9C59 /* Default-Landscape@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Landscape@2x~ipad.png"; sourceTree = "<group>"; }; + 3088BBB8154F3926009F9C59 /* Default-Landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Landscape~ipad.png"; sourceTree = "<group>"; }; + 3088BBB9154F3926009F9C59 /* Default-Portrait@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait@2x~ipad.png"; sourceTree = "<group>"; }; + 3088BBBA154F3926009F9C59 /* Default-Portrait~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait~ipad.png"; sourceTree = "<group>"; }; + 3088BBBB154F3926009F9C59 /* Default@2x~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x~iphone.png"; sourceTree = "<group>"; }; + 3088BBBC154F3926009F9C59 /* Default~iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default~iphone.png"; sourceTree = "<group>"; }; 308D052E1370CCF300D202BF /* icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-72.png"; sourceTree = "<group>"; }; 308D052F1370CCF300D202BF /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; }; 308D05301370CCF300D202BF /* i...@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "i...@2x.png"; sourceTree = "<group>"; }; - 308D05321370CCF300D202BF /* Default-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Landscape.png"; sourceTree = "<group>"; }; - 308D05331370CCF300D202BF /* Default-Portrait.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait.png"; sourceTree = "<group>"; }; - 308D05341370CCF300D202BF /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; }; - 308D05351370CCF300D202BF /* defa...@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "defa...@2x.png"; sourceTree = "<group>"; }; 30A0434414DC770100060A13 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = Localizable.strings; sourceTree = "<group>"; }; 30A0434714DC770100060A13 /* se */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = se; path = Localizable.strings; sourceTree = "<group>"; }; 30E1352610E2C1420031B30D /* Cordova.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Cordova.plist; sourceTree = "<group>"; }; @@ -250,6 +261,7 @@ 301BF535109A57CC0062928A /* libCordova.a */, 30E47BC3136F595F00DBB853 /* Cordova.framework */, 302D95EC14D23909003F00A1 /* CordovaLibTests.octest */, + 3088BBB5154F38EF009F9C59 /* CordovaLibApp.app */, ); name = Products; sourceTree = "<group>"; @@ -275,10 +287,12 @@ 308D05311370CCF300D202BF /* splash */ = { isa = PBXGroup; children = ( - 308D05321370CCF300D202BF /* Default-Landscape.png */, - 308D05331370CCF300D202BF /* Default-Portrait.png */, - 308D05341370CCF300D202BF /* Default.png */, - 308D05351370CCF300D202BF /* defa...@2x.png */, + 3088BBB7154F3926009F9C59 /* Default-Landscape@2x~ipad.png */, + 3088BBB8154F3926009F9C59 /* Default-Landscape~ipad.png */, + 3088BBB9154F3926009F9C59 /* Default-Portrait@2x~ipad.png */, + 3088BBBA154F3926009F9C59 /* Default-Portrait~ipad.png */, + 3088BBBB154F3926009F9C59 /* Default@2x~iphone.png */, + 3088BBBC154F3926009F9C59 /* Default~iphone.png */, ); name = splash; path = Resources/splash; @@ -376,6 +390,13 @@ remoteRef = 302D95EB14D23909003F00A1 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 3088BBB5154F38EF009F9C59 /* CordovaLibApp.app */ = { + isa = PBXReferenceProxy; + fileType = wrapper.application; + path = CordovaLibApp.app; + remoteRef = 3088BBB4154F38EF009F9C59 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 30E47BC3136F595F00DBB853 /* Cordova.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; @@ -396,16 +417,18 @@ 308D05371370CCF300D202BF /* icon-72.png in Resources */, 308D05381370CCF300D202BF /* icon.png in Resources */, 308D05391370CCF300D202BF /* i...@2x.png in Resources */, - 308D053A1370CCF300D202BF /* Default-Landscape.png in Resources */, - 308D053B1370CCF300D202BF /* Default-Portrait.png in Resources */, - 308D053C1370CCF300D202BF /* Default.png in Resources */, - 308D053D1370CCF300D202BF /* defa...@2x.png in Resources */, 3072F99713A8081B00425683 /* Capture.bundle in Resources */, 1F766FE113BBADB100FB74C0 /* Localizable.strings in Resources */, 1F766FE213BBADB100FB74C0 /* Localizable.strings in Resources */, 302D95F214D2391D003F00A1 /* MainViewController.xib in Resources */, 30A0434814DC770100060A13 /* Localizable.strings in Resources */, 30A0434914DC770100060A13 /* Localizable.strings in Resources */, + 3088BBBD154F3926009F9C59 /* Default-Landscape@2x~ipad.png in Resources */, + 3088BBBE154F3926009F9C59 /* Default-Landscape~ipad.png in Resources */, + 3088BBBF154F3926009F9C59 /* Default-Portrait@2x~ipad.png in Resources */, + 3088BBC0154F3926009F9C59 /* Default-Portrait~ipad.png in Resources */, + 3088BBC1154F3926009F9C59 /* Default@2x~iphone.png in Resources */, + 3088BBC2154F3926009F9C59 /* Default~iphone.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; };