Move private frameworks into subfolder

cmake/dsym.cmake

@@ -12,7 +12,7 @@ function(dsym target)
 		install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}.dSYM" DESTINATION "${CMAKE_INSTALL_PREFIX}/libexec/darling/System/Library/Caches/dsym/files")
 		install(DIRECTORY DESTINATION "${CMAKE_INSTALL_PREFIX}/libexec/darling/System/Library/Caches/dsym/uuid")
 
-		install(CODE "execute_process(COMMAND \"${CMAKE_BINARY_DIR}/src/DebugSymbols/getuuid/getuuid\" \"${CMAKE_CURRENT_BINARY_DIR}/${target}.dSYM\" RESULT_VARIABLE getuuid_result OUTPUT_VARIABLE macho_uuid)
+		install(CODE "execute_process(COMMAND \"${CMAKE_BINARY_DIR}/src/buildtools/getuuid\" \"${CMAKE_CURRENT_BINARY_DIR}/${target}.dSYM\" RESULT_VARIABLE getuuid_result OUTPUT_VARIABLE macho_uuid)
 
 			if (NOT \${getuuid_result} EQUAL 0)
 				message(WARNING \"Cannot determine UUID of ${target}\")

src/CMakeLists.txt

@@ -57,7 +57,7 @@ add_subdirectory(external/cctools-port/cctools/misc)
 #add_subdirectory(util)
 #add_subdirectory(libmach-o)
 #add_subdirectory(libdyld)
-add_subdirectory(DebugSymbols/getuuid)
+add_subdirectory(buildtools)
 add_subdirectory(libelfloader/wrapgen)
 add_subdirectory(startup)
 
@@ -118,7 +118,6 @@ include_directories(AFTER
 	${CMAKE_CURRENT_SOURCE_DIR}/external/IOKitUser
 	${CMAKE_CURRENT_SOURCE_DIR}/external/openpam/include
 	${CMAKE_CURRENT_SOURCE_DIR}/external/sqlite/include
-	${CMAKE_CURRENT_SOURCE_DIR}/DebugSymbols/include
 	${CMAKE_CURRENT_SOURCE_DIR}/OpenScripting/include
 	${CMAKE_CURRENT_SOURCE_DIR}/CryptoTokenKit/include
 	${CMAKE_CURRENT_SOURCE_DIR}/LocalAuthentication/include
@@ -154,7 +153,6 @@ include_directories(AFTER
 	${CMAKE_CURRENT_SOURCE_DIR}/external/zlib/include
 	${CMAKE_CURRENT_SOURCE_DIR}/xar/include
 	${CMAKE_CURRENT_SOURCE_DIR}/external/DirectoryService/include
-	${CMAKE_CURRENT_SOURCE_DIR}/DiskImages/include
 	${CMAKE_CURRENT_SOURCE_DIR}/ServiceManagement/include
 	${CMAKE_CURRENT_SOURCE_DIR}/libresolv/include
 	${CMAKE_CURRENT_SOURCE_DIR}/external/cocotron/include
@@ -167,27 +165,15 @@ include_directories(AFTER
 	${CMAKE_CURRENT_SOURCE_DIR}/external/cocotron/CoreVideo/include
 	${CMAKE_CURRENT_SOURCE_DIR}/external/WTF/include
 	${CMAKE_CURRENT_SOURCE_DIR}/external/bmalloc/include
-	${CMAKE_CURRENT_SOURCE_DIR}/PerformanceAnalysis/include
-	${CMAKE_CURRENT_SOURCE_DIR}/DiskManagement/include
-	${CMAKE_CURRENT_SOURCE_DIR}/NetworkStatistics/include
-	${CMAKE_CURRENT_SOURCE_DIR}/CoreSymbolication/include
-	${CMAKE_CURRENT_SOURCE_DIR}/LoggingSupport/include
-	${CMAKE_CURRENT_SOURCE_DIR}/CrashReporterSupport/include
 	${CMAKE_CURRENT_SOURCE_DIR}/SecurityFoundation/include
-	${CMAKE_CURRENT_SOURCE_DIR}/IOPlatformPluginFamily/include
-	${CMAKE_CURRENT_SOURCE_DIR}/PlugInKit/include
 	${CMAKE_CURRENT_SOURCE_DIR}/libsysmon/include
 	${CMAKE_CURRENT_SOURCE_DIR}/libcompression/include
 	${CMAKE_CURRENT_SOURCE_DIR}/Metal/include
 	${CMAKE_CURRENT_SOURCE_DIR}/kperf/include
-	${CMAKE_CURRENT_SOURCE_DIR}/StreamingZip/include
 	${CMAKE_CURRENT_SOURCE_DIR}/external/dtrace/head
 	${CMAKE_CURRENT_SOURCE_DIR}/ScriptingBridge/include
 	${CMAKE_CURRENT_SOURCE_DIR}/lkm/include
 	${CMAKE_CURRENT_SOURCE_DIR}/libDiagnosticMessagesClient/include
-	${CMAKE_CURRENT_SOURCE_DIR}/DataDetectorsCore/include
-	${CMAKE_CURRENT_SOURCE_DIR}/DataDetectors/include
-	${CMAKE_CURRENT_SOURCE_DIR}/DataDetectorsNaturalLanguage/include
 	${CMAKE_CURRENT_SOURCE_DIR}/SecurityInterface/include
 	${CMAKE_CURRENT_SOURCE_DIR}/DrawSprocket/include
 	${CMAKE_CURRENT_SOURCE_DIR}/Quartz/include
@@ -195,18 +181,10 @@ include_directories(AFTER
 	${CMAKE_CURRENT_SOURCE_DIR}/IOSurface/include
 	${CMAKE_CURRENT_SOURCE_DIR}/OpenGL/include
 	${CMAKE_CURRENT_SOURCE_DIR}/libquit/include
-	${CMAKE_CURRENT_SOURCE_DIR}/Spotlight/include
-	${CMAKE_CURRENT_SOURCE_DIR}/SpotlightDaemon/include
-	${CMAKE_CURRENT_SOURCE_DIR}/SpotlightIndex/include
-	${CMAKE_CURRENT_SOURCE_DIR}/SpotlightReceiver/include
-	${CMAKE_CURRENT_SOURCE_DIR}/SpotlightServerKit/include
-	${CMAKE_CURRENT_SOURCE_DIR}/SpotlightServices/include
 	${CMAKE_CURRENT_SOURCE_DIR}/QuickLook/include
-	${CMAKE_CURRENT_SOURCE_DIR}/ViewBridge/include
 	${CMAKE_CURRENT_SOURCE_DIR}/WebKit/include
 	${CMAKE_CURRENT_SOURCE_DIR}/JavaVM/include
 	${CMAKE_CURRENT_SOURCE_DIR}/DirectoryServices/include
-	${CMAKE_CURRENT_SOURCE_DIR}/ConfigurationProfiles/include
 	${CMAKE_CURRENT_SOURCE_DIR}/ImageIO/include
 	${CMAKE_CURRENT_SOURCE_DIR}/external/SecurityTokend/include
 	${CMAKE_CURRENT_SOURCE_DIR}/LDAP/include
@@ -306,9 +284,6 @@ add_subdirectory(external/libarchive/libarchive)
 add_subdirectory(external/apr)
 add_subdirectory(sandbox)
 add_subdirectory(xcselect)
-add_subdirectory(ConfigurationProfiles)
-add_subdirectory(DiskImages)
-add_subdirectory(PackageKit)
 add_subdirectory(external/OpenDirectory)
 
 add_subdirectory(native)
@@ -358,42 +333,22 @@ add_subdirectory(external/DSTools)
 add_subdirectory(external/DirectoryService)
 add_subdirectory(ImageIO)
 add_subdirectory(login)
-add_subdirectory(DebugSymbols)
-add_subdirectory(PerformanceAnalysis)
-add_subdirectory(DiskManagement)
-add_subdirectory(NetworkStatistics)
-add_subdirectory(CoreSymbolication)
-add_subdirectory(LoggingSupport)
-add_subdirectory(CrashReporterSupport)
 add_subdirectory(SecurityFoundation)
-add_subdirectory(IOPlatformPluginFamily)
-add_subdirectory(PlugInKit)
 add_subdirectory(libsysmon)
 add_subdirectory(libcompression)
 add_subdirectory(Metal)
 add_subdirectory(kperf)
-add_subdirectory(StreamingZip)
 add_subdirectory(external/bsm)
 add_subdirectory(external/Heimdal)
 add_subdirectory(PlistBuddy)
 add_subdirectory(ScriptingBridge)
 add_subdirectory(libDiagnosticMessagesClient)
-add_subdirectory(DataDetectorsCore)
-add_subdirectory(DataDetectors)
-add_subdirectory(DataDetectorsNaturalLanguage)
 add_subdirectory(SecurityInterface)
 add_subdirectory(Quartz)
 add_subdirectory(CoreVideo)
 add_subdirectory(IOSurface)
 add_subdirectory(libquit)
-add_subdirectory(Spotlight)
-add_subdirectory(SpotlightDaemon)
-add_subdirectory(SpotlightIndex)
-add_subdirectory(SpotlightReceiver)
-add_subdirectory(SpotlightServerKit)
-add_subdirectory(SpotlightServices)
 add_subdirectory(QuickLook)
-add_subdirectory(ViewBridge)
 add_subdirectory(LDAP)
 add_subdirectory(ExceptionHandling)
 add_subdirectory(external/lzfse)

src/DebugSymbols/getuuid/CMakeLists.txt

@@ -1,6 +0,0 @@
-project(getuuid)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
-add_executable(getuuid getuuid.c)
-

src/PackageKit/CMakeLists.txt

@@ -1,146 +0,0 @@
-project(PackageKit)
-
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -mmacosx-version-min=10.10")
-
-include_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}/Headers
-	${CMAKE_SOURCE_DIR}/src/external/foundation/include
-)
-
-set(pk_sources
-	functions.c
-	Sources/PKAddExtendedAttributesInstallOperation.m
-	Sources/PKAddRestrictedRootFlagInstallOperation.m
-	Sources/PKArchiveDistributionContainer.m
-	Sources/PKArchive.m
-	Sources/PKArchiveProduct.m
-	Sources/PKArchiveSignature.m
-	Sources/PKArchiveSigner.m
-	Sources/PKBOMDirectoryEnumerator.m
-	Sources/PKBOM.m
-	Sources/PKBundleComponent.m
-	Sources/PKBundleComponentVersion.m
-	Sources/PKBundleStorage.m
-	Sources/PKCFBundleStorage.m
-	Sources/PKCleanEFWCacheInstallOperation.m
-	Sources/PKComponent.m
-	Sources/PKDataSizeFormatter.m
-	Sources/PKDataSizeValueTransformer.m
-	Sources/PKDeferredInstallManager.m
-	Sources/PKDistributionContainer.m
-	Sources/PKDistributionChoice.m
-	Sources/PKDistribution.m
-	Sources/PKDistributionPackageReference.m
-	Sources/PKDistributionScript.m
-	Sources/PKDownloader.m
-	Sources/PKDownloaderQueueElement.m
-	Sources/PKDownloaderQueue.m
-	Sources/PKDownloaderSpeedTracker.m
-	Sources/PKDownload.m
-	Sources/PKDYLDCacheInstallOperation.m
-	Sources/PKExtendedAttributeEnumerator.m
-	Sources/PKExtendedAttribute.m
-	Sources/PKExtractInstallOperation.m
-	Sources/PKFileDownload.m
-	Sources/PKFirmwareBundleComponent.m
-	Sources/PKFirmwareBundleComponentModel.m
-	Sources/PKFirmwareInstallationController.m
-	Sources/PKFlatDistributionContainer.m
-	Sources/PKFolderArchive.m
-	Sources/PKFolderArchiveProduct.m
-	Sources/PKFolderArchiveSignature.m
-	Sources/PKCheckError.m
-	Sources/_PKCheckErrorRecoveryAttempter.m
-	Sources/PKInstallableObject.m
-	Sources/PKInstallAnalyzer.m
-	Sources/_PKInstallClientConnection.m
-	Sources/PKInstallClient.m
-	Sources/PKInstallCommitManager.m
-	Sources/PKInstallDaemonClient.m
-	Sources/PKInstallDaemon.m
-	Sources/PKInstallError.m
-	Sources/PKInstallHistory.m
-	Sources/PKInstall.m
-	Sources/PKInstallManifest.m
-	Sources/PKInstallOperationController.m
-	Sources/PKInstallOperation.m
-	Sources/PKInstallRequest.m
-	Sources/PKInstallSandbox.m
-	Sources/PKInstallSandboxManager.m
-	Sources/PKInstallStateHelper.m
-	Sources/PKInstallTask.m
-	Sources/PKJaguarPackage.m
-	Sources/PKKextCacheInstallOperation.m
-	Sources/PKLeopardPackage.m
-	Sources/PKLSRegisterInstallOperation.m
-	Sources/PKMachOWithInfoPlistBundleStorage.m
-	Sources/PKMutableArchive.m
-	Sources/PKMutableBOM.m
-	Sources/PKMutableDistributionContainer.m
-	Sources/PKMutableLeopardPackage.m
-	Sources/PKMutablePackage.m
-	Sources/PKMutableProduct.m
-	Sources/PKMutableReceipt.m
-	Sources/PKMutableSignedContainer.m
-	Sources/PKMutableXARArchive.m
-	Sources/PKNetEnabledProduct.m
-	Sources/PKObsoletionInstallOperation.m
-	Sources/_PKPackageCreationFileDigest.m
-	Sources/PKPackageChecker.m
-	Sources/PKPackageInfo.m
-	Sources/PKPackage.m
-	Sources/PKPackageReference.m
-	Sources/PKPackageRequirements.m
-	Sources/PKPackageSourceManager.m
-	Sources/PKPackageSpecifier.m
-	Sources/PKPatchAndUpdateInstallOperation.m
-	Sources/PKPatchFilesInstallOperation.m
-	Sources/PKPayloadCopier.m
-	Sources/PKPrepareDiskInstallOperation.m
-	Sources/PKPrepareForCommitInstallOperation.m
-	Sources/PKProductArchiver.m
-	Sources/PKProductChecker.m
-	Sources/PKProductInfo.m
-	Sources/PKProduct.m
-	Sources/PKProductUnarchiver.m
-	Sources/PKReceipt.m
-	Sources/PKRelocateComponentsInstallOperation.m
-	Sources/PKRunPackageScriptInstallOperation.m
-	Sources/PKSafariExtensionBundleStorage.m
-	Sources/PKScript.m
-	Sources/PKSecureNetEnabledProduct.m
-	Sources/PKSetupDeferredInstallOperation.m
-	Sources/PKShoveInstallOperation.m
-	Sources/_PKSignedContainerCopyCancelHandler.m
-	Sources/PKSignedContainer.m
-	Sources/PKSigningIdentity.m
-	Sources/PKStreamingProduct.m
-	Sources/PKStreamingXARArchive.m
-	Sources/PKTimeRemainingFormatter.m
-	Sources/PKTimeRemainingValueTransformer.m
-	Sources/PKTrustAdditions.m
-	Sources/PKTrust.m
-	Sources/PKUpdateEFWCacheInstallOperation.m
-	Sources/_PKURLConnectionDelegate.m
-	Sources/PKURLConnection.m
-	Sources/PKURLDownload.m
-	Sources/PKVerifyMASPayloadInstallOperation.m
-	Sources/PKWriteMASReceiptInstallOperation.m
-	Sources/PKWriteReceiptsInstallOperation.m
-	Sources/PKXARArchive.m
-	Sources/PKXARArchiveSignature.m
-	Sources/PKXPCCacheInstallOperation.m
-	Sources/XARDirectoryEnumerator.m
-)
-
-add_framework(PackageKit
-	PRIVATE
-	VERSION "A"
-	CURRENT_VERSION
-	SOURCES
-		${pk_sources}
-	DEPENDENCIES
-		system
-		Foundation
-)
-

src/PackageKit/Headers/PackageKit

@@ -1 +0,0 @@
-.

src/buildtools/CMakeLists.txt

@@ -0,0 +1,6 @@
+project(buildtools)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+
+add_executable(getuuid getuuid.c)
+

src/private-frameworks/CMakeLists.txt

@@ -2,4 +2,27 @@ project(private-frameworks)
 
 add_subdirectory(AppleSystemInfo)
 add_subdirectory(AuthKit)
+add_subdirectory(CrashReporterSupport)
+add_subdirectory(ConfigurationProfiles)
+add_subdirectory(CoreSymbolication)
+add_subdirectory(DataDetectors)
+add_subdirectory(DataDetectorsCore)
+add_subdirectory(DataDetectorsNaturalLanguage)
+add_subdirectory(DebugSymbols)
+add_subdirectory(DiskImages)
+add_subdirectory(DiskManagement)
+add_subdirectory(IOPlatformPluginFamily)
+add_subdirectory(LoggingSupport)
 add_subdirectory(MobileDevice)
+add_subdirectory(NetworkStatistics)
+add_subdirectory(PackageKit)
+add_subdirectory(PerformanceAnalysis)
+add_subdirectory(PlugInKit)
+add_subdirectory(Spotlight)
+add_subdirectory(SpotlightDaemon)
+add_subdirectory(SpotlightIndex)
+add_subdirectory(SpotlightReceiver)
+add_subdirectory(SpotlightServerKit)
+add_subdirectory(SpotlightServices)
+add_subdirectory(StreamingZip)
+add_subdirectory(ViewBridge)