2002-07-15 Robert Collins <rbtcollins@hotmail.com>

[cygwin-apps/setup.git] / ini.h

diff --git a/ini.h b/ini.h
index 62d409f37c3adb30c7cd4e5263f7ef7f85246573..e667061b474fe4a1967c960a2e9afb11a3c9a59d 100644 (file)
--- a/ini.h
+++ b/ini.h
@@ -16,21 +16,15 @@
 #ifndef _INI_H_
 #define _INI_H_
 
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-  void ini_init (char *string);
+class io_stream;
+class String;
+class IniState;
+class IniDBBuilder;
+class IniParseFeedback;
+void ini_init (io_stream *, IniDBBuilder *, IniParseFeedback &);
 #define YYSTYPE char *
 
 #ifdef __cplusplus
-}
-#endif
-
-#ifdef __cplusplus
-/* For enums */
-#include "choose.h"
 
 /* When setup.ini is parsed, the information is stored according to
    the declarations here.  ini.cc (via inilex and iniparse)
@@ -39,19 +33,6 @@ extern "C"
    packages (the chosen "install" field).  install.cc installs
    selected packages. */
 
-/* the classes here store installation info *shrug* */
-
-/* lowest number must be most trusted, highest least trusted */
-typedef enum
-{
-  TRUST_UNKNOWN,
-  TRUST_PREV,
-  TRUST_CURR,
-  TRUST_TEST,
-  NTRUST
-}
-trusts;
-
 typedef enum
 {
   EXCLUDE_NONE = 0,
@@ -60,105 +41,6 @@ typedef enum
 }
 excludes;
 
-#define is_download_action(pkg) \
-  ((pkg)->action == ACTION_PREV || \
-   (pkg)->action == ACTION_CURR || \
-   (pkg)->action == ACTION_TEST || \
-   (pkg)->action == ACTION_REDO || \
-   (pkg)->action == ACTION_SRC_ONLY)
-
-#define is_upgrade_action(pkg) \
-  (((pkg)->action >= ACTION_CURR && \
-    (pkg)->action <= ACTION_TEST) || \
-   (pkg)->action == ACTION_REDO)
-
-#define is_uninstall_action(pkg) \
-  (is_upgrade_action (pkg) || \
-   (pkg)->action == ACTION_PREV || \
-   (pkg)->action == ACTION_UNINSTALL)
-
-#define is_full_action(pkg) \
-  (((pkg)->action >= ACTION_SAME_PREV && (pkg)->action <= ACTION_SAME_TEST) \
-   || (pkg)->action == ACTION_SKIP)
-
-#define SRCACTION_NO           0
-#define SRCACTION_YES          1
-typedef struct _Info
-{
-  char *version;               /* version part of filename */
-  char *install;               /* file name to install */
-  unsigned int install_size;   /* in bytes */
-  int install_exists;          /* install file exists on disk */
-  int derived;                 /* True if we "figured out" that this version should
-                                  go here but it was not in setup.ini */
-  char *source;                        /* sources for installed binaries */
-  unsigned int source_size;    /* in bytes */
-  int source_exists;           /* source file exists on disk */
-    _Info ():version (0), install (0), install_size (0), install_exists (0),
-    derived (0), source (0), source_size (0)
-  {
-  };
-  _Info (const char *_install, const char *_version,
-        int _install_size, const char *_source = NULL, int _source_size = 0);
-}
-
-Info;                          /* +1 for TRUST_UNKNOWN */
-
-class CategoryPackage
-{
-public:
-  CategoryPackage ():next (0), pkgname (0)
-  {
-  };
-  CategoryPackage *next;       /* The next package pointer in the list */
-  char *pkgname;               /* This should be Package *, but the packages can move */
-};
-
-typedef struct _Dependency
-{
-  struct _Dependency *next;    /* the next package in this dependency list */
-  char *package;               /* the name of the package that is depended on */
-}
-Dependency;                    /* Dependencies can be used for
-                                  recommended/required/related... */
-class Package
-{
-public:
-  Package ():name (0), sdesc (0), ldesc (0), category (0), required (0),
-    srcpicked (0), installed (0)
-  {
-  };
-  char *name;                  /* package name, like "cygwin" */
-  char *sdesc;                 /* short description (replaces "name" if provided) */
-  char *ldesc;                 /* long description (multi-line) */
-  Category *category;          /* the categories the package belongs to */
-  Dependency *required;                /* the packages required for this package to work */
-  actions action;              /* A range of states applicable to this package */
-  trusts trust;                        /* Selects among info[] below, a subset of action */
-  int srcpicked;               /* True if source is required */
-
-  Info *installed;             /* Info on installed package */
-  trusts installed_ix;         /* Index into info array for currently installed package */
-  excludes exclude;            /* true if this package should be excluded */
-
-  /* The reason for this weird layout is to allow for loops that scan either
-     the info array, based on trust value or the infoscan array based on a pointer,
-     looking for a particular version. */
-  Info info[1];                        /* First element.  Intentionally allocated prior
-                                  to infoscan */
-  Info infoscan[NTRUST - 1];   /* +1 for TRUST_UNKNOWN */
-  Info infoend[0];             /* end marker */
-};
-
-extern Package *package;
-extern int npackages;
-
-Package *new_package (char *name);
-Package *getpkgbyname (const char *pkgname);
-void new_requirement (Package * package, char *dependson);
-Category *getpackagecategorybyname (Package * pkg, const char *categoryname);
-void add_category (Package * package, Category * cat);
-
 #endif
 
 #endif /* _INI_H_ */