2001-01-06 Robert Collins <rbtcollins@hotmail.com>

        * cygpackage.h (cygpackage): Make set_[s|l]desc virtual.
        * iniparse.y (add_correct_version): Copy descriptions across.
        * package_meta.cc (SDesc): Iterate through versions, return the first with a
        description.
        * package_version.h (packageversion): Add new virtuals set_[l|s]desc.

diff --git a/ChangeLog b/ChangeLog
index bbdec8a526bdae1a91802276654f3f4f39f6fb47..6abd6b84533a17d099d3943b174e25e6569a6a23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-06  Robert Collins  <rbtcollins@hotmail.com>
+
+       * cygpackage.h (cygpackage): Make set_[s|l]desc virtual.
+       * iniparse.y (add_correct_version): Copy descriptions across.
+       * package_meta.cc (SDesc): Iterate through versions, return the first with a 
+       description.
+       * package_version.h (packageversion): Add new virtuals set_[l|s]desc.
+
 2001-01-04  Robert Collins  <rbtcollins@hotmail.com>
 
        * script.cc (run_script): Change cygpath:// to cygfile://.

diff --git a/cygpackage.h b/cygpackage.h
index f1445319d0a9d21933cb75f66ab701255b091a05..e5897704da2191bb5e8edd72cf2b8c02a4ea6be4 100644 (file)
--- a/cygpackage.h
+++ b/cygpackage.h
@@ -35,8 +35,8 @@ public:
   {
     return type;
   };
-  void set_sdesc (char const *);
-  void set_ldesc (char const *);
+  virtual void set_sdesc (char const *);
+  virtual void set_ldesc (char const *);
   virtual char const *SDesc ()
   {
     return sdesc;

diff --git a/iniparse.y b/iniparse.y
index 960244685eeee08bb94e3804b6eb52c717337ee9..f5c3698786378ea2b798a8e379bb6ad675d94a76 100644 (file)
--- a/iniparse.y
+++ b/iniparse.y
@@ -148,8 +148,8 @@ categories
 void
 add_correct_version()
 {
-       int merged = 0;
-    for (size_t n = 1; !merged && n <= cp->versions.number (); n++)
+  int merged = 0;
+  for (size_t n = 1; !merged && n <= cp->versions.number (); n++)
       if (!strcasecmp(cp->versions[n]->Canonical_version(), cpv->Canonical_version()))
       {
        /* ASSUMPTIONS:
@@ -162,6 +162,11 @@ add_correct_version()
        /* Ditto for src */
        if (cpv->src.sites.number ())
          cp->versions[n]->src.sites.registerbykey (cpv->src.sites[1]->key);
+       /* Copy the descriptions across */
+       if (cpv->SDesc () && !cp->versions[n]->SDesc ())
+         cp->versions[n]->set_sdesc (cpv->SDesc ());
+       if (cpv->LDesc () && !cp->versions[n]->LDesc ())
+         cp->versions[n]->set_ldesc (cpv->LDesc ());
        cpv = (cygpackage *)cp->versions[n];
        merged = 1;
       }

diff --git a/package_meta.cc b/package_meta.cc
index 8abc89bb1d3021c65e83eded245aeae80a6afa0d..77f508db47b0f6502bfc8e0a34f3ad8d18027269 100644 (file)
--- a/package_meta.cc
+++ b/package_meta.cc
@@ -156,7 +156,10 @@ packagemeta::add_category (Category & cat)
 char const *
 packagemeta::SDesc () const
 {
-  return versions[1]->SDesc ();
+  for (size_t n = 1; n <= versions.number(); ++n)
+    if (versions[n]->SDesc ())
+      return versions[n]->SDesc ();
+  return NULL;
 };
 
 /* Return an appropriate caption given the current action. */

diff --git a/package_version.h b/package_version.h
index 68255d1bb9dc3a968ab949a3280d663c36996439..3a305999892a4e6e855e8b9ce0a74b930c21f213 100644 (file)
--- a/package_version.h
+++ b/package_version.h
@@ -95,7 +95,9 @@ public:
   virtual const char *getfirstfile () = 0;
   virtual const char *getnextfile () = 0;
   virtual char const *SDesc () = 0;
+  virtual void set_sdesc (char const *) = 0;
   virtual char const *LDesc () = 0;
+  virtual void set_ldesc (char const *) = 0;
   /* FIXME: review this - these are UI variables, should be consistent across all
    * children package types
    */