Skip to content

Added support for Freestanding Bundles reverse lookup #1570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed

Added support for Freestanding Bundles reverse lookup #1570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8bdfb2b
[WIP] Added support for Freestanding Bundles reverse lookup
pvieito May 31, 2018
92b1639
Disabled freestanding bundles on Darwin
pvieito May 31, 2018
4706dd8
Fixed leaks and cleaned `_CFBundleCopyExecutableURLInDirectory2()`
pvieito May 31, 2018
7f23670
Added test to check Bundle reverse lookup
pvieito May 31, 2018
ad95f2b
Added note as FHS Bundle reverse lookup implementation is pending
pvieito May 31, 2018
482ab99
Implemented required changes
pvieito Jun 3, 2018
8327149
Used guard instead of if
pvieito Jun 3, 2018
f88a812
Guarded test which require @testable import of Foundation with NS_FO…
pvieito Jun 13, 2018
3c0192d
(refs #) Merged master
pvieito Oct 11, 2018
4ca3eb0
Updated conditional target naming
pvieito Oct 14, 2018
a8be484
Updated conditional target naming
pvieito Oct 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions CoreFoundation/PlugIn.subproj/CFBundle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ static void _CFBundleEnsureBundlesExistForImagePaths(CFArrayRef imagePaths);

#pragma mark -

#if !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !TARGET_OS_ANDROID
#if !(DEPLOYMENT_RUNTIME_OBJC || TARGET_OS_WINDOWS || TARGET_OS_ANDROID) /* FHS_BUNDLES */

// Functions and constants for FHS bundles:
#define _CFBundleFHSDirectory_share CFSTR("share")
Expand All @@ -160,14 +160,14 @@ static Boolean _CFBundleURLIsForFHSInstalledBundle(CFURLRef bundleURL) {

return isFHSBundle;
}
#endif // !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !TARGET_OS_ANDROID
#endif /* FHS_BUNDLES */

CF_CROSS_PLATFORM_EXPORT Boolean _CFBundleSupportsFHSBundles() {
#if !DEPLOYMENT_RUNTIME_OBJC && !DEPLOYMENT_TARGET_WINDOWS && !DEPLOYMENT_TARGET_ANDROID
#if !(DEPLOYMENT_RUNTIME_OBJC || TARGET_OS_WINDOWS || TARGET_OS_ANDROID) /* FHS_BUNDLES */
return true;
#else
return false;
#endif
#endif /* FHS_BUNDLES */
}

#pragma mark -
Expand Down Expand Up @@ -726,9 +726,9 @@ static CFBundleRef _CFBundleCreate(CFAllocatorRef allocator, CFURLRef bundleURL,

bundle->_url = newURL;

#if !DEPLOYMENT_RUNTIME_OBJC && !TARGET_OS_WIN32 && !TARGET_OS_ANDROID
#if !(DEPLOYMENT_RUNTIME_OBJC || TARGET_OS_WINDOWS || TARGET_OS_ANDROID) /* FHS_BUNDLES */
bundle->_isFHSInstalledBundle = _CFBundleURLIsForFHSInstalledBundle(newURL);
#endif
#endif /* FHS_BUNDLES */

bundle->_version = localVersion;
bundle->_infoDict = NULL;
Expand Down
Loading