Skip to content

Commit 276aa63

Browse files
BirkemoseBirkemose
committed
Updates for Xcode 7.1
1 parent 3a0754d commit 276aa63

File tree

17 files changed

+80
-254
lines changed

17 files changed

+80
-254
lines changed

‎UnitTests/UnitTests-Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>${EXECUTABLE_NAME}</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.cocos2d-iphone.${PRODUCT_NAME:rfc1034identifier}</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundlePackageType</key>

‎cocos2d-tests.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
758A6C7B18440D5C00D1A8D2 /* ParticleTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 758A6C7A18440D5C00D1A8D2 /* ParticleTest.m */; };
2626
758A6C80184410EE00D1A8D2 /* Particles in Resources */ = {isa = PBXBuildFile; fileRef = 758A6C7F184410EE00D1A8D2 /* Particles */; };
2727
75F76497185A831B00E2FAFE /* Sounds in Resources */ = {isa = PBXBuildFile; fileRef = 75F76496185A831B00E2FAFE /* Sounds */; };
28-
839B149F19CC1E440000E5E2 /* CCPackageTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 839B149E19CC1E440000E5E2 /* CCPackageTest.m */; };
2928
92324E2A18EB635500D78D3F /* CCReaderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 92324E2918EB635500D78D3F /* CCReaderTest.m */; };
3029
9269312A1923D8A700CE6285 /* Resources-shared in Resources */ = {isa = PBXBuildFile; fileRef = B7C6237517EA695100928F91 /* Resources-shared */; };
3130
92FE241118F5F06F00647961 /* CCAnimationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 92FE241018F5F06F00647961 /* CCAnimationTest.m */; };
@@ -336,7 +335,6 @@
336335
758A6C7A18440D5C00D1A8D2 /* ParticleTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ParticleTest.m; path = "cocos2d-ui-tests/tests/ParticleTest.m"; sourceTree = SOURCE_ROOT; };
337336
758A6C7F184410EE00D1A8D2 /* Particles */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Particles; path = Resources/Particles; sourceTree = SOURCE_ROOT; };
338337
75F76496185A831B00E2FAFE /* Sounds */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Sounds; path = Resources/Sounds; sourceTree = SOURCE_ROOT; };
339-
839B149E19CC1E440000E5E2 /* CCPackageTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCPackageTest.m; path = "cocos2d-ui-tests/tests/CCPackageTest.m"; sourceTree = SOURCE_ROOT; };
340338
92324E2918EB635500D78D3F /* CCReaderTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCReaderTest.m; sourceTree = "<group>"; };
341339
92FE241018F5F06F00647961 /* CCAnimationTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCAnimationTest.m; sourceTree = "<group>"; };
342340
9D96557219D6113500428E79 /* CCEffectTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectTests.m; sourceTree = "<group>"; };
@@ -611,7 +609,6 @@
611609
D3B2A7E4187DD60B00406C5A /* CCBMFontTest.m */,
612610
A6167B92189A7D4D0044D391 /* VertexZTest.m */,
613611
A664A4EE18A3D9B8006184B8 /* PositioningTest.m */,
614-
839B149E19CC1E440000E5E2 /* CCPackageTest.m */,
615612
);
616613
name = Tests;
617614
path = "cocos2d-ui-tests/tests";
@@ -940,7 +937,7 @@
940937
B7E2604017E7D278007067F0 /* Project object */ = {
941938
isa = PBXProject;
942939
attributes = {
943-
LastUpgradeCheck = 0630;
940+
LastUpgradeCheck = 0710;
944941
ORGANIZATIONNAME = Cocos2d;
945942
TargetAttributes = {
946943
75556A01185636F100ED1B0F = {
@@ -1259,7 +1256,6 @@
12591256
7587BDB3185A0A6900EEEFDE /* TextureTest.m in Sources */,
12601257
D3C9C867188078B900C58900 /* CCSchedulerTest.m in Sources */,
12611258
7587BDB7185A64AD00EEEFDE /* ColorTest.m in Sources */,
1262-
839B149F19CC1E440000E5E2 /* CCPackageTest.m in Sources */,
12631259
D340E10F185660BE006E605C /* TilemapTest.m in Sources */,
12641260
B7E2622117E7D3B2007067F0 /* MainMenu.m in Sources */,
12651261
D3D6CF5F18BD5F0500A51531 /* CCRendererTest.m in Sources */,
@@ -1402,6 +1398,7 @@
14021398
INFOPLIST_FILE = "UnitTests/UnitTests-Info.plist";
14031399
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
14041400
ONLY_ACTIVE_ARCH = YES;
1401+
PRODUCT_BUNDLE_IDENTIFIER = "com.cocos2d-iphone.${PRODUCT_NAME:rfc1034identifier}";
14051402
PRODUCT_NAME = "$(TARGET_NAME)";
14061403
TEST_HOST = "$(BUNDLE_LOADER)";
14071404
WRAPPER_EXTENSION = xctest;
@@ -1450,6 +1447,7 @@
14501447
);
14511448
INFOPLIST_FILE = "UnitTests/UnitTests-Info.plist";
14521449
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
1450+
PRODUCT_BUNDLE_IDENTIFIER = "com.cocos2d-iphone.${PRODUCT_NAME:rfc1034identifier}";
14531451
PRODUCT_NAME = "$(TARGET_NAME)";
14541452
TEST_HOST = "$(BUNDLE_LOADER)";
14551453
VALIDATE_PRODUCT = YES;
@@ -1469,6 +1467,7 @@
14691467
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
14701468
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
14711469
ENABLE_STRICT_OBJC_MSGSEND = YES;
1470+
ENABLE_TESTABILITY = YES;
14721471
GCC_C_LANGUAGE_STANDARD = gnu99;
14731472
GCC_NO_COMMON_BLOCKS = YES;
14741473
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1568,6 +1567,7 @@
15681567
"-weak_framework",
15691568
Metal,
15701569
);
1570+
PRODUCT_BUNDLE_IDENTIFIER = org2.cocos2d.Tests;
15711571
PRODUCT_NAME = "cocos2d-tests-ios";
15721572
PROVISIONING_PROFILE = "";
15731573
WRAPPER_EXTENSION = app;
@@ -1600,6 +1600,7 @@
16001600
"-weak_framework",
16011601
Metal,
16021602
);
1603+
PRODUCT_BUNDLE_IDENTIFIER = org2.cocos2d.Tests;
16031604
PRODUCT_NAME = "cocos2d-tests-ios";
16041605
PROVISIONING_PROFILE = "";
16051606
VALIDATE_PRODUCT = YES;
@@ -1637,6 +1638,7 @@
16371638
"-weak_framework",
16381639
Metal,
16391640
);
1641+
PRODUCT_BUNDLE_IDENTIFIER = "com.yourcompany.${PRODUCT_NAME:rfc1034identifier}";
16401642
PRODUCT_NAME = "cocos2d-tests-mac";
16411643
SDKROOT = macosx;
16421644
WRAPPER_EXTENSION = app;
@@ -1671,6 +1673,7 @@
16711673
"-weak_framework",
16721674
Metal,
16731675
);
1676+
PRODUCT_BUNDLE_IDENTIFIER = "com.yourcompany.${PRODUCT_NAME:rfc1034identifier}";
16741677
PRODUCT_NAME = "cocos2d-tests-mac";
16751678
SDKROOT = macosx;
16761679
VALIDATE_PRODUCT = YES;

‎cocos2d-tests.xcodeproj/xcuserdata/Birkemose.xcuserdatad/xcschemes/cocos2d-tests-ios.xcscheme‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0630"
3+
LastUpgradeVersion = "0710"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
3737
</BuildActionEntries>
3838
</BuildAction>
3939
<TestAction
40+
buildConfiguration = "Debug"
4041
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4142
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42-
shouldUseLaunchSchemeArgsEnv = "YES"
43-
buildConfiguration = "Debug">
43+
shouldUseLaunchSchemeArgsEnv = "YES">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">
@@ -62,15 +62,18 @@
6262
ReferencedContainer = "container:cocos2d-tests.xcodeproj">
6363
</BuildableReference>
6464
</MacroExpansion>
65+
<AdditionalOptions>
66+
</AdditionalOptions>
6567
</TestAction>
6668
<LaunchAction
69+
buildConfiguration = "Debug"
6770
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6871
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
6972
launchStyle = "0"
7073
useCustomWorkingDirectory = "NO"
71-
buildConfiguration = "Debug"
7274
ignoresPersistentStateOnLaunch = "NO"
7375
debugDocumentVersioning = "YES"
76+
debugServiceExtension = "internal"
7477
allowLocationSimulation = "YES">
7578
<BuildableProductRunnable
7679
runnableDebuggingMode = "0">
@@ -86,10 +89,10 @@
8689
</AdditionalOptions>
8790
</LaunchAction>
8891
<ProfileAction
92+
buildConfiguration = "Release"
8993
shouldUseLaunchSchemeArgsEnv = "YES"
9094
savedToolIdentifier = ""
9195
useCustomWorkingDirectory = "NO"
92-
buildConfiguration = "Release"
9396
debugDocumentVersioning = "YES">
9497
<BuildableProductRunnable
9598
runnableDebuggingMode = "0">

‎cocos2d-tests.xcodeproj/xcuserdata/Birkemose.xcuserdatad/xcschemes/cocos2d-tests-mac.xcscheme‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0630"
3+
LastUpgradeVersion = "0710"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
</Testables>
3232
<MacroExpansion>
@@ -38,15 +38,18 @@
3838
ReferencedContainer = "container:cocos2d-tests.xcodeproj">
3939
</BuildableReference>
4040
</MacroExpansion>
41+
<AdditionalOptions>
42+
</AdditionalOptions>
4143
</TestAction>
4244
<LaunchAction
45+
buildConfiguration = "Debug"
4346
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4447
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4548
launchStyle = "0"
4649
useCustomWorkingDirectory = "NO"
47-
buildConfiguration = "Debug"
4850
ignoresPersistentStateOnLaunch = "NO"
4951
debugDocumentVersioning = "YES"
52+
debugServiceExtension = "internal"
5053
allowLocationSimulation = "YES">
5154
<BuildableProductRunnable
5255
runnableDebuggingMode = "0">
@@ -62,10 +65,10 @@
6265
</AdditionalOptions>
6366
</LaunchAction>
6467
<ProfileAction
68+
buildConfiguration = "Release"
6569
shouldUseLaunchSchemeArgsEnv = "YES"
6670
savedToolIdentifier = ""
6771
useCustomWorkingDirectory = "NO"
68-
buildConfiguration = "Release"
6972
debugDocumentVersioning = "YES">
7073
<BuildableProductRunnable
7174
runnableDebuggingMode = "0">

‎cocos2d-ui-tests/ios/Resources/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<string>Icon-Small@2x.png</string>
2121
</array>
2222
<key>CFBundleIdentifier</key>
23-
<string>org2.cocos2d.Tests</string>
23+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
2424
<key>CFBundleInfoDictionaryVersion</key>
2525
<string>6.0</string>
2626
<key>CFBundleName</key>

‎cocos2d-ui-tests/osx/Resources/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleIconFile</key>
1010
<string>icon</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

0 commit comments

Comments
 (0)