Skip to content

Commit 1675ce3

Browse files
author
Mike Ferris
committed
Merge pull request #25 from keith/ks/swiftpm
Move source files to support swift package manager
2 parents a66d0ee + 43887d0 commit 1675ce3

File tree

10 files changed

+44
-32
lines changed

10 files changed

+44
-32
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.DS_Store
2-
xcuserdata
2+
xcuserdata
3+
.build/

‎Package.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import PackageDescription
2+
3+
let package = Package(name: "XCTest")

‎XCTest/Info.plist renamed to ‎Sources/XCTest/Info.plist

File renamed without changes.

‎XCTest/XCTAssert.swift renamed to ‎Sources/XCTest/XCTAssert.swift

File renamed without changes.

‎XCTest/XCTestCase.swift renamed to ‎Sources/XCTest/XCTestCase.swift

File renamed without changes.

‎XCTest/XCTestCaseProvider.swift renamed to ‎Sources/XCTest/XCTestCaseProvider.swift

File renamed without changes.

‎XCTest/XCTestMain.swift renamed to ‎Sources/XCTest/XCTestMain.swift

File renamed without changes.

‎XCTest/XCTimeUtilities.swift renamed to ‎Sources/XCTest/XCTimeUtilities.swift

File renamed without changes.

‎XCTest.xcodeproj/project.pbxproj

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
B108C2A71C20C15500F9F301 /* XCTimeUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = B108C2A61C20C15500F9F301 /* XCTimeUtilities.swift */; };
11-
B11FFA2A1C1603B6004297C2 /* XCTAssert.swift in Sources */ = {isa = PBXBuildFile; fileRef = B11FFA291C1603B6004297C2 /* XCTAssert.swift */; };
12-
B11FFA2C1C160434004297C2 /* XCTestCaseProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = B11FFA2B1C160434004297C2 /* XCTestCaseProvider.swift */; };
13-
B11FFA2E1C16053C004297C2 /* XCTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = B11FFA2D1C16053C004297C2 /* XCTestCase.swift */; };
14-
EA6E86BB1BDEA7DE007C0323 /* XCTestMain.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA6E86BA1BDEA7DE007C0323 /* XCTestMain.swift */; };
10+
C265F66F1C3AEB6A00520CF9 /* XCTAssert.swift in Sources */ = {isa = PBXBuildFile; fileRef = C265F6691C3AEB6A00520CF9 /* XCTAssert.swift */; };
11+
C265F6701C3AEB6A00520CF9 /* XCTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C265F66A1C3AEB6A00520CF9 /* XCTestCase.swift */; };
12+
C265F6711C3AEB6A00520CF9 /* XCTestCaseProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = C265F66B1C3AEB6A00520CF9 /* XCTestCaseProvider.swift */; };
13+
C265F6721C3AEB6A00520CF9 /* XCTestMain.swift in Sources */ = {isa = PBXBuildFile; fileRef = C265F66C1C3AEB6A00520CF9 /* XCTestMain.swift */; };
14+
C265F6731C3AEB6A00520CF9 /* XCTimeUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = C265F66D1C3AEB6A00520CF9 /* XCTimeUtilities.swift */; };
1515
/* End PBXBuildFile section */
1616

1717
/* Begin PBXFileReference section */
1818
5B5D86DB1BBC74AD00234F36 /* SwiftXCTest.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftXCTest.framework; sourceTree = BUILT_PRODUCTS_DIR; };
19-
B108C2A61C20C15500F9F301 /* XCTimeUtilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCTimeUtilities.swift; sourceTree = "<group>"; };
20-
B11FFA291C1603B6004297C2 /* XCTAssert.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCTAssert.swift; sourceTree = "<group>"; };
21-
B11FFA2B1C160434004297C2 /* XCTestCaseProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCTestCaseProvider.swift; sourceTree = "<group>"; };
22-
B11FFA2D1C16053C004297C2 /* XCTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCTestCase.swift; sourceTree = "<group>"; };
2319
B1384A411C1B3E8700EDF031 /* CONTRIBUTING.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CONTRIBUTING.md; sourceTree = "<group>"; };
2420
B1384A421C1B3E8700EDF031 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
2521
B1384A431C1B3E8700EDF031 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
22+
C265F6691C3AEB6A00520CF9 /* XCTAssert.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCTAssert.swift; sourceTree = "<group>"; };
23+
C265F66A1C3AEB6A00520CF9 /* XCTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCTestCase.swift; sourceTree = "<group>"; };
24+
C265F66B1C3AEB6A00520CF9 /* XCTestCaseProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCTestCaseProvider.swift; sourceTree = "<group>"; };
25+
C265F66C1C3AEB6A00520CF9 /* XCTestMain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCTestMain.swift; sourceTree = "<group>"; };
26+
C265F66D1C3AEB6A00520CF9 /* XCTimeUtilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCTimeUtilities.swift; sourceTree = "<group>"; };
2627
EA3E74BB1BF2B6D500635A73 /* build_script.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = build_script.py; sourceTree = "<group>"; };
27-
EA6E86BA1BDEA7DE007C0323 /* XCTestMain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCTestMain.swift; sourceTree = "<group>"; };
2828
/* End PBXFileReference section */
2929

3030
/* Begin PBXFrameworksBuildPhase section */
@@ -41,7 +41,7 @@
4141
5B5D86D11BBC74AD00234F36 = {
4242
isa = PBXGroup;
4343
children = (
44-
5B5D86DD1BBC74AD00234F36 /* XCTest */,
44+
C265F6661C3AEB6A00520CF9 /* Sources */,
4545
5B5D86DC1BBC74AD00234F36 /* Products */,
4646
EA3E74BC1BF2B6D700635A73 /* Linux Build */,
4747
B1384A401C1B3E6A00EDF031 /* Documentation */,
@@ -58,18 +58,6 @@
5858
name = Products;
5959
sourceTree = "<group>";
6060
};
61-
5B5D86DD1BBC74AD00234F36 /* XCTest */ = {
62-
isa = PBXGroup;
63-
children = (
64-
EA6E86BA1BDEA7DE007C0323 /* XCTestMain.swift */,
65-
B11FFA2D1C16053C004297C2 /* XCTestCase.swift */,
66-
B11FFA2B1C160434004297C2 /* XCTestCaseProvider.swift */,
67-
B11FFA291C1603B6004297C2 /* XCTAssert.swift */,
68-
B108C2A61C20C15500F9F301 /* XCTimeUtilities.swift */,
69-
);
70-
path = XCTest;
71-
sourceTree = "<group>";
72-
};
7361
B1384A401C1B3E6A00EDF031 /* Documentation */ = {
7462
isa = PBXGroup;
7563
children = (
@@ -80,6 +68,26 @@
8068
name = Documentation;
8169
sourceTree = "<group>";
8270
};
71+
C265F6661C3AEB6A00520CF9 /* Sources */ = {
72+
isa = PBXGroup;
73+
children = (
74+
C265F6671C3AEB6A00520CF9 /* XCTest */,
75+
);
76+
path = Sources;
77+
sourceTree = "<group>";
78+
};
79+
C265F6671C3AEB6A00520CF9 /* XCTest */ = {
80+
isa = PBXGroup;
81+
children = (
82+
C265F6691C3AEB6A00520CF9 /* XCTAssert.swift */,
83+
C265F66A1C3AEB6A00520CF9 /* XCTestCase.swift */,
84+
C265F66B1C3AEB6A00520CF9 /* XCTestCaseProvider.swift */,
85+
C265F66C1C3AEB6A00520CF9 /* XCTestMain.swift */,
86+
C265F66D1C3AEB6A00520CF9 /* XCTimeUtilities.swift */,
87+
);
88+
path = XCTest;
89+
sourceTree = "<group>";
90+
};
8391
EA3E74BC1BF2B6D700635A73 /* Linux Build */ = {
8492
isa = PBXGroup;
8593
children = (
@@ -167,11 +175,11 @@
167175
isa = PBXSourcesBuildPhase;
168176
buildActionMask = 2147483647;
169177
files = (
170-
B108C2A71C20C15500F9F301 /* XCTimeUtilities.swift in Sources */,
171-
EA6E86BB1BDEA7DE007C0323 /* XCTestMain.swift in Sources */,
172-
B11FFA2C1C160434004297C2 /* XCTestCaseProvider.swift in Sources */,
173-
B11FFA2E1C16053C004297C2 /* XCTestCase.swift in Sources */,
174-
B11FFA2A1C1603B6004297C2 /* XCTAssert.swift in Sources */,
178+
C265F6731C3AEB6A00520CF9 /* XCTimeUtilities.swift in Sources */,
179+
C265F6701C3AEB6A00520CF9 /* XCTestCase.swift in Sources */,
180+
C265F6711C3AEB6A00520CF9 /* XCTestCaseProvider.swift in Sources */,
181+
C265F66F1C3AEB6A00520CF9 /* XCTAssert.swift in Sources */,
182+
C265F6721C3AEB6A00520CF9 /* XCTestMain.swift in Sources */,
175183
);
176184
runOnlyForDeploymentPostprocessing = 0;
177185
};

‎build_script.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def main():
7474
swiftc = os.path.abspath(args.swiftc)
7575
build_dir = os.path.abspath(args.build_dir)
7676
swift_build_dir = os.path.abspath(args.swift_build_dir)
77-
77+
7878
if not os.path.exists(build_dir):
7979
run("mkdir -p {}".format(build_dir))
8080

@@ -87,7 +87,7 @@ def main():
8787
]
8888
sourcePaths = []
8989
for file in sourceFiles:
90-
sourcePaths.append("{0}/XCTest/{1}".format(os.path.dirname(os.path.abspath(__file__)), file))
90+
sourcePaths.append("{0}/Sources/XCTest/{1}".format(os.path.dirname(os.path.abspath(__file__)), file))
9191

9292

9393
if args.build_style == "debug":
@@ -124,7 +124,7 @@ def main():
124124
cmd = ['cp', os.path.join(build_dir, install_mod_doc), os.path.join(module_path, install_mod_doc)]
125125
subprocess.check_call(cmd)
126126

127-
127+
128128
note('Done.')
129129

130130
if __name__ == '__main__':

0 commit comments

Comments
 (0)