Skip to content

Commit 1afa1ef

Browse files
authored
Merge pull request #1597 from millenomi/xdg
[Attempt 2] Implement FileManager.url{s,}(for:…) and NSSearchPathForDirectoriesInDomains.
2 parents fd660ff + a66193f commit 1afa1ef

File tree

10 files changed

+792
-21
lines changed

10 files changed

+792
-21
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 */; };
@@ -515,6 +516,7 @@
515516
/* Begin PBXFileReference section */
516517
0383A1741D2E558A0052E5D1 /* TestStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestStream.swift; sourceTree = "<group>"; };
517518
03B6F5831F15F339004F25AF /* TestURLProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestURLProtocol.swift; sourceTree = "<group>"; };
519+
1513A8422044893F00539722 /* FileManager_XDG.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileManager_XDG.swift; sourceTree = "<group>"; };
518520
1520469A1D8AEABE00D02E36 /* HTTPServer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTTPServer.swift; sourceTree = "<group>"; };
519521
153E950F20111DC500F250BE /* CFKnownLocations.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CFKnownLocations.h; sourceTree = "<group>"; };
520522
153E951020111DC500F250BE /* CFKnownLocations.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = CFKnownLocations.c; sourceTree = "<group>"; };
@@ -1822,6 +1824,7 @@
18221824
children = (
18231825
EADE0B5D1BD15DFF00C49C64 /* FileHandle.swift */,
18241826
EADE0B5E1BD15DFF00C49C64 /* FileManager.swift */,
1827+
1513A8422044893F00539722 /* FileManager_XDG.swift */,
18251828
EADE0B7A1BD15DFF00C49C64 /* Process.swift */,
18261829
5BDC3F2F1BCC5DCB00ED97BB /* Bundle.swift */,
18271830
5BDC3F411BCC5DCB00ED97BB /* ProcessInfo.swift */,
@@ -2204,7 +2207,7 @@
22042207
);
22052208
runOnlyForDeploymentPostprocessing = 0;
22062209
shellPath = /bin/sh;
2207-
shellScript = "cp ${BUILD_ROOT}/Debug/xdgTestHelper.app/Contents/MacOS/xdgTestHelper ${BUILD_ROOT}/Debug/TestFoundation.app/Contents/MacOS/";
2210+
shellScript = "cp ${BUILT_PRODUCTS_DIR}/xdgTestHelper.app/Contents/MacOS/xdgTestHelper ${BUILT_PRODUCTS_DIR}/TestFoundation.app/Contents/MacOS/\n";
22082211
};
22092212
/* End PBXShellScriptBuildPhase section */
22102213

@@ -2344,6 +2347,7 @@
23442347
5BECBA3A1D1CAE9A00B39B1F /* NSMeasurement.swift in Sources */,
23452348
5BF7AEB21BCD51F9008F214A /* NSNumber.swift in Sources */,
23462349
61D2F9AF1FECFB3E0033306A /* NativeProtocol.swift in Sources */,
2350+
1513A8432044893F00539722 /* FileManager_XDG.swift in Sources */,
23472351
B9974B991EDF4A22007F15B8 /* HTTPURLProtocol.swift in Sources */,
23482352
5BCD03821D3EE35C00E3FF9B /* TimeZone.swift in Sources */,
23492353
EADE0BBC1BD15E0000C49C64 /* URLCache.swift in Sources */,
@@ -2646,6 +2650,7 @@
26462650
MTL_ENABLE_DEBUG_INFO = YES;
26472651
ONLY_ACTIVE_ARCH = YES;
26482652
SDKROOT = macosx;
2653+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "NS_FOUNDATION_ALLOWS_TESTABLE_IMPORT DEBUG";
26492654
VERSIONING_SYSTEM = "apple-generic";
26502655
VERSION_INFO_PREFIX = "";
26512656
};
@@ -2713,6 +2718,7 @@
27132718
DYLIB_COMPATIBILITY_VERSION = 150;
27142719
DYLIB_CURRENT_VERSION = 1303;
27152720
DYLIB_INSTALL_NAME_BASE = "@rpath";
2721+
ENABLE_TESTABILITY = YES;
27162722
FRAMEWORK_VERSION = A;
27172723
GCC_PREFIX_HEADER = CoreFoundation/Base.subproj/CoreFoundation_Prefix.h;
27182724
HEADER_SEARCH_PATHS = (
@@ -2786,6 +2792,7 @@
27862792
DYLIB_COMPATIBILITY_VERSION = 150;
27872793
DYLIB_CURRENT_VERSION = 1303;
27882794
DYLIB_INSTALL_NAME_BASE = "@rpath";
2795+
ENABLE_TESTABILITY = YES;
27892796
FRAMEWORK_VERSION = A;
27902797
GCC_PREFIX_HEADER = CoreFoundation/Base.subproj/CoreFoundation_Prefix.h;
27912798
HEADER_SEARCH_PATHS = (

0 commit comments

Comments
 (0)