Package Kit: Move a number of headers into the source directory.
These classe aren't used, and probably shouldn't be used, outside Package Kit itself. Also drop some files from libpackage_build that are not needed.
This commit is contained in:
@@ -1 +0,0 @@
|
|||||||
#include <../private/package/ActivateRepositoryCacheJob.h>
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
#include <../private/package/ActivateRepositoryConfigJob.h>
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
#include <../../../private/package/FetchFileJob.h>
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
#include <../private/package/HashableString.h>
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
#include <../private/package/RemoveRepositoryJob.h>
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
#include <../private/package/TempfileManager.h>
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
#include <../private/package/ValidateChecksumJob.h>
|
|
||||||
@@ -83,18 +83,13 @@ MakeLocate libpackage_build.so : $(HOST_BUILD_COMPATIBILITY_LIB_DIR) ;
|
|||||||
|
|
||||||
BuildPlatformSharedLibrary libpackage_build.so
|
BuildPlatformSharedLibrary libpackage_build.so
|
||||||
:
|
:
|
||||||
ActivateRepositoryCacheJob.cpp
|
|
||||||
ActivateRepositoryConfigJob.cpp
|
|
||||||
ActivationTransaction.cpp
|
ActivationTransaction.cpp
|
||||||
AddRepositoryRequest.cpp
|
|
||||||
Attributes.cpp
|
Attributes.cpp
|
||||||
ChecksumAccessors.cpp
|
ChecksumAccessors.cpp
|
||||||
CommitTransactionResult.cpp
|
CommitTransactionResult.cpp
|
||||||
Context.cpp
|
Context.cpp
|
||||||
DownloadFileRequest.cpp
|
DownloadFileRequest.cpp
|
||||||
DropRepositoryRequest.cpp
|
|
||||||
FetchFileJob.cpp
|
FetchFileJob.cpp
|
||||||
InstallationLocationInfo.cpp
|
|
||||||
Job.cpp
|
Job.cpp
|
||||||
PackageInfo.cpp
|
PackageInfo.cpp
|
||||||
PackageInfoContentHandler.cpp
|
PackageInfoContentHandler.cpp
|
||||||
@@ -104,8 +99,6 @@ BuildPlatformSharedLibrary libpackage_build.so
|
|||||||
PackageResolvableExpression.cpp
|
PackageResolvableExpression.cpp
|
||||||
PackageRoster.cpp
|
PackageRoster.cpp
|
||||||
PackageVersion.cpp
|
PackageVersion.cpp
|
||||||
RefreshRepositoryRequest.cpp
|
|
||||||
RemoveRepositoryJob.cpp
|
|
||||||
RepositoryCache.cpp
|
RepositoryCache.cpp
|
||||||
RepositoryConfig.cpp
|
RepositoryConfig.cpp
|
||||||
RepositoryInfo.cpp
|
RepositoryInfo.cpp
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include <package/ActivateRepositoryCacheJob.h>
|
#include "ActivateRepositoryCacheJob.h"
|
||||||
|
|
||||||
#include <File.h>
|
#include <File.h>
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include <package/ActivateRepositoryConfigJob.h>
|
#include "ActivateRepositoryConfigJob.h"
|
||||||
|
|
||||||
#include <package/Context.h>
|
#include <package/Context.h>
|
||||||
#include <package/RepositoryConfig.h>
|
#include <package/RepositoryConfig.h>
|
||||||
|
|||||||
@@ -13,9 +13,9 @@
|
|||||||
#include <JobQueue.h>
|
#include <JobQueue.h>
|
||||||
#include <Path.h>
|
#include <Path.h>
|
||||||
|
|
||||||
#include <package/ActivateRepositoryConfigJob.h>
|
|
||||||
#include <package/PackageRoster.h>
|
#include <package/PackageRoster.h>
|
||||||
|
|
||||||
|
#include "ActivateRepositoryConfigJob.h"
|
||||||
#include "FetchFileJob.h"
|
#include "FetchFileJob.h"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -10,13 +10,14 @@
|
|||||||
#include <new>
|
#include <new>
|
||||||
|
|
||||||
#include <package/Context.h>
|
#include <package/Context.h>
|
||||||
#include <package/TempfileManager.h>
|
|
||||||
|
|
||||||
#include <Directory.h>
|
#include <Directory.h>
|
||||||
#include <FindDirectory.h>
|
#include <FindDirectory.h>
|
||||||
#include <OS.h>
|
#include <OS.h>
|
||||||
#include <Path.h>
|
#include <Path.h>
|
||||||
|
|
||||||
|
#include "TempfileManager.h"
|
||||||
|
|
||||||
|
|
||||||
namespace BPackageKit {
|
namespace BPackageKit {
|
||||||
|
|
||||||
|
|||||||
@@ -9,10 +9,9 @@
|
|||||||
|
|
||||||
#include <package/DownloadFileRequest.h>
|
#include <package/DownloadFileRequest.h>
|
||||||
|
|
||||||
#include <package/ValidateChecksumJob.h>
|
|
||||||
|
|
||||||
#include "FetchFileJob.h"
|
#include "FetchFileJob.h"
|
||||||
#include "FetchUtils.h"
|
#include "FetchUtils.h"
|
||||||
|
#include "ValidateChecksumJob.h"
|
||||||
|
|
||||||
|
|
||||||
namespace BPackageKit {
|
namespace BPackageKit {
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
#include <JobQueue.h>
|
#include <JobQueue.h>
|
||||||
#include <Path.h>
|
#include <Path.h>
|
||||||
|
|
||||||
#include <package/RemoveRepositoryJob.h>
|
#include "RemoveRepositoryJob.h"
|
||||||
|
|
||||||
|
|
||||||
namespace BPackageKit {
|
namespace BPackageKit {
|
||||||
|
|||||||
@@ -55,6 +55,9 @@ BPackageRoster::~BPackageRoster()
|
|||||||
bool
|
bool
|
||||||
BPackageRoster::IsRebootNeeded()
|
BPackageRoster::IsRebootNeeded()
|
||||||
{
|
{
|
||||||
|
// This method makes sense only on an installed Haiku, but not for the build
|
||||||
|
// tools.
|
||||||
|
#if defined(__HAIKU__) && !defined(HAIKU_HOST_PLATFORM_HAIKU)
|
||||||
BInstallationLocationInfo info;
|
BInstallationLocationInfo info;
|
||||||
|
|
||||||
// We get information on the system package installation location.
|
// We get information on the system package installation location.
|
||||||
@@ -68,6 +71,7 @@ BPackageRoster::IsRebootNeeded()
|
|||||||
// number of packages in the system package directory.
|
// number of packages in the system package directory.
|
||||||
if (info.CurrentlyActivePackageInfos().CountInfos() != 0)
|
if (info.CurrentlyActivePackageInfos().CountInfos() != 0)
|
||||||
return true;
|
return true;
|
||||||
|
#endif
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,14 +15,14 @@
|
|||||||
|
|
||||||
#include <JobQueue.h>
|
#include <JobQueue.h>
|
||||||
|
|
||||||
#include <package/ActivateRepositoryCacheJob.h>
|
|
||||||
#include <package/ChecksumAccessors.h>
|
#include <package/ChecksumAccessors.h>
|
||||||
#include <package/ValidateChecksumJob.h>
|
|
||||||
#include <package/RepositoryCache.h>
|
#include <package/RepositoryCache.h>
|
||||||
#include <package/RepositoryConfig.h>
|
#include <package/RepositoryConfig.h>
|
||||||
#include <package/PackageRoster.h>
|
#include <package/PackageRoster.h>
|
||||||
|
|
||||||
|
#include "ActivateRepositoryCacheJob.h"
|
||||||
#include "FetchFileJob.h"
|
#include "FetchFileJob.h"
|
||||||
|
#include "ValidateChecksumJob.h"
|
||||||
|
|
||||||
#undef B_TRANSLATION_CONTEXT
|
#undef B_TRANSLATION_CONTEXT
|
||||||
#define B_TRANSLATION_CONTEXT "RefreshRepositoryRequest"
|
#define B_TRANSLATION_CONTEXT "RefreshRepositoryRequest"
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include <package/RemoveRepositoryJob.h>
|
#include "RemoveRepositoryJob.h"
|
||||||
|
|
||||||
#include <Entry.h>
|
#include <Entry.h>
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include <package/TempfileManager.h>
|
#include "TempfileManager.h"
|
||||||
|
|
||||||
|
|
||||||
namespace BPackageKit {
|
namespace BPackageKit {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include <package/ValidateChecksumJob.h>
|
#include "ValidateChecksumJob.h"
|
||||||
|
|
||||||
#include <File.h>
|
#include <File.h>
|
||||||
|
|
||||||
|
|||||||
@@ -24,10 +24,11 @@
|
|||||||
#include <package/hpkg/PackageInfoAttributeValue.h>
|
#include <package/hpkg/PackageInfoAttributeValue.h>
|
||||||
#include <package/hpkg/PackageReader.h>
|
#include <package/hpkg/PackageReader.h>
|
||||||
#include <package/ChecksumAccessors.h>
|
#include <package/ChecksumAccessors.h>
|
||||||
#include <package/HashableString.h>
|
|
||||||
#include <package/PackageInfoContentHandler.h>
|
#include <package/PackageInfoContentHandler.h>
|
||||||
#include <package/RepositoryInfo.h>
|
#include <package/RepositoryInfo.h>
|
||||||
|
|
||||||
|
#include "HashableString.h"
|
||||||
|
|
||||||
|
|
||||||
namespace BPackageKit {
|
namespace BPackageKit {
|
||||||
|
|
||||||
|
|||||||
@@ -30,17 +30,17 @@
|
|||||||
#include <package/ActivationTransaction.h>
|
#include <package/ActivationTransaction.h>
|
||||||
#include <package/DaemonClient.h>
|
#include <package/DaemonClient.h>
|
||||||
#include <package/manager/RepositoryBuilder.h>
|
#include <package/manager/RepositoryBuilder.h>
|
||||||
#include <package/ValidateChecksumJob.h>
|
|
||||||
|
|
||||||
#include "FetchFileJob.h"
|
#include "FetchFileJob.h"
|
||||||
#include "FetchUtils.h"
|
#include "FetchUtils.h"
|
||||||
using BPackageKit::BPrivate::FetchUtils;
|
|
||||||
#include "PackageManagerUtils.h"
|
#include "PackageManagerUtils.h"
|
||||||
|
#include "ValidateChecksumJob.h"
|
||||||
|
|
||||||
#undef B_TRANSLATION_CONTEXT
|
#undef B_TRANSLATION_CONTEXT
|
||||||
#define B_TRANSLATION_CONTEXT "PackageManagerKit"
|
#define B_TRANSLATION_CONTEXT "PackageManagerKit"
|
||||||
|
|
||||||
|
|
||||||
|
using BPackageKit::BPrivate::FetchUtils;
|
||||||
using BPackageKit::BPrivate::FetchFileJob;
|
using BPackageKit::BPrivate::FetchFileJob;
|
||||||
using BPackageKit::BPrivate::ValidateChecksumJob;
|
using BPackageKit::BPrivate::ValidateChecksumJob;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user