travis: move 'make' into the install target

[apt.git] / apt-pkg / pkgsystem.h

diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h
index 75f7b9fcc3b6a236fa3b500b94e76d1c4d0c5587..5b31457e0bf8c71303b9b996d2a816c662eee3ef 100644 (file)
--- a/apt-pkg/pkgsystem.h
+++ b/apt-pkg/pkgsystem.h
@@ -1,13 +1,12 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: pkgsystem.h,v 1.6 2002/11/11 06:55:50 doogie Exp $

 /* ######################################################################
 
    System - Abstraction for running on different systems.
    
    Instances of this class can be thought of as factories or meta-classes
    for a variety of more specialized classes. Together this class and 
 /* ######################################################################
 
    System - Abstraction for running on different systems.
    
    Instances of this class can be thought of as factories or meta-classes
    for a variety of more specialized classes. Together this class and 

-   it's speciallized offspring completely define the environment and how
+   it's specialized offspring completely define the environment and how

    to access resources for a specific system. There are several sub
    areas that are all orthogonal - each system has a unique combination of
    these sub areas:
    to access resources for a specific system. There are several sub
    areas that are all orthogonal - each system has a unique combination of
    these sub areas:


@@ -23,7 +22,7 @@
        - Selection of local 'status' indexes that make up the pkgCache.
       
    It is important to note that the handling of index files is not a 
        - Selection of local 'status' indexes that make up the pkgCache.
       
    It is important to note that the handling of index files is not a 

-   function of the system. Index files are handled through a seperate 
+   function of the system. Index files are handled through a separate

    abstraction - the only requirement is that the index files have the
    same idea of versioning as the target system.
    
    abstraction - the only requirement is that the index files have the
    same idea of versioning as the target system.
    


@@ -38,6 +37,7 @@
 #define PKGLIB_PKGSYSTEM_H
 
 #include <apt-pkg/pkgcache.h>
 #define PKGLIB_PKGSYSTEM_H
 
 #include <apt-pkg/pkgcache.h>

+#include <apt-pkg/cacheiterators.h>

 
 #include <vector>
 
 
 #include <vector>
 


@@ -50,10 +50,9 @@ class pkgPackageManager;
 class pkgVersioningSystem;
 class Configuration;
 class pkgIndexFile;
 class pkgVersioningSystem;
 class Configuration;
 class pkgIndexFile;

-class PkgFileIterator;

 
 class pkgSystem
 
 class pkgSystem

-{   
+{

    public:
 
    // Global list of supported systems
    public:
 
    // Global list of supported systems


@@ -61,8 +60,8 @@ class pkgSystem
    static unsigned long GlobalListLen;
    static pkgSystem *GetSystem(const char *Label);
    
    static unsigned long GlobalListLen;
    static pkgSystem *GetSystem(const char *Label);
    

-   const char *Label;
-   pkgVersioningSystem *VS;
+   const char * const Label;
+   pkgVersioningSystem * const VS;

    
    /* Prevent other programs from touching shared data not covered by
       other locks (cache or state locks) */
    
    /* Prevent other programs from touching shared data not covered by
       other locks (cache or state locks) */


@@ -82,16 +81,21 @@ class pkgSystem
    virtual bool ArchiveSupported(const char *Type) = 0;
 
    // Return a list of system index files..
    virtual bool ArchiveSupported(const char *Type) = 0;
 
    // Return a list of system index files..

-   virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List) = 0;   
+   virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List) = 0;
+

    virtual bool FindIndex(pkgCache::PkgFileIterator File,
                          pkgIndexFile *&Found) const = 0;
    virtual bool FindIndex(pkgCache::PkgFileIterator File,
                          pkgIndexFile *&Found) const = 0;

-   
+

    /* Evauluate how 'right' we are for this system based on the filesystem
       etc.. */
    /* Evauluate how 'right' we are for this system based on the filesystem
       etc.. */

-   virtual signed Score(Configuration const &/*Cnf*/) {return 0;};
-   
-   pkgSystem();
-   virtual ~pkgSystem() {};
+   virtual signed Score(Configuration const &/*Cnf*/) {
+      return 0;
+   };
+
+   pkgSystem(char const * const Label, pkgVersioningSystem * const VS);
+   virtual ~pkgSystem();
+   private:
+   void * const d;

 };
 
 // The environment we are operating in.
 };
 
 // The environment we are operating in.