Skip to content

Commit 84525ee

Browse files
author
Mike Richter
committed
Merged PR 3875: Merge mrichter/migrate-to-xcode9.2-as-build-platform to master
Related work items: #18463
2 parents 56562d2 + b18f274 commit 84525ee

7 files changed

Lines changed: 62 additions & 73 deletions

File tree

‎.gitignore‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
xcuserdata
22
*.xcarchive/
3-
.idea
4-
build
5-
6-
#ignore cocoapod files
7-
Pods
8-
ppios-rename.xcworkspace/
3+
/.idea/
4+
/build/
5+
/Pods/
6+
/ppios-rename.xcworkspace/
97
DerivedData
8+
/*._*/
9+
/v*.*.*/

‎Makefile‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ NUMERIC_VERSION=1.4.0
66
VERSION=v$(NUMERIC_VERSION)
77
PROGRAM_NAME=ppios-rename
88

9+
TARGET=Release
10+
#TARGET=Debug
911
BUILD_DIR=build
10-
PROGRAM="$(shell pwd)/$(BUILD_DIR)/Build/Products/Release/$(PROGRAM_NAME)"
12+
PROGRAM="$(shell pwd)/$(BUILD_DIR)/Build/Products/$(TARGET)/$(PROGRAM_NAME)"
1113
README="$(shell pwd)/README.md"
1214
GIT_CMD=git rev-parse --short HEAD
1315
GIT_HASH_CHECK=$(GIT_CMD) &> /dev/null
@@ -23,10 +25,8 @@ WORKSPACE=ppios-rename.xcworkspace
2325
XCODEBUILD_OPTIONS=\
2426
-workspace $(WORKSPACE) \
2527
-scheme ppios-rename \
26-
-configuration Release \
27-
-derivedDataPath $(BUILD_DIR) \
28-
-reporter plain \
29-
-reporter junit:$(BUILD_DIR)/unit-test-report.xml
28+
-configuration $(TARGET) \
29+
-derivedDataPath $(BUILD_DIR)
3030

3131
.PHONY: default
3232
default: all
@@ -42,19 +42,25 @@ $(WORKSPACE) Pods Podfile.lock: Podfile
4242
pod install
4343

4444
.PHONY: program
45-
program: Pods
46-
# Merged the separate build and test steps: xcodebuild was rebuilding the product for 'test'. It
47-
# appears that Xcode 8 provides test-without-building option for xcodebuild, and once we move to
48-
# that version we should be able to separate these two parts again.
49-
xctool $(XCODEBUILD_OPTIONS) CLASS_DUMP_VERSION=$(NUMERIC_VERSION)$(GIT_HASH) build test
45+
program: Pods clean build
46+
47+
# "test" appears to mean "build for testing and test", so the unit tests. Do that first, then make the real thing.
48+
.PHONY: unittest
49+
unittest: Pods
50+
xcodebuild $(XCODEBUILD_OPTIONS) CLASS_DUMP_VERSION=$(NUMERIC_VERSION)$(GIT_HASH) test \
51+
| tee xcodebuild-$@.log | xcpretty ; exit "$${PIPESTATUS[0]}"
52+
53+
.PHONY: build
54+
build:
55+
xcodebuild $(XCODEBUILD_OPTIONS) CLASS_DUMP_VERSION=$(NUMERIC_VERSION)$(GIT_HASH) clean build \
56+
| tee xcodebuild-$@.log | xcpretty ; exit "$${PIPESTATUS[0]}"
5057

5158
.PHONY: check
5259
check:
5360
( cd test/tests ; PPIOS_RENAME=$(PROGRAM) README=$(README) NUMERIC_VERSION=$(NUMERIC_VERSION) ./test-suite.sh )
5461

5562
.PHONY: archive
56-
archive: package-check distclean archive-dir program check $(DIST_PACKAGE)
57-
cp -r $(PROGRAM).dSYM $(ARCHIVE_DIR)/
63+
archive: package-check distclean unittest program check archive-dir $(DIST_PACKAGE) copy-symbols
5864

5965
.PHONY: package-check
6066
package-check:
@@ -65,7 +71,7 @@ package-check:
6571
archive-dir:
6672
mkdir -p $(ARCHIVE_DIR)
6773

68-
$(DIST_PACKAGE): program
74+
$(DIST_PACKAGE):
6975
mkdir -p $(DIST_DIR)
7076
cp $(PROGRAM) \
7177
README.md \
@@ -75,10 +81,14 @@ $(DIST_PACKAGE): program
7581
$(DIST_DIR)
7682
tar -cvpzf $@ --options gzip:compression-level=9 $(DIST_DIR)
7783

84+
.PHONY: copy-symbols
85+
copy-symbols:
86+
cp -r $(PROGRAM).dSYM $(ARCHIVE_DIR)/
87+
7888
.PHONY: clean
7989
clean:
8090
$(RM) -r $(BUILD_DIR)
8191

8292
.PHONY: distclean
8393
distclean: clean
84-
$(RM) -r Pods $(DIST_DIR)* $(VERSION)*
94+
$(RM) -r Pods $(DIST_DIR)* v?.?.?-*

‎Podfile.lock‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@ PODS:
44
DEPENDENCIES:
55
- Kiwi
66

7+
SPEC REPOS:
8+
https://github.com/CocoaPods/Old-Specs:
9+
- Kiwi
10+
711
SPEC CHECKSUMS:
812
Kiwi: 4c3988bd551f80f6ca0009f302f7c1a2e3777bf2
913

10-
COCOAPODS: 0.39.0
14+
PODFILE CHECKSUM: c3c2eb4605f372c09bc80aa574760a0658292232
15+
16+
COCOAPODS: 1.5.3

‎ppios-rename.xcodeproj/project.pbxproj‎

Lines changed: 19 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
0165B8B91827137D00CC647F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0165B8B71827137D00CC647F /* InfoPlist.strings */; };
7070
0165B8C31827182000CC647F /* TestCDNameForCPUType.m in Sources */ = {isa = PBXBuildFile; fileRef = 011E484E1604DF3700722F8D /* TestCDNameForCPUType.m */; };
7171
0165B8C41827184700CC647F /* libMachObjC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 013D1F1113A5AE5A00BF0A67 /* libMachObjC.a */; };
72-
0165B8C51827186600CC647F /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 013D1F0B13A5ADC300BF0A67 /* libcrypto.dylib */; };
7372
0165B8D81827198900CC647F /* TestBlockSignature.m in Sources */ = {isa = PBXBuildFile; fileRef = 0165B8C71827198900CC647F /* TestBlockSignature.m */; };
7473
0165B8D91827198900CC647F /* TestCDArchFromName.m in Sources */ = {isa = PBXBuildFile; fileRef = 0165B8C91827198900CC647F /* TestCDArchFromName.m */; };
7574
0165B8DA1827198900CC647F /* TestCDArchUses64BitABI.m in Sources */ = {isa = PBXBuildFile; fileRef = 0165B8CB1827198900CC647F /* TestCDArchUses64BitABI.m */; };
@@ -109,7 +108,6 @@
109108
38653BDE31667E0577C95CA8 /* podsProject.json in Resources */ = {isa = PBXBuildFile; fileRef = 38653FE32A2E2A4644B0556E /* podsProject.json */; };
110109
38653C893116E1C93360D3EE /* CDXibStoryboardParserSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 38653357CEF55B23B6235855 /* CDXibStoryboardParserSpec.m */; };
111110
38653CCEE0A8426D8A432A2B /* CDSymbolsGeneratorVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 386531EACC711C0310583BE8 /* CDSymbolsGeneratorVisitor.h */; };
112-
479E9A3A1EE542E3BD725B35 /* libPods-UnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CA6B93F373B4E5BA48C4048 /* libPods-UnitTests.a */; };
113111
670B79781970082F0069F751 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 670B7971197007120069F751 /* libxml2.dylib */; };
114112
6772E06D197FF624004CF475 /* GDataXMLNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 6772E06B197FF624004CF475 /* GDataXMLNode.h */; };
115113
6772E06E197FF624004CF475 /* GDataXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 6772E06C197FF624004CF475 /* GDataXMLNode.m */; };
@@ -123,6 +121,7 @@
123121
67AC2950196D417E00641C23 /* CDStructureTable.m in Sources */ = {isa = PBXBuildFile; fileRef = 01EB830613A591D8003EDE60 /* CDStructureTable.m */; };
124122
67AC2951196D417E00641C23 /* CDTypeController.m in Sources */ = {isa = PBXBuildFile; fileRef = 01EB831313A591D8003EDE60 /* CDTypeController.m */; };
125123
67AC2952196D417E00641C23 /* CDStructureInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 01EB830413A591D8003EDE60 /* CDStructureInfo.m */; };
124+
90898D50EFD0643C35AE55B2 /* libPods-UnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 74B72F12A70AB49CEC156287 /* libPods-UnitTests.a */; };
126125
95E3D8951C88D1C700CF28E2 /* CDXibStoryBoardProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 95E3D8931C88D1C700CF28E2 /* CDXibStoryBoardProcessor.h */; };
127126
95E3D8961C88D1C700CF28E2 /* CDXibStoryBoardProcessor.m in Sources */ = {isa = PBXBuildFile; fileRef = 95E3D8941C88D1C700CF28E2 /* CDXibStoryBoardProcessor.m */; };
128127
95E3D8991C88D1EC00CF28E2 /* CDXMLParserSharedBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 95E3D8971C88D1EC00CF28E2 /* CDXMLParserSharedBase.h */; };
@@ -339,7 +338,6 @@
339338
01EB832013A591D8003EDE60 /* CDVisitorPropertyState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDVisitorPropertyState.m; path = Source/CDVisitorPropertyState.m; sourceTree = SOURCE_ROOT; };
340339
0D288C0E187BC2EE0026E2A0 /* CDOCClassReference.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDOCClassReference.h; path = Source/CDOCClassReference.h; sourceTree = "<group>"; };
341340
0D288C0F187BC2EE0026E2A0 /* CDOCClassReference.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDOCClassReference.m; path = Source/CDOCClassReference.m; sourceTree = "<group>"; };
342-
275C76045F17A6FF359588A2 /* Pods-UnitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-UnitTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-UnitTests/Pods-UnitTests.debug.xcconfig"; sourceTree = "<group>"; };
343341
364BE229A5DADB99665B1C74 /* CDSystemProtocolsProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDSystemProtocolsProcessor.h; sourceTree = "<group>"; };
344342
364BE69D036E4702894D53AD /* CDSystemProtocolsProcessor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDSystemProtocolsProcessor.m; sourceTree = "<group>"; };
345343
364BE69F3A3ADC92AFDA50DA /* CDSystemProtocolsProcessorSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDSystemProtocolsProcessorSpec.m; sourceTree = "<group>"; };
@@ -357,12 +355,12 @@
357355
38653E065CFA1710C3829B18 /* CDSymbolsGeneratorVisitor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDSymbolsGeneratorVisitor.m; path = Source/CDSymbolsGeneratorVisitor.m; sourceTree = "<group>"; };
358356
38653E984667C6F15F7B56E0 /* Main_iPhone_storyboard.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Main_iPhone_storyboard.txt; sourceTree = "<group>"; };
359357
38653FE32A2E2A4644B0556E /* podsProject.json */ = {isa = PBXFileReference; lastKnownFileType = file.json; path = podsProject.json; sourceTree = "<group>"; };
360-
47079D53C4324C4DBF8A64DC /* libPods-MachObjC.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MachObjC.a"; sourceTree = BUILT_PRODUCTS_DIR; };
361-
4CA6B93F373B4E5BA48C4048 /* libPods-UnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-UnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
362358
670B7971197007120069F751 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
363359
670B7974197007D80069F751 /* libxml2.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.2.dylib; path = usr/lib/libxml2.2.dylib; sourceTree = SDKROOT; };
364360
6772E06B197FF624004CF475 /* GDataXMLNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GDataXMLNode.h; sourceTree = "<group>"; };
365361
6772E06C197FF624004CF475 /* GDataXMLNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GDataXMLNode.m; sourceTree = "<group>"; };
362+
74B72F12A70AB49CEC156287 /* libPods-UnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-UnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
363+
79B9A95345E010B78E9F7139 /* Pods-UnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-UnitTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-UnitTests/Pods-UnitTests.release.xcconfig"; sourceTree = "<group>"; };
366364
95E3D8931C88D1C700CF28E2 /* CDXibStoryBoardProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDXibStoryBoardProcessor.h; path = Source/CDXibStoryBoardProcessor.h; sourceTree = "<group>"; };
367365
95E3D8941C88D1C700CF28E2 /* CDXibStoryBoardProcessor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDXibStoryBoardProcessor.m; path = Source/CDXibStoryBoardProcessor.m; sourceTree = "<group>"; };
368366
95E3D8971C88D1EC00CF28E2 /* CDXMLParserSharedBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDXMLParserSharedBase.h; path = Source/CDXMLParserSharedBase.h; sourceTree = "<group>"; };
@@ -377,7 +375,7 @@
377375
95E3D8AD1C89F37800CF28E2 /* class-dump.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "class-dump.m"; path = "Source/class-dump.m"; sourceTree = "<group>"; };
378376
C270B5C516C54AD5006CA75D /* ULEB128.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ULEB128.m; path = Source/ULEB128.m; sourceTree = "<group>"; };
379377
C270B5C716C54B0A006CA75D /* ULEB128.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ULEB128.h; path = Source/ULEB128.h; sourceTree = "<group>"; };
380-
DACA24D28C039348398BB958 /* Pods-UnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-UnitTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-UnitTests/Pods-UnitTests.release.xcconfig"; sourceTree = "<group>"; };
378+
F7D447FFEF466980B4EED9EE /* Pods-UnitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-UnitTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-UnitTests/Pods-UnitTests.debug.xcconfig"; sourceTree = "<group>"; };
381379
/* End PBXFileReference section */
382380

383381
/* Begin PBXFrameworksBuildPhase section */
@@ -394,10 +392,9 @@
394392
buildActionMask = 2147483647;
395393
files = (
396394
670B79781970082F0069F751 /* libxml2.dylib in Frameworks */,
397-
0165B8C51827186600CC647F /* libcrypto.dylib in Frameworks */,
398395
0165B8C41827184700CC647F /* libMachObjC.a in Frameworks */,
399396
0165B8B31827137D00CC647F /* XCTest.framework in Frameworks */,
400-
479E9A3A1EE542E3BD725B35 /* libPods-UnitTests.a in Frameworks */,
397+
90898D50EFD0643C35AE55B2 /* libPods-UnitTests.a in Frameworks */,
401398
);
402399
runOnlyForDeploymentPostprocessing = 0;
403400
};
@@ -529,7 +526,7 @@
529526
38653105C3AD1ECFFF532A50 /* ppios-rename Spec */,
530527
38653F0A1888F8B2CC4309CE /* Symbol mapping */,
531528
364BE06F241D1A1CA1EA4917 /* System Protocols Dumping */,
532-
CCD5A5BACBC317C94D8CFF5B /* Pods */,
529+
EB20856B1CAFC4E2CAF0CA43 /* Pods */,
533530
);
534531
sourceTree = "<group>";
535532
};
@@ -554,8 +551,7 @@
554551
011E48411604DF3700722F8D /* Cocoa.framework */,
555552
0165B8B21827137D00CC647F /* XCTest.framework */,
556553
011E48431604DF3700722F8D /* Other Frameworks */,
557-
4CA6B93F373B4E5BA48C4048 /* libPods-UnitTests.a */,
558-
47079D53C4324C4DBF8A64DC /* libPods-MachObjC.a */,
554+
74B72F12A70AB49CEC156287 /* libPods-UnitTests.a */,
559555
);
560556
name = Frameworks;
561557
sourceTree = "<group>";
@@ -835,11 +831,11 @@
835831
path = lib;
836832
sourceTree = "<group>";
837833
};
838-
CCD5A5BACBC317C94D8CFF5B /* Pods */ = {
834+
EB20856B1CAFC4E2CAF0CA43 /* Pods */ = {
839835
isa = PBXGroup;
840836
children = (
841-
275C76045F17A6FF359588A2 /* Pods-UnitTests.debug.xcconfig */,
842-
DACA24D28C039348398BB958 /* Pods-UnitTests.release.xcconfig */,
837+
F7D447FFEF466980B4EED9EE /* Pods-UnitTests.debug.xcconfig */,
838+
79B9A95345E010B78E9F7139 /* Pods-UnitTests.release.xcconfig */,
843839
);
844840
name = Pods;
845841
sourceTree = "<group>";
@@ -895,12 +891,10 @@
895891
isa = PBXNativeTarget;
896892
buildConfigurationList = 0165B8BF1827137D00CC647F /* Build configuration list for PBXNativeTarget "UnitTests" */;
897893
buildPhases = (
898-
A7AD302A8E94457D9ACA9DAC /* Check Pods Manifest.lock */,
894+
A4B98A24747EF8FD681A6EF6 /* [CP] Check Pods Manifest.lock */,
899895
0165B8AD1827137D00CC647F /* Sources */,
900896
0165B8AE1827137D00CC647F /* Frameworks */,
901897
0165B8AF1827137D00CC647F /* Resources */,
902-
F8F3264D6B894A819E8D8197 /* Copy Pods Resources */,
903-
4D9C7415B5BA541B26400EDC /* Embed Pods Frameworks */,
904898
);
905899
buildRules = (
906900
);
@@ -977,49 +971,22 @@
977971
/* End PBXResourcesBuildPhase section */
978972

979973
/* Begin PBXShellScriptBuildPhase section */
980-
4D9C7415B5BA541B26400EDC /* Embed Pods Frameworks */ = {
974+
A4B98A24747EF8FD681A6EF6 /* [CP] Check Pods Manifest.lock */ = {
981975
isa = PBXShellScriptBuildPhase;
982976
buildActionMask = 2147483647;
983977
files = (
984978
);
985979
inputPaths = (
980+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
981+
"${PODS_ROOT}/Manifest.lock",
986982
);
987-
name = "Embed Pods Frameworks";
983+
name = "[CP] Check Pods Manifest.lock";
988984
outputPaths = (
985+
"$(DERIVED_FILE_DIR)/Pods-UnitTests-checkManifestLockResult.txt",
989986
);
990987
runOnlyForDeploymentPostprocessing = 0;
991988
shellPath = /bin/sh;
992-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-UnitTests/Pods-UnitTests-frameworks.sh\"\n";
993-
showEnvVarsInLog = 0;
994-
};
995-
A7AD302A8E94457D9ACA9DAC /* Check Pods Manifest.lock */ = {
996-
isa = PBXShellScriptBuildPhase;
997-
buildActionMask = 2147483647;
998-
files = (
999-
);
1000-
inputPaths = (
1001-
);
1002-
name = "Check Pods Manifest.lock";
1003-
outputPaths = (
1004-
);
1005-
runOnlyForDeploymentPostprocessing = 0;
1006-
shellPath = /bin/sh;
1007-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
1008-
showEnvVarsInLog = 0;
1009-
};
1010-
F8F3264D6B894A819E8D8197 /* Copy Pods Resources */ = {
1011-
isa = PBXShellScriptBuildPhase;
1012-
buildActionMask = 2147483647;
1013-
files = (
1014-
);
1015-
inputPaths = (
1016-
);
1017-
name = "Copy Pods Resources";
1018-
outputPaths = (
1019-
);
1020-
runOnlyForDeploymentPostprocessing = 0;
1021-
shellPath = /bin/sh;
1022-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-UnitTests/Pods-UnitTests-resources.sh\"\n";
989+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
1023990
showEnvVarsInLog = 0;
1024991
};
1025992
/* End PBXShellScriptBuildPhase section */
@@ -1204,7 +1171,7 @@
12041171
};
12051172
0165B8C01827137D00CC647F /* Debug */ = {
12061173
isa = XCBuildConfiguration;
1207-
baseConfigurationReference = 275C76045F17A6FF359588A2 /* Pods-UnitTests.debug.xcconfig */;
1174+
baseConfigurationReference = F7D447FFEF466980B4EED9EE /* Pods-UnitTests.debug.xcconfig */;
12081175
buildSettings = {
12091176
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
12101177
CLANG_CXX_LIBRARY = "libc++";
@@ -1241,7 +1208,7 @@
12411208
};
12421209
0165B8C11827137D00CC647F /* Release */ = {
12431210
isa = XCBuildConfiguration;
1244-
baseConfigurationReference = DACA24D28C039348398BB958 /* Pods-UnitTests.release.xcconfig */;
1211+
baseConfigurationReference = 79B9A95345E010B78E9F7139 /* Pods-UnitTests.release.xcconfig */;
12451212
buildSettings = {
12461213
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
12471214
CLANG_CXX_LIBRARY = "libc++";

‎ppios-rename.xcodeproj/xcshareddata/xcschemes/ppios-rename.xcscheme‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "1"
5961
useCustomWorkingDirectory = "NO"
6062
customWorkingDirectory = "/Users/ayufan/"

‎test/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/results/

‎test/apps/BoxSim/BoxSim.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@
214214
TargetAttributes = {
215215
D0CFE6651CBD6F4E00E18918 = {
216216
CreatedOnToolsVersion = 7.2;
217+
DevelopmentTeam = 7RYWC3D7HS;
217218
};
218219
D0CFE6811CBD6F4E00E18918 = {
219220
CreatedOnToolsVersion = 7.2;
@@ -426,6 +427,7 @@
426427
buildSettings = {
427428
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
428429
CODE_SIGN_IDENTITY = "iPhone Developer";
430+
DEVELOPMENT_TEAM = 7RYWC3D7HS;
429431
INFOPLIST_FILE = BoxSim/Info.plist;
430432
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
431433
PRODUCT_BUNDLE_IDENTIFIER = com.preemptive.ppios.test.BoxSim;
@@ -438,6 +440,7 @@
438440
buildSettings = {
439441
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
440442
CODE_SIGN_IDENTITY = "iPhone Developer";
443+
DEVELOPMENT_TEAM = 7RYWC3D7HS;
441444
INFOPLIST_FILE = BoxSim/Info.plist;
442445
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
443446
PRODUCT_BUNDLE_IDENTIFIER = com.preemptive.ppios.test.BoxSim;

0 commit comments

Comments
 (0)