Skip to content

Commit

Permalink
Merge pull request soffes#82 from nicolasgomollon/master
Browse files Browse the repository at this point in the history 
Implements development/production specific bundle identifier and icons.
  • Loading branch information
@soffes
soffes committed Oct 12, 2012
2 parents 5bcf90b + 472ec6b commit 52212a3
Show file tree
Hide file tree
Showing 10 changed files with 59 additions and 9 deletions.
50 changes: 50 additions & 0 deletions Cheddar for iOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,14 @@
B2B25FE1161658AD00ACFD3E /* CDIKeyboardBar.m in Sources */ = {isa = PBXBuildFile; fileRef = B2B25FE0161658AD00ACFD3E /* CDIKeyboardBar.m */; };
B2B25FE416165B6D00ACFD3E /* CDIKeyboardButton.m in Sources */ = {isa = PBXBuildFile; fileRef = B2B25FE316165B6D00ACFD3E /* CDIKeyboardButton.m */; };
B2DD6131160B750D00392C15 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B2DD6130160B750D00392C15 /* Default-568h@2x.png */; };
DAA8ED5C161C7ABB0024C172 /* DevIcon-29.png in Resources */ = {isa = PBXBuildFile; fileRef = DAA8ED54161C7ABB0024C172 /* DevIcon-29.png */; };
DAA8ED5D161C7ABB0024C172 /* DevIcon-50.png in Resources */ = {isa = PBXBuildFile; fileRef = DAA8ED55161C7ABB0024C172 /* DevIcon-50.png */; };
DAA8ED5E161C7ABB0024C172 /* DevIcon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = DAA8ED56161C7ABB0024C172 /* DevIcon-57.png */; };
DAA8ED5F161C7ABB0024C172 /* DevIcon-58.png in Resources */ = {isa = PBXBuildFile; fileRef = DAA8ED57161C7ABB0024C172 /* DevIcon-58.png */; };
DAA8ED60161C7ABB0024C172 /* DevIcon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = DAA8ED58161C7ABB0024C172 /* DevIcon-72.png */; };
DAA8ED61161C7ABB0024C172 /* DevIcon-100.png in Resources */ = {isa = PBXBuildFile; fileRef = DAA8ED59161C7ABB0024C172 /* DevIcon-100.png */; };
DAA8ED62161C7ABB0024C172 /* DevIcon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = DAA8ED5A161C7ABB0024C172 /* DevIcon-114.png */; };
DAA8ED63161C7ABB0024C172 /* DevIcon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = DAA8ED5B161C7ABB0024C172 /* DevIcon-144.png */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -529,6 +537,14 @@
B2B25FE216165B6D00ACFD3E /* CDIKeyboardButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDIKeyboardButton.h; sourceTree = "<group>"; };
B2B25FE316165B6D00ACFD3E /* CDIKeyboardButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDIKeyboardButton.m; sourceTree = "<group>"; };
B2DD6130160B750D00392C15 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
DAA8ED54161C7ABB0024C172 /* DevIcon-29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DevIcon-29.png"; sourceTree = "<group>"; };
DAA8ED55161C7ABB0024C172 /* DevIcon-50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DevIcon-50.png"; sourceTree = "<group>"; };
DAA8ED56161C7ABB0024C172 /* DevIcon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DevIcon-57.png"; sourceTree = "<group>"; };
DAA8ED57161C7ABB0024C172 /* DevIcon-58.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DevIcon-58.png"; sourceTree = "<group>"; };
DAA8ED58161C7ABB0024C172 /* DevIcon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DevIcon-72.png"; sourceTree = "<group>"; };
DAA8ED59161C7ABB0024C172 /* DevIcon-100.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DevIcon-100.png"; sourceTree = "<group>"; };
DAA8ED5A161C7ABB0024C172 /* DevIcon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DevIcon-114.png"; sourceTree = "<group>"; };
DAA8ED5B161C7ABB0024C172 /* DevIcon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DevIcon-144.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -679,6 +695,14 @@
B208BBFE15BF63A80080705D /* disclosure-highlighted@2x.png */,
B208BBFF15BF63A80080705D /* disclosure.png */,
B208BC0015BF63A80080705D /* disclosure@2x.png */,
DAA8ED59161C7ABB0024C172 /* DevIcon-100.png */,
DAA8ED5A161C7ABB0024C172 /* DevIcon-114.png */,
DAA8ED5B161C7ABB0024C172 /* DevIcon-144.png */,
DAA8ED54161C7ABB0024C172 /* DevIcon-29.png */,
DAA8ED55161C7ABB0024C172 /* DevIcon-50.png */,
DAA8ED56161C7ABB0024C172 /* DevIcon-57.png */,
DAA8ED57161C7ABB0024C172 /* DevIcon-58.png */,
DAA8ED58161C7ABB0024C172 /* DevIcon-72.png */,
B208BC0115BF63A80080705D /* Icon-100.png */,
B208BC0215BF63A80080705D /* Icon-114.png */,
B208BC0315BF63A80080705D /* Icon-144.png */,
Expand Down Expand Up @@ -1314,6 +1338,14 @@
B2B25FDE161651F900ACFD3E /* About.html in Resources */,
B2746E7B1618EE4A007A750B /* move_task.png in Resources */,
B2746E7C1618EE4A007A750B /* move_task@2x.png in Resources */,
DAA8ED5C161C7ABB0024C172 /* DevIcon-29.png in Resources */,
DAA8ED5D161C7ABB0024C172 /* DevIcon-50.png in Resources */,
DAA8ED5E161C7ABB0024C172 /* DevIcon-57.png in Resources */,
DAA8ED5F161C7ABB0024C172 /* DevIcon-58.png in Resources */,
DAA8ED60161C7ABB0024C172 /* DevIcon-72.png in Resources */,
DAA8ED61161C7ABB0024C172 /* DevIcon-100.png in Resources */,
DAA8ED62161C7ABB0024C172 /* DevIcon-114.png in Resources */,
DAA8ED63161C7ABB0024C172 /* DevIcon-144.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1424,6 +1456,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
BUNDLE_ID = "com.nothingmagical.cheddar-ios.dev";
CLANG_ENABLE_OBJC_ARC = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COMBINE_HIDPI_IMAGES = YES;
Expand All @@ -1440,6 +1473,14 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ICON_100 = "DevIcon-100.png";
ICON_114 = "DevIcon-114.png";
ICON_144 = "DevIcon-144.png";
ICON_29 = "DevIcon-29.png";
ICON_50 = "DevIcon-50.png";
ICON_57 = "DevIcon-57.png";
ICON_58 = "DevIcon-58.png";
ICON_72 = "DevIcon-72.png";
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
SDKROOT = iphoneos;
};
Expand All @@ -1450,6 +1491,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
BUNDLE_ID = "com.nothingmagical.cheddar-ios";
CLANG_ENABLE_OBJC_ARC = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COMBINE_HIDPI_IMAGES = YES;
Expand All @@ -1459,6 +1501,14 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ICON_100 = "Icon-100.png";
ICON_114 = "Icon-114.png";
ICON_144 = "Icon-144.png";
ICON_29 = "Icon-29.png";
ICON_50 = "Icon-50.png";
ICON_57 = "Icon-57.png";
ICON_58 = "Icon-58.png";
ICON_72 = "Icon-72.png";
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
SDKROOT = iphoneos;
Expand Down
18 changes: 9 additions & 9 deletions Resources/Cheddar-Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>Icon-29.png</string>
<string>Icon-50.png</string>
<string>Icon-57.png</string>
<string>Icon-58.png</string>
<string>Icon-72.png</string>
<string>Icon-100.png</string>
<string>Icon-114.png</string>
<string>Icon-144.png</string>
<string>${ICON_29}</string>
<string>${ICON_50}</string>
<string>${ICON_57}</string>
<string>${ICON_58}</string>
<string>${ICON_72}</string>
<string>${ICON_100}</string>
<string>${ICON_114}</string>
<string>${ICON_144}</string>
</array>
<key>UIPrerenderedIcon</key>
<true/>
</dict>
</dict>
<key>CFBundleIdentifier</key>
<string>com.nothingmagical.cheddar-ios</string>
<string>${BUNDLE_ID}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down
Binary file added Resources/Images/DevIcon-100.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Images/DevIcon-114.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Images/DevIcon-144.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Images/DevIcon-29.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Images/DevIcon-50.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Images/DevIcon-57.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Images/DevIcon-58.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Images/DevIcon-72.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 52212a3

Please sign in to comment.