From 0816749e41c0757e4e3269e18ffc333b64deb1c8 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 1 Apr 2013 23:06:33 +0000 Subject: [PATCH] package_repo: Removes dependency to package * Move StandardErrorOutput to libpackage and into proper namespace to avoid "package_repo" having to reuse the "package" source file. * package_repo: Fix incorrect includes of "package.h". --- headers/os/package/hpkg/StandardErrorOutput.h | 29 +++++++++++++++++++ src/bin/package/Jamfile | 1 - src/bin/package/StandardErrorOutput.cpp | 16 ---------- src/bin/package/StandardErrorOutput.h | 21 -------------- src/bin/package/command_add.cpp | 1 - src/bin/package/command_create.cpp | 1 - src/bin/package/command_dump.cpp | 4 +-- src/bin/package/command_extract.cpp | 4 +-- src/bin/package/command_list.cpp | 4 +-- src/bin/package_repo/Jamfile | 3 -- src/bin/package_repo/command_create.cpp | 3 +- src/bin/package_repo/command_list.cpp | 6 ++-- src/kits/package/Jamfile | 4 +++ src/kits/package/hpkg/StandardErrorOutput.cpp | 26 +++++++++++++++++ 14 files changed, 69 insertions(+), 54 deletions(-) create mode 100644 headers/os/package/hpkg/StandardErrorOutput.h delete mode 100644 src/bin/package/StandardErrorOutput.cpp delete mode 100644 src/bin/package/StandardErrorOutput.h create mode 100644 src/kits/package/hpkg/StandardErrorOutput.cpp diff --git a/headers/os/package/hpkg/StandardErrorOutput.h b/headers/os/package/hpkg/StandardErrorOutput.h new file mode 100644 index 0000000000..c2ffa31bab --- /dev/null +++ b/headers/os/package/hpkg/StandardErrorOutput.h @@ -0,0 +1,29 @@ +/* + * Copyright 2009-2013, Ingo Weinhold, ingo_weinhold@gmx.de. + * Distributed under the terms of the MIT License. + */ +#ifndef _PACKAGE__HPKG__STANDARD_ERROR_OUTPUT_H_ +#define _PACKAGE__HPKG__STANDARD_ERROR_OUTPUT_H_ + + +#include + + +namespace BPackageKit { + +namespace BHPKG { + + +class BStandardErrorOutput : public BErrorOutput { +public: + virtual void PrintErrorVarArgs(const char* format, + va_list args); +}; + + +} // namespace BHPKG + +} // namespace BPackageKit + + +#endif // _PACKAGE__HPKG__STANDARD_ERROR_OUTPUT_H_ diff --git a/src/bin/package/Jamfile b/src/bin/package/Jamfile index 0ee72e967a..7f34919c05 100644 --- a/src/bin/package/Jamfile +++ b/src/bin/package/Jamfile @@ -11,7 +11,6 @@ BinCommand package : package.cpp PackageWriterListener.cpp PackageWritingUtils.cpp - StandardErrorOutput.cpp : package be diff --git a/src/bin/package/StandardErrorOutput.cpp b/src/bin/package/StandardErrorOutput.cpp deleted file mode 100644 index 133e633914..0000000000 --- a/src/bin/package/StandardErrorOutput.cpp +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de. - * Distributed under the terms of the MIT License. - */ - - -#include "StandardErrorOutput.h" - -#include - - -void -StandardErrorOutput::PrintErrorVarArgs(const char* format, va_list args) -{ - vfprintf(stderr, format, args); -} diff --git a/src/bin/package/StandardErrorOutput.h b/src/bin/package/StandardErrorOutput.h deleted file mode 100644 index c619443180..0000000000 --- a/src/bin/package/StandardErrorOutput.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de. - * Distributed under the terms of the MIT License. - */ -#ifndef STANDARD_ERROR_OUTPUT_H -#define STANDARD_ERROR_OUTPUT_H - - -#include - - -using BPackageKit::BHPKG::BErrorOutput; - - -class StandardErrorOutput : public BErrorOutput { - virtual void PrintErrorVarArgs(const char* format, - va_list args); -}; - - -#endif // STANDARD_ERROR_OUTPUT_H diff --git a/src/bin/package/command_add.cpp b/src/bin/package/command_add.cpp index 36336842d3..601624c8b5 100644 --- a/src/bin/package/command_add.cpp +++ b/src/bin/package/command_add.cpp @@ -22,7 +22,6 @@ #include "package.h" #include "PackageWriterListener.h" #include "PackageWritingUtils.h" -#include "StandardErrorOutput.h" using namespace BPackageKit::BHPKG; diff --git a/src/bin/package/command_create.cpp b/src/bin/package/command_create.cpp index 1062185b5a..ff8ad02c9e 100644 --- a/src/bin/package/command_create.cpp +++ b/src/bin/package/command_create.cpp @@ -22,7 +22,6 @@ #include "package.h" #include "PackageWriterListener.h" #include "PackageWritingUtils.h" -#include "StandardErrorOutput.h" using BPackageKit::BHPKG::BPackageWriterListener; diff --git a/src/bin/package/command_dump.cpp b/src/bin/package/command_dump.cpp index fdf55d2d31..c25437e63b 100644 --- a/src/bin/package/command_dump.cpp +++ b/src/bin/package/command_dump.cpp @@ -17,9 +17,9 @@ #include #include #include +#include #include "package.h" -#include "StandardErrorOutput.h" using namespace BPackageKit::BHPKG; @@ -182,7 +182,7 @@ command_dump(int argc, const char* const* argv) const char* packageFileName = argv[optind++]; // open package - StandardErrorOutput errorOutput; + BStandardErrorOutput errorOutput; BPackageReader packageReader(&errorOutput); status_t error = packageReader.Init(packageFileName); if (error != B_OK) diff --git a/src/bin/package/command_extract.cpp b/src/bin/package/command_extract.cpp index a4cc3e903d..25311b6152 100644 --- a/src/bin/package/command_extract.cpp +++ b/src/bin/package/command_extract.cpp @@ -30,10 +30,10 @@ #include #include #include +#include #include #include "package.h" -#include "StandardErrorOutput.h" using namespace BPackageKit::BHPKG; @@ -688,7 +688,7 @@ command_extract(int argc, const char* const* argv) const char* packageFileName = argv[optind++]; // open package - StandardErrorOutput errorOutput; + BStandardErrorOutput errorOutput; BPackageReader packageReader(&errorOutput); status_t error = packageReader.Init(packageFileName); if (error != B_OK) diff --git a/src/bin/package/command_list.cpp b/src/bin/package/command_list.cpp index 317cec68fd..1cadda7c82 100644 --- a/src/bin/package/command_list.cpp +++ b/src/bin/package/command_list.cpp @@ -17,11 +17,11 @@ #include #include #include +#include #include #include "package.h" -#include "StandardErrorOutput.h" using namespace BPackageKit::BHPKG; @@ -320,7 +320,7 @@ command_list(int argc, const char* const* argv) const char* packageFileName = argv[optind++]; // open package - StandardErrorOutput errorOutput; + BStandardErrorOutput errorOutput; BPackageReader packageReader(&errorOutput); status_t error = packageReader.Init(packageFileName); if (error != B_OK) diff --git a/src/bin/package_repo/Jamfile b/src/bin/package_repo/Jamfile index 4563254d22..fe07930b58 100644 --- a/src/bin/package_repo/Jamfile +++ b/src/bin/package_repo/Jamfile @@ -5,13 +5,10 @@ UsePrivateHeaders kernel shared ; DEFINES += B_ENABLE_INCOMPLETE_POSIX_AT_SUPPORT ; # TODO: Remove when it is complete! -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src bin package ] ; - BinCommand package_repo : command_create.cpp command_list.cpp package_repo.cpp - StandardErrorOutput.cpp : package be $(TARGET_LIBSUPC++) diff --git a/src/bin/package_repo/command_create.cpp b/src/bin/package_repo/command_create.cpp index ab245c7aa3..d4bf2ba694 100644 --- a/src/bin/package_repo/command_create.cpp +++ b/src/bin/package_repo/command_create.cpp @@ -19,8 +19,7 @@ #include #include -#include "package.h" -#include "StandardErrorOutput.h" +#include "package_repo.h" using BPackageKit::BHPKG::BRepositoryWriterListener; diff --git a/src/bin/package_repo/command_list.cpp b/src/bin/package_repo/command_list.cpp index 0745b59fe2..ba2fe35af9 100644 --- a/src/bin/package_repo/command_list.cpp +++ b/src/bin/package_repo/command_list.cpp @@ -14,11 +14,11 @@ #include #include #include +#include #include #include -#include "package.h" -#include "StandardErrorOutput.h" +#include "package_repo.h" using namespace BPackageKit::BHPKG; @@ -287,7 +287,7 @@ command_list(int argc, const char* const* argv) const char* repositoryFileName = argv[optind++]; // open repository - StandardErrorOutput errorOutput; + BStandardErrorOutput errorOutput; BRepositoryReader repositoryReader(&errorOutput); status_t error = repositoryReader.Init(repositoryFileName); if (error != B_OK) diff --git a/src/kits/package/Jamfile b/src/kits/package/Jamfile index 207e6a1aa7..185a6b9949 100644 --- a/src/kits/package/Jamfile +++ b/src/kits/package/Jamfile @@ -71,6 +71,10 @@ SharedLibrary libpackage.so ValidateChecksumJob.cpp $(HPKG_SOURCES) + + # hpkg, but only libpackage + StandardErrorOutput.cpp + : libshared.a be z $(TARGET_LIBSTDC++) ; diff --git a/src/kits/package/hpkg/StandardErrorOutput.cpp b/src/kits/package/hpkg/StandardErrorOutput.cpp new file mode 100644 index 0000000000..3caed6cde8 --- /dev/null +++ b/src/kits/package/hpkg/StandardErrorOutput.cpp @@ -0,0 +1,26 @@ +/* + * Copyright 2009-2013, Ingo Weinhold, ingo_weinhold@gmx.de. + * Distributed under the terms of the MIT License. + */ + + +#include + +#include + + +namespace BPackageKit { + +namespace BHPKG { + + +void +BStandardErrorOutput::PrintErrorVarArgs(const char* format, va_list args) +{ + vfprintf(stderr, format, args); +} + + +} // namespace BHPKG + +} // namespace BPackageKit