Skip to content

Commit 72d6933

Browse files
authored
Merge pull request #1600 from millenomi/xdg
[Attempt 3] Implement FileManager.url{s,}(for:…) and NSSearchPathForDirectoriesInDomains.
2 parents 7df89db + 9745d18 commit 72d6933

File tree

10 files changed

+799
-14
lines changed

10 files changed

+799
-14
lines changed

Foundation.xcodeproj/project.pbxproj

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/* Begin PBXBuildFile section */
1010
0383A1751D2E558A0052E5D1 /* TestStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0383A1741D2E558A0052E5D1 /* TestStream.swift */; };
1111
03B6F5841F15F339004F25AF /* TestURLProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03B6F5831F15F339004F25AF /* TestURLProtocol.swift */; };
12+
1513A8432044893F00539722 /* FileManager_XDG.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1513A8422044893F00539722 /* FileManager_XDG.swift */; };
1213
1520469B1D8AEABE00D02E36 /* HTTPServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1520469A1D8AEABE00D02E36 /* HTTPServer.swift */; };
1314
153E951120111DC500F250BE /* CFKnownLocations.h in Headers */ = {isa = PBXBuildFile; fileRef = 153E950F20111DC500F250BE /* CFKnownLocations.h */; settings = {ATTRIBUTES = (Private, ); }; };
1415
153E951220111DC500F250BE /* CFKnownLocations.c in Sources */ = {isa = PBXBuildFile; fileRef = 153E951020111DC500F250BE /* CFKnownLocations.c */; };
@@ -527,6 +528,7 @@
527528
/* Begin PBXFileReference section */
528529
0383A1741D2E558A0052E5D1 /* TestStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestStream.swift; sourceTree = "<group>"; };
529530
03B6F5831F15F339004F25AF /* TestURLProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestURLProtocol.swift; sourceTree = "<group>"; };
531+
1513A8422044893F00539722 /* FileManager_XDG.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileManager_XDG.swift; sourceTree = "<group>"; };
530532
1520469A1D8AEABE00D02E36 /* HTTPServer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTTPServer.swift; sourceTree = "<group>"; };
531533
153E950F20111DC500F250BE /* CFKnownLocations.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CFKnownLocations.h; sourceTree = "<group>"; };
532534
153E951020111DC500F250BE /* CFKnownLocations.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = CFKnownLocations.c; sourceTree = "<group>"; };
@@ -1858,6 +1860,7 @@
18581860
children = (
18591861
EADE0B5D1BD15DFF00C49C64 /* FileHandle.swift */,
18601862
EADE0B5E1BD15DFF00C49C64 /* FileManager.swift */,
1863+
1513A8422044893F00539722 /* FileManager_XDG.swift */,
18611864
EADE0B7A1BD15DFF00C49C64 /* Process.swift */,
18621865
5BDC3F2F1BCC5DCB00ED97BB /* Bundle.swift */,
18631866
5BDC3F411BCC5DCB00ED97BB /* ProcessInfo.swift */,
@@ -2248,7 +2251,7 @@
22482251
);
22492252
runOnlyForDeploymentPostprocessing = 0;
22502253
shellPath = /bin/sh;
2251-
shellScript = "cp ${BUILD_ROOT}/Debug/xdgTestHelper.app/Contents/MacOS/xdgTestHelper ${BUILD_ROOT}/Debug/TestFoundation.app/Contents/MacOS/";
2254+
shellScript = "cp ${BUILT_PRODUCTS_DIR}/xdgTestHelper.app/Contents/MacOS/xdgTestHelper ${BUILT_PRODUCTS_DIR}/TestFoundation.app/Contents/MacOS/\n";
22522255
};
22532256
/* End PBXShellScriptBuildPhase section */
22542257

@@ -2388,6 +2391,7 @@
23882391
5BECBA3A1D1CAE9A00B39B1F /* NSMeasurement.swift in Sources */,
23892392
5BF7AEB21BCD51F9008F214A /* NSNumber.swift in Sources */,
23902393
61D2F9AF1FECFB3E0033306A /* NativeProtocol.swift in Sources */,
2394+
1513A8432044893F00539722 /* FileManager_XDG.swift in Sources */,
23912395
B9974B991EDF4A22007F15B8 /* HTTPURLProtocol.swift in Sources */,
23922396
5BCD03821D3EE35C00E3FF9B /* TimeZone.swift in Sources */,
23932397
EADE0BBC1BD15E0000C49C64 /* URLCache.swift in Sources */,
@@ -2694,6 +2698,7 @@
26942698
MTL_ENABLE_DEBUG_INFO = YES;
26952699
ONLY_ACTIVE_ARCH = YES;
26962700
SDKROOT = macosx;
2701+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "NS_FOUNDATION_ALLOWS_TESTABLE_IMPORT DEBUG";
26972702
VERSIONING_SYSTEM = "apple-generic";
26982703
VERSION_INFO_PREFIX = "";
26992704
};
@@ -2761,6 +2766,7 @@
27612766
DYLIB_COMPATIBILITY_VERSION = 150;
27622767
DYLIB_CURRENT_VERSION = 1303;
27632768
DYLIB_INSTALL_NAME_BASE = "@rpath";
2769+
ENABLE_TESTABILITY = YES;
27642770
FRAMEWORK_VERSION = A;
27652771
GCC_PREFIX_HEADER = CoreFoundation/Base.subproj/CoreFoundation_Prefix.h;
27662772
HEADER_SEARCH_PATHS = (
@@ -2834,6 +2840,7 @@
28342840
DYLIB_COMPATIBILITY_VERSION = 150;
28352841
DYLIB_CURRENT_VERSION = 1303;
28362842
DYLIB_INSTALL_NAME_BASE = "@rpath";
2843+
ENABLE_TESTABILITY = YES;
28372844
FRAMEWORK_VERSION = A;
28382845
GCC_PREFIX_HEADER = CoreFoundation/Base.subproj/CoreFoundation_Prefix.h;
28392846
HEADER_SEARCH_PATHS = (

0 commit comments

Comments
 (0)