Author: dmacvicar
Date: Wed Jun 13 23:50:32 2007
New Revision: 5746
URL: http://svn.opensuse.org/viewcvs/zypp?rev=5746&view=rev
Log:
- compile all resolvables
Modified:
trunk/libzypp/zypp/CMakeLists.txt
trunk/libzypp/zypp/repo/memory/AtomImpl.cc
trunk/libzypp/zypp/repo/memory/AtomImpl.h
trunk/libzypp/zypp/repo/memory/PackageImpl.cc
trunk/libzypp/zypp/repo/memory/PackageImpl.h
trunk/libzypp/zypp/repo/memory/PatchImpl.cc
trunk/libzypp/zypp/repo/memory/PatchImpl.h
trunk/libzypp/zypp/repo/memory/PatternImpl.cc
trunk/libzypp/zypp/repo/memory/PatternImpl.h
trunk/libzypp/zypp/repo/memory/ProductImpl.cc
trunk/libzypp/zypp/repo/memory/ProductImpl.h
trunk/libzypp/zypp/repo/memory/ScriptImpl.cc
trunk/libzypp/zypp/repo/memory/SrcPackageImpl.cc
trunk/libzypp/zypp/repo/memory/SrcPackageImpl.h
Modified: trunk/libzypp/zypp/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=5746&r1=5745&r2=5746&view=diff
==============================================================================
--- trunk/libzypp/zypp/CMakeLists.txt (original)
+++ trunk/libzypp/zypp/CMakeLists.txt Wed Jun 13 23:50:32 2007
@@ -1115,19 +1115,21 @@
SET( zypp_repo_data_SRCS
repo/memory/PackageImpl.cc
-# repo/memory/PatternImpl.cc
-# repo/memory/ProductImpl.cc
-# repo/memory/PatchImpl.cc
-# repo/memory/RepoImpl.cc
+ repo/memory/PatternImpl.cc
+ repo/memory/ProductImpl.cc
+ repo/memory/PatchImpl.cc
+ repo/memory/RepoImpl.cc
+ repo/memory/AtomImpl.cc
repo/memory/SrcPackageImpl.cc
)
SET( zypp_repo_data_HEADERS
repo/memory/PackageImpl.h
-# repo/memory/PatternImpl.h
-# repo/memory/ProductImpl.h
-# repo/memory/PatchImpl.h
-# repo/memory/RepoImpl.h
+ repo/memory/PatternImpl.h
+ repo/memory/ProductImpl.h
+ repo/memory/PatchImpl.h
+ repo/memory/RepoImpl.h
+ repo/memory/AtomImpl.h
repo/memory/SrcPackageImpl.h
)
Modified: trunk/libzypp/zypp/repo/memory/AtomImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/memory/AtomImpl.cc?rev=5746&r1=5745&r2=5746&view=diff
==============================================================================
--- trunk/libzypp/zypp/repo/memory/AtomImpl.cc (original)
+++ trunk/libzypp/zypp/repo/memory/AtomImpl.cc Wed Jun 13 23:50:32 2007
@@ -29,9 +29,8 @@
/** Default ctor
*/
-AtomImpl::AtomImpl (const data::RecordId &id, memory::RepoImpl::Ptr repository_r)
- : _repository (repository_r),
- _id(id)
+AtomImpl::AtomImpl ( memory::RepoImpl::Ptr repo, data::Atom_Ptr ptr)
+ : _repository (repo)
{}
Repository
@@ -104,21 +103,6 @@
return _media_nr;
}
-
-//////////////////////////////////////////
-// DEPRECATED
-//////////////////////////////////////////
-
-Source_Ref AtomImpl::source() const
-{
- return Source_Ref::noSource;
-}
-
-unsigned AtomImpl::mediaNr() const
-{
- return 1;
-}
-
/////////////////////////////////////////////////////////////////
} } } // namespace zypp::repo::memory
///////////////////////////////////////////////////////////////////
Modified: trunk/libzypp/zypp/repo/memory/AtomImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/memory/AtomImpl.h?rev=5746&r1=5745&r2=5746&view=diff
==============================================================================
--- trunk/libzypp/zypp/repo/memory/AtomImpl.h (original)
+++ trunk/libzypp/zypp/repo/memory/AtomImpl.h Wed Jun 13 23:50:32 2007
@@ -29,7 +29,7 @@
{
public:
- AtomImpl( const data::RecordId &id, repo::memory::RepoImpl::Ptr repository_r );
+ AtomImpl( memory::RepoImpl::Ptr repo, data::Atom_Ptr ptr);
virtual TranslatedText summary() const;
virtual TranslatedText description() const;
@@ -43,7 +43,6 @@
virtual Date buildtime() const;
virtual Date installtime() const;
- virtual Source_Ref source() const;
virtual unsigned mediaNr() const;
virtual Repository repository() const;
Modified: trunk/libzypp/zypp/repo/memory/PackageImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/memory/PackageImpl.cc?rev=5746&r1=5745&r2=5746&view=diff
==============================================================================
--- trunk/libzypp/zypp/repo/memory/PackageImpl.cc (original)
+++ trunk/libzypp/zypp/repo/memory/PackageImpl.cc Wed Jun 13 23:50:32 2007
@@ -30,7 +30,7 @@
//
PackageImpl::PackageImpl( repo::memory::RepoImpl::Ptr repo, data::Package_Ptr ptr)
: _repository(repo),
-
+
_summary(ptr->summary),
_description(ptr->description),
_insnotify(ptr->insnotify),
Modified: trunk/libzypp/zypp/repo/memory/PackageImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/memory/PackageImpl.h?rev=5746&r1=5745&r2=5746&view=diff
==============================================================================
--- trunk/libzypp/zypp/repo/memory/PackageImpl.h (original)
+++ trunk/libzypp/zypp/repo/memory/PackageImpl.h Wed Jun 13 23:50:32 2007
@@ -58,7 +58,7 @@
virtual std::string packager() const;
virtual PackageGroup group() const;
virtual Keywords keywords() const;
- virtual Changelog changelog() const;
+ virtual Changelog changelog() const;
virtual Pathname location() const;
virtual std::string url() const;
virtual std::string os() const;
@@ -88,13 +88,13 @@
unsigned _media_nr;
PackageGroup _group;
- Keywords _keywords;
+ Keywords _keywords;
std::liststd::string _authors;
Label _license;
Pathname _location;
DiskUsage _diskusage;
CheckSum _checksum;
-private:
+ private:
};
///////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////
Modified: trunk/libzypp/zypp/repo/memory/PatchImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/memory/PatchImpl.cc?rev=5746&r1=5745&r2=5746&view=diff
==============================================================================
--- trunk/libzypp/zypp/repo/memory/PatchImpl.cc (original)
+++ trunk/libzypp/zypp/repo/memory/PatchImpl.cc Wed Jun 13 23:50:32 2007
@@ -13,7 +13,6 @@
#include "zypp/repo/RepositoryImpl.h"
#include "PatchImpl.h"
-
using namespace std;
using namespace zypp::detail;
using namespace::zypp::repo;
@@ -21,16 +20,26 @@
///////////////////////////////////////////////////////////////////
namespace zypp { namespace repo { namespace memory {
-///////////////////////////////////////////////////////////////////
-//
-// CLASS NAME : PatchImpl
-//
-///////////////////////////////////////////////////////////////////
-
-/** Default ctor
-*/
PatchImpl::PatchImpl ( repo::memory::RepoImpl::Ptr repo, data::Patch_Ptr ptr)
- : _repository(repo)
+ : _repository(repo),
+
+ _summary(ptr->summary),
+ _description(ptr->description),
+ _insnotify(ptr->insnotify),
+ _delnotify(ptr->delnotify),
+ _license_to_confirm(ptr->licenseToConfirm),
+ _vendor(ptr->vendor),
+ _size(ptr->installedSize),
+ //_archivesize(ptr->repositoryLocation.fileSize),
+ _install_only(false),
+ _buildtime(ptr->buildTime),
+ //_media_nr(ptr->repositoryLocation.mediaNr),
+
+ _patch_id(ptr->id),
+ _timestamp(ptr->timestamp),
+ _category(ptr->category),
+ _reboot_needed(ptr->rebootNeeded),
+ _affects_pkg_manager(ptr->affectsPkgManager)
{}
Repository
@@ -103,19 +112,18 @@
return _media_nr;
}
-
//////////////////////////////////////////
// PATCH
/////////////////////////////////////////
std::string PatchImpl::id() const
{
- return _repository->resolvableQuery().queryStringAttribute( _id, "Patch", "id" );
+ return _patch_id;
}
Date PatchImpl::timestamp() const
{
- return _patch_id;
+ return _timestamp;
}
std::string PatchImpl::category() const
@@ -125,7 +133,7 @@
bool PatchImpl::reboot_needed() const
{
- return _reboot_nedeed;
+ return _reboot_needed;
}
bool PatchImpl::affects_pkg_manager() const
Modified: trunk/libzypp/zypp/repo/memory/PatchImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/memory/PatchImpl.h?rev=5746&r1=5745&r2=5746&view=diff
==============================================================================
--- trunk/libzypp/zypp/repo/memory/PatchImpl.h (original)
+++ trunk/libzypp/zypp/repo/memory/PatchImpl.h Wed Jun 13 23:50:32 2007
@@ -22,10 +22,6 @@
namespace memory
{ /////////////////////////////////////////////////////////////////
- ///////////////////////////////////////////////////////////////////
- //
- // CLASS NAME : PatchImpl
- //
class PatchImpl : public detail::PatchImplIf
{
public:
Modified: trunk/libzypp/zypp/repo/memory/PatternImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/memory/PatternImpl.cc?rev=5746&r1=5745&r2=5746&view=diff
==============================================================================
--- trunk/libzypp/zypp/repo/memory/PatternImpl.cc (original)
+++ trunk/libzypp/zypp/repo/memory/PatternImpl.cc Wed Jun 13 23:50:32 2007
@@ -6,9 +6,7 @@
| /_____||_| |_| |_| |
| |
\---------------------------------------------------------------------*/
-/** \file zypp/repository/memory/PatternImpl.cc
- *
-*/
+
#include "zypp/repo/memory/PatternImpl.h"
using namespace std;
@@ -21,13 +19,21 @@
{ /////////////////////////////////////////////////////////////////
namespace memory
{
-///////////////////////////////////////////////////////////////////
-//
-// METHOD NAME : PatternImpl::PatternImpl
-// METHOD TYPE : Ctor
-//
+
PatternImpl::PatternImpl( repo::memory::RepoImpl::Ptr repo, data::Pattern_Ptr ptr)
- : _repository(repo)
+ : _repository(repo),
+ _summary(ptr->summary),
+ _description(ptr->description),
+ _insnotify(ptr->insnotify),
+ _delnotify(ptr->delnotify),
+ _license_to_confirm(ptr->licenseToConfirm),
+ _vendor(ptr->vendor),
+ _size(ptr->installedSize),
+ //_archivesize(ptr->repositoryLocation.fileSize),
+ _install_only(false),
+ _buildtime(ptr->buildTime)
+ //_media_nr(ptr->repositoryLocation.mediaNr)
+ //TODO pattern attrs
{
}
@@ -35,6 +41,13 @@
PatternImpl::~PatternImpl()
{}
+Repository
+PatternImpl::repository() const
+{
+ return _repository->selfRepository();
+}
+
+
///////////////////////////////////////////////////
// ResObject Attributes
///////////////////////////////////////////////////
@@ -102,22 +115,22 @@
///////////////////////////////////////
-TranslatedText PatternImpl::category()
+TranslatedText PatternImpl::category() const
{
return _category;
}
-bool PatternImpl::userVisible()
+bool PatternImpl::userVisible() const
{
return _visible;
}
-Label PatternImpl::order()
+Label PatternImpl::order() const
{
return _order;
}
-Pathname PatternImpl::icon()
+Pathname PatternImpl::icon() const
{
return _icon;
}
Modified: trunk/libzypp/zypp/repo/memory/PatternImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/memory/PatternImpl.h?rev=5746&r1=5745&r2=5746&view=diff
==============================================================================
--- trunk/libzypp/zypp/repo/memory/PatternImpl.h (original)
+++ trunk/libzypp/zypp/repo/memory/PatternImpl.h Wed Jun 13 23:50:32 2007
@@ -14,7 +14,8 @@
#include "zypp/detail/PatternImplIf.h"
#include "zypp/data/ResolvableData.h"
-#include "zypp/Source.h"
+#include "zypp/Repository.h"
+#include "zypp/repo/memory/RepoImpl.h"
///////////////////////////////////////////////////////////////////
namespace zypp
@@ -25,18 +26,14 @@
namespace memory
{
- ///////////////////////////////////////////////////////////////////
- //
- // CLASS NAME : PatternImpl
- //
- /**
- */
struct PatternImpl : public zypp::detail::PatternImplIf
{
public:
- PatternImpl( repo::memory::RepoImpl::Ptr repo, data::Pattern_Ptr ptr);
+ PatternImpl( memory::RepoImpl::Ptr repo, data::Pattern_Ptr ptr);
virtual ~PatternImpl();
+ virtual Repository repository() const;
+
virtual TranslatedText summary() const;
virtual TranslatedText description() const;
virtual TranslatedText insnotify() const;
@@ -50,11 +47,14 @@
virtual Date installtime() const;
virtual unsigned mediaNr() const;
+ virtual TranslatedText category() const;
virtual bool userVisible() const;
virtual Label order() const;
virtual Pathname icon() const;
private:
+ repo::memory::RepoImpl::Ptr _repository;
+
//ResObject
TranslatedText _summary;
TranslatedText _description;
Modified: trunk/libzypp/zypp/repo/memory/ProductImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/memory/ProductImpl.cc?rev=5746&r1=5745&r2=5746&view=diff
==============================================================================
--- trunk/libzypp/zypp/repo/memory/ProductImpl.cc (original)
+++ trunk/libzypp/zypp/repo/memory/ProductImpl.cc Wed Jun 13 23:50:32 2007
@@ -6,9 +6,7 @@
| /_____||_| |_| |_| |
| |
\---------------------------------------------------------------------*/
-/** \file zypp/repo/memory/ProductImpl.cc
- *
-*/
+
#include "zypp/repo/memory/ProductImpl.h"
using namespace std;
@@ -16,96 +14,155 @@
///////////////////////////////////////////////////////////////////
namespace zypp
{ /////////////////////////////////////////////////////////////////
- ///////////////////////////////////////////////////////////////////
- namespace repo
- { /////////////////////////////////////////////////////////////////
- ///////////////////////////////////////////////////////////////////
- namespace memory
- { /////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////
- //
- // METHOD NAME : ProductImpl::ProductImpl
- // METHOD TYPE : Ctor
- //
- ProductImpl::ProductImpl(data::Product_Ptr ptr)
- {}
-
- ///////////////////////////////////////////////////////////////////
- //
- // METHOD NAME : ProductImpl::~ProductImpl
- // METHOD TYPE : Dtor
- //
- ProductImpl::~ProductImpl()
- {}
-
-
- std::string ProductImpl::category() const
- {
- return _category;
- }
-
- Label ProductImpl::vendor() const
- {
- return _vendor;
- }
-
- TranslatedText ProductImpl::summary() const
- {
- return _summary;
- }
-
- Source_Ref ProductImpl::source() const
- {
- return Source_Ref::noSource;
- }
-
- Url ProductImpl::releaseNotesUrl() const
- {
- return _release_notes_url;
- }
-
- std::list<Url> ProductImpl::updateUrls() const
- {
- return _update_urls;
- }
-
- std::list<Url> ProductImpl::extraUrls() const
- {
- return _extra_urls;
- }
-
- std::list<Url> ProductImpl::optionalUrls() const
- {
- return _optional_urls;
- }
-
- std::liststd::string ProductImpl::flags() const
- {
- return _flags;
- }
-
- TranslatedText ProductImpl::shortName() const
- {
- return TranslatedText(_shortlabel);
- }
-
- std::string ProductImpl::distributionName() const
- {
- return _dist_name;
- }
-
- Edition ProductImpl::distributionEdition() const
- {
- return _dist_version;
- }
-
- /////////////////////////////////////////////////////////////////
- } // namespace memory
- ///////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////
- } // namespace repository
- ///////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////
+namespace repo
+{ /////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////
+namespace memory
+{ /////////////////////////////////////////////////////////////////
+
+ProductImpl::ProductImpl( memory::RepoImpl::Ptr repo, data::Product_Ptr ptr)
+ : _repository(repo),
+ _summary(ptr->summary),
+ _description(ptr->description),
+ _insnotify(ptr->insnotify),
+ _delnotify(ptr->delnotify),
+ _license_to_confirm(ptr->licenseToConfirm),
+ _vendor(ptr->vendor),
+ _size(ptr->installedSize),
+ //_archivesize(ptr->repositoryLocation.fileSize),
+ _install_only(false),
+ _buildtime(ptr->buildTime)
+ //_media_nr(ptr->repositoryLocation.mediaNr)
+ // TODO products attrs
+{}
+
+ProductImpl::~ProductImpl()
+{}
+
+Repository
+ProductImpl::repository() const
+{
+ return _repository->selfRepository();
+}
+
+///////////////////////////////////////////////////
+// ResObject Attributes
+///////////////////////////////////////////////////
+
+TranslatedText ProductImpl::summary() const
+{
+ return _summary;
+}
+
+TranslatedText ProductImpl::description() const
+{
+ return _description;
+}
+
+TranslatedText ProductImpl::insnotify() const
+{
+ return _insnotify;
+}
+
+TranslatedText ProductImpl::delnotify() const
+{
+ return _delnotify;
+}
+
+TranslatedText ProductImpl::licenseToConfirm() const
+{
+ return _license_to_confirm;
+}
+
+Vendor ProductImpl::vendor() const
+{
+ return _vendor;
+}
+
+ByteCount ProductImpl::size() const
+{
+ return _size;
+}
+
+ByteCount ProductImpl::archivesize() const
+{
+ return _archivesize;
+}
+
+bool ProductImpl::installOnly() const
+{
+ return _install_only;
+}
+
+Date ProductImpl::buildtime() const
+{
+ return _buildtime;
+}
+
+Date ProductImpl::installtime() const
+{
+ return _installtime;
+}
+
+unsigned ProductImpl::mediaNr() const
+{
+ return _media_nr;
+}
+
+///////////////////////////////////////////
+
+std::string ProductImpl::category() const
+{
+ return _category;
+}
+
+Url ProductImpl::releaseNotesUrl() const
+{
+ return _release_notes_url;
+}
+
+std::list<Url> ProductImpl::updateUrls() const
+{
+ return _update_urls;
+}
+
+std::list<Url> ProductImpl::extraUrls() const
+{
+ return _extra_urls;
+}
+
+std::list<Url> ProductImpl::optionalUrls() const
+{
+ return _optional_urls;
+}
+
+std::liststd::string ProductImpl::flags() const
+{
+ return _flags;
+}
+
+TranslatedText ProductImpl::shortName() const
+{
+ return TranslatedText(_shortlabel);
+}
+
+std::string ProductImpl::distributionName() const
+{
+ return _dist_name;
+}
+
+Edition ProductImpl::distributionEdition() const
+{
+ return _dist_version;
+}
+
+/////////////////////////////////////////////////////////////////
+} // namespace memory
+///////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////
+} // namespace repository
+///////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////
} // namespace zypp
///////////////////////////////////////////////////////////////////
Modified: trunk/libzypp/zypp/repo/memory/ProductImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/memory/ProductImpl.h?rev=5746&r1=5745&r2=5746&view=diff
==============================================================================
--- trunk/libzypp/zypp/repo/memory/ProductImpl.h (original)
+++ trunk/libzypp/zypp/repo/memory/ProductImpl.h Wed Jun 13 23:50:32 2007
@@ -21,6 +21,8 @@
#include "zypp/data/ResolvableData.h"
#include "zypp/TranslatedText.h"
+#include "zypp/repo/memory/RepoImpl.h"
+
///////////////////////////////////////////////////////////////////
namespace zypp
{ /////////////////////////////////////////////////////////////////
@@ -31,64 +33,68 @@
namespace memory
{ /////////////////////////////////////////////////////////////////
- ///////////////////////////////////////////////////////////////////
- //
- // CLASS NAME : ProductImpl
- //
- /**
- */
struct ProductImpl : public zypp::detail::ProductImplIf
{
public:
- ProductImpl(data::Product_Ptr ptr);
+ ProductImpl( memory::RepoImpl::Ptr repo, data::Product_Ptr ptr);
virtual ~ProductImpl();
- virtual std::string category() const;
- virtual Label vendor() const;
+ virtual Repository repository() const;
+
virtual TranslatedText summary() const;
- virtual Source_Ref source() const;
+ virtual TranslatedText description() const;
+ virtual TranslatedText insnotify() const;
+ virtual TranslatedText delnotify() const;
+ virtual TranslatedText licenseToConfirm() const;
+ virtual Vendor vendor() const;
+ virtual ByteCount size() const;
+ virtual ByteCount archivesize() const;
+ virtual bool installOnly() const;
+ virtual Date buildtime() const;
+ virtual Date installtime() const;
+ virtual unsigned mediaNr() const;
+
+ virtual std::string category() const;
virtual Url releaseNotesUrl() const;
-
virtual std::list<Url> updateUrls() const;
virtual std::list<Url> extraUrls() const;
virtual std::list<Url> optionalUrls() const;
-
virtual std::liststd::string flags() const;
virtual TranslatedText shortName() const;
virtual std::string distributionName() const;
virtual Edition distributionEdition() const;
- std::string _category;
+ repo::memory::RepoImpl::Ptr _repository;
+
+ //ResObject
+ TranslatedText _summary;
+ TranslatedText _description;
+ TranslatedText _insnotify;
+ TranslatedText _delnotify;
+ TranslatedText _license_to_confirm;
+ Vendor _vendor;
+ ByteCount _size;
+ ByteCount _archivesize;
+ bool _install_only;
+ Date _buildtime;
+ Date _installtime;
+ unsigned _media_nr;
- std::string _name;
- std::string _version;
+ std::string _category;
std::string _dist_name;
Edition _dist_version;
-
std::string _base_product;
std::string _base_version;
std::string _you_type;
std::string _shortlabel;
- std::string _vendor;
Url _release_notes_url;
std::list<Url> _update_urls;
std::list<Url> _extra_urls;
std::list<Url> _optional_urls;
- std::map< std::string, std::liststd::string > _arch; // map of 'arch : "arch1 arch2 arch3"', arch1 being 'best', arch3 being 'noarch' (ususally)
std::string _default_base;
- Dependencies _deps;
- std::liststd::string _languages;
- TranslatedText _summary;
- std::string _description_dir;
- std::string _data_dir;
std::liststd::string _flags;
- std::string _language;
- std::string _timezone;
-
- std::map