From b639ac90470500034c3c362160f9314dfce5d6f2 Mon Sep 17 00:00:00 2001
From: Martin Konrad <konrad@ikp.tu-darmstadt.de>
Date: Thu, 31 Mar 2011 18:48:36 +0200
Subject: [PATCH 2/3] Add inter-component group dependencies to component groups.

This functionality can be used to handle dependencies between packages
(e.g. Debs or RPMs) automatically.
---
 Source/CPack/cmCPackComponentGroup.h |    6 ++++
 Source/CPack/cmCPackGenerator.cxx    |   44 ++++++++++++++++++++++++++++++++++
 Source/CPack/cmCPackGenerator.h      |    1 +
 3 files changed, 51 insertions(+), 0 deletions(-)

diff --git a/Source/CPack/cmCPackComponentGroup.h b/Source/CPack/cmCPackComponentGroup.h
index cebdd6d..b7777b6 100644
--- a/Source/CPack/cmCPackComponentGroup.h
+++ b/Source/CPack/cmCPackComponentGroup.h
@@ -133,6 +133,12 @@ public:
 
   /// The subgroups of this group.
   std::vector<cmCPackComponentGroup*> Subgroups;
+
+  /// The component groups that this component group depends on.
+  std::vector<cmCPackComponentGroup *> Dependencies;
+
+  /// The component groups that depend on this component group.
+  std::vector<cmCPackComponentGroup *> ReverseDependencies;
 };
 
 #endif
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 5f314c6..76b91cb 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -1556,3 +1556,47 @@ cmCPackGenerator::GetComponentGroup(const char *projectName, const char *name)
     }
   return group;
 }
+
+//----------------------------------------------------------------------
+void cmCPackGenerator::ComputeComponentGroupDeps()
+{
+  // loop over all component groups
+  std::map<std::string, cmCPackComponentGroup>::iterator compGIt;
+  for (compGIt = ComponentGroups.begin(); compGIt != ComponentGroups.end(); ++compGIt)
+  {
+    cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Computing dependencies for component group \"" << compGIt->first << "\"" << std::endl);
+
+    // loop over all components of the current component group
+    std::vector<cmCPackComponent*>::iterator compIt;
+    for (compIt = compGIt->second.Components.begin(); compIt != compGIt->second.Components.end(); ++compIt)
+    {
+      cmCPackLogger(cmCPackLog::LOG_DEBUG, "Component group \"" << compGIt->first << "\" contains component \"" << (*compIt)->Name << "\"" << std::endl);
+      std::string depMacro = "CPACK_COMPONENT_";
+      depMacro += cmSystemTools::UpperCase((*compIt)->Name);
+      depMacro += "_DEPENDS";
+      const char *compDepends = this->GetOption((depMacro).c_str());
+      if (compDepends && *compDepends)
+      {
+        cmCPackLogger(cmCPackLog::LOG_DEBUG, "Component \"" << (*compIt)->Name << "\" depends on \"" << compDepends << "\"" << std::endl);
+
+        std::vector<std::string> dependsVector;
+        cmSystemTools::ExpandListArgument(compDepends, dependsVector);
+
+        // loop over all component names the current component depends on
+        std::vector<std::string>::iterator dependIt;
+        for (dependIt = dependsVector.begin(); dependIt != dependsVector.end(); ++dependIt)
+        {
+          // get the component object from the component name
+          cmCPackComponent *dependComp = &this->Components[*dependIt];
+          // find out the component group for the component we depend on
+          cmCPackComponentGroup *dependGroup = dependComp->Group;
+          cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Component group \"" << compGIt->second.Name << "\" depends on component group \"" << dependGroup->Name << "\"" << std::endl);
+          // add dependency to component group objects
+          compGIt->second.Dependencies.push_back(dependGroup);
+          dependGroup->ReverseDependencies.push_back(&compGIt->second);
+        }
+      }
+    }
+  }
+  return;
+}
diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h
index 0497d1c..c365ed4 100644
--- a/Source/CPack/cmCPackGenerator.h
+++ b/Source/CPack/cmCPackGenerator.h
@@ -194,6 +194,7 @@ protected:
                                          const char* name);
   virtual cmCPackComponentGroup* GetComponentGroup(const char *projectName,
                                                    const char* name);
+  virtual void ComputeComponentGroupDeps();
 
   bool GeneratorVerbose;
   std::string Name;
-- 
1.7.1

From 1cd8e4eb5cf522ee4b6fbac02404c525169b53b6 Mon Sep 17 00:00:00 2001
From: Martin Konrad <konrad@ikp.tu-darmstadt.de>
Date: Thu, 31 Mar 2011 23:39:13 +0200
Subject: [PATCH 3/3] CPackDeb: Add support for automatic package dependencies.

Dependencies between Debian packages are calculated from
inter-component group dependencies automatically.
---
 Source/CPack/cmCPackDebGenerator.cxx |   44 ++++++++++++++++++++++++++++++++-
 1 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index d3320c0..af2fd58 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -63,6 +63,7 @@ int cmCPackDebGenerator::PackageComponents(bool ignoreGroup)
   // unless CPACK_COMPONENTS_IGNORE_GROUP is specified.
   if (!ignoreGroup)
     {
+    this->ComputeComponentGroupDeps();
     std::map<std::string, cmCPackComponentGroup>::iterator compGIt;
     for (compGIt=this->ComponentGroups.begin();
         compGIt!=this->ComponentGroups.end(); ++compGIt)
@@ -70,6 +71,29 @@ int cmCPackDebGenerator::PackageComponents(bool ignoreGroup)
       cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Packaging component group: "
           << compGIt->first
           << std::endl);
+
+      // Get automatic dependencies
+      std::string autoDependencies;
+      std::vector<cmCPackComponentGroup *>::iterator depIt;
+      for (depIt = compGIt->second.Dependencies.begin();
+            depIt != compGIt->second.Dependencies.end();
+            ++depIt)
+        {
+        if(autoDependencies != "")
+          {
+          autoDependencies += ", ";
+          }
+        autoDependencies += cmsys::SystemTools::LowerCase(
+            this->GetOption("CPACK_PACKAGE_NAME")
+            );
+        autoDependencies += "-";
+        autoDependencies += cmsys::SystemTools::LowerCase((*depIt)->Name);
+        }
+      this->SetOption(
+          "CPACK_DEBIAN_PACKAGE_AUTODEPENDS",
+          autoDependencies.c_str()
+          );
+
       // Begin the archive for this group
       std::string localToplevel(initialTopLevel);
       std::string packageFileName(
@@ -329,7 +353,23 @@ int cmCPackDebGenerator::createDeb()
   const char* desc =       this->GetOption("CPACK_DEBIAN_PACKAGE_DESCRIPTION");
 
   // optional entries
+  std::string deps, autoDeps;
   const char* debian_pkg_dep = this->GetOption("CPACK_DEBIAN_PACKAGE_DEPENDS");
+  if(debian_pkg_dep && *debian_pkg_dep)
+    {
+    deps = std::string(debian_pkg_dep);
+    }
+  const char* debian_pkg_autodepends = this->GetOption("CPACK_DEBIAN_PACKAGE_AUTODEPENDS");
+  if(debian_pkg_autodepends && *debian_pkg_autodepends)
+    {
+    autoDeps = std::string(debian_pkg_autodepends);
+    }
+  if(autoDeps != "" && deps != "")
+    {
+    autoDeps += ", ";
+    }
+  deps = autoDeps + deps;
+
   const char* debian_pkg_rec =
                             this->GetOption("CPACK_DEBIAN_PACKAGE_RECOMMENDS");
   const char* debian_pkg_sug =
@@ -356,9 +396,9 @@ int cmCPackDebGenerator::createDeb()
     out << "Section: " << debian_pkg_section << "\n";
     out << "Priority: " << debian_pkg_priority << "\n";
     out << "Architecture: " << debian_pkg_arch << "\n";
-    if(debian_pkg_dep && *debian_pkg_dep)
+    if(deps != "")
       {
-      out << "Depends: " << debian_pkg_dep << "\n";
+      out << "Depends: " << deps << "\n";
       }
     if(debian_pkg_rec && *debian_pkg_rec)
       {
-- 
1.7.1

From cf601792a2d55191e69a910b1c5dc7bc5aa48eb2 Mon Sep 17 00:00:00 2001
From: Martin Konrad <konrad@ikp.tu-darmstadt.de>
Date: Fri, 1 Apr 2011 19:54:02 +0200
Subject: [PATCH] Add inter-component group dependencies to component groups.

The orphan left over component case needs to be handled
Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
---
 Source/CPack/cmCPackComponentGroup.h |    6 +++
 Source/CPack/cmCPackGenerator.cxx    |   59 ++++++++++++++++++++++++++++++++++
 Source/CPack/cmCPackGenerator.h      |    8 ++++
 3 files changed, 73 insertions(+), 0 deletions(-)

diff --git a/Source/CPack/cmCPackComponentGroup.h b/Source/CPack/cmCPackComponentGroup.h
index cebdd6d..b7777b6 100644
--- a/Source/CPack/cmCPackComponentGroup.h
+++ b/Source/CPack/cmCPackComponentGroup.h
@@ -133,6 +133,12 @@ public:
 
   /// The subgroups of this group.
   std::vector<cmCPackComponentGroup*> Subgroups;
+
+  /// The component groups that this component group depends on.
+  std::vector<cmCPackComponentGroup *> Dependencies;
+
+  /// The component groups that depend on this component group.
+  std::vector<cmCPackComponentGroup *> ReverseDependencies;
 };
 
 #endif
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 691092f..f768111 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -1551,3 +1551,62 @@ cmCPackGenerator::GetComponentGroup(const char *projectName, const char *name)
     }
   return group;
 }
+
+//----------------------------------------------------------------------
+void cmCPackGenerator::ComputeComponentGroupDeps()
+{
+  // loop over all component groups
+  std::map<std::string, cmCPackComponentGroup>::iterator compGIt;
+  for (compGIt = ComponentGroups.begin();
+       compGIt != ComponentGroups.end(); ++compGIt)
+  {
+    cmCPackLogger(cmCPackLog::LOG_VERBOSE,
+                  "Computing dependencies for component group \""
+                  << compGIt->first << "\"" << std::endl);
+
+    // loop over all components of the current component group
+    std::vector<cmCPackComponent*>::iterator compIt;
+    for (compIt = compGIt->second.Components.begin();
+         compIt != compGIt->second.Components.end(); ++compIt)
+    {
+      cmCPackLogger(cmCPackLog::LOG_DEBUG, "Component group \""
+                    << compGIt->first << "\" contains component \""
+                    << (*compIt)->Name << "\"" << std::endl);
+      std::string depMacro = "CPACK_COMPONENT_";
+      depMacro += cmSystemTools::UpperCase((*compIt)->Name);
+      depMacro += "_DEPENDS";
+      const char *compDepends = this->GetOption((depMacro).c_str());
+      if (compDepends && *compDepends)
+      {
+        cmCPackLogger(cmCPackLog::LOG_DEBUG, "Component \""
+                      << (*compIt)->Name << "\" depends on \""
+                      << compDepends << "\"" << std::endl);
+
+        std::vector<std::string> dependsVector;
+        cmSystemTools::ExpandListArgument(compDepends, dependsVector);
+
+        // loop over all component names the current component depends on
+        std::vector<std::string>::iterator dependIt;
+        for (dependIt = dependsVector.begin();
+             dependIt != dependsVector.end(); ++dependIt)
+        {
+          // get the component object from the component name
+          cmCPackComponent *dependComp = &this->Components[*dependIt];
+          // find out the component group for the component we depend on
+          cmCPackComponentGroup *dependGroup = dependComp->Group;
+          // FIXME the component may NOT be in any group
+          // FIXME so that we must generate a dependency to the
+          // FIXME orphan leftover component.
+          cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Component group \""
+                        << compGIt->second.Name
+                        << "\" depends on component group \""
+                        << dependGroup->Name << "\"" << std::endl);
+          // add dependency to component group objects
+          compGIt->second.Dependencies.push_back(dependGroup);
+          dependGroup->ReverseDependencies.push_back(&compGIt->second);
+        }
+      }
+    }
+  }
+  return;
+}
diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h
index 9549d0b..01f1bf2 100644
--- a/Source/CPack/cmCPackGenerator.h
+++ b/Source/CPack/cmCPackGenerator.h
@@ -193,6 +193,14 @@ protected:
                                          const char* name);
   virtual cmCPackComponentGroup* GetComponentGroup(const char *projectName,
                                                    const char* name);
+  /**
+   * Computes the component group dependencies.
+   * GROUP dependencies is NOT the same COMPONENT dependencies
+   * because a GROUP may contains several COMPONENT.
+   * This method may be used by CPack generator producing 1 package file
+   * for each COMPONENT GROUP (like RPM or Deb).
+   */
+  virtual void ComputeComponentGroupDeps();
 
   bool GeneratorVerbose;
   std::string Name;
-- 
1.7.4.1

From 9d75b72464824d856dc38f70cb5a1b410e563bce Mon Sep 17 00:00:00 2001
From: Martin Konrad <konrad@ikp.tu-darmstadt.de>
Date: Wed, 6 Apr 2011 12:02:27 +0200
Subject: [PATCH] CPackDeb: Add support for automatic package dependencies.

Dependencies between Debian packages are calculated from
inter-component group dependencies automatically.
---
 Source/CPack/cmCPackDebGenerator.cxx |   42 ++++++++++++++++++++++++++++++++-
 1 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 5665404..3d5f2f6 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -119,6 +119,7 @@ int cmCPackDebGenerator::PackageComponents(bool ignoreGroup)
   // unless CPACK_COMPONENTS_IGNORE_GROUP is specified.
   if (!ignoreGroup)
     {
+    this->ComputeComponentGroupDeps();
     std::map<std::string, cmCPackComponentGroup>::iterator compGIt;
     for (compGIt=this->ComponentGroups.begin();
         compGIt!=this->ComponentGroups.end(); ++compGIt)
@@ -126,6 +127,27 @@ int cmCPackDebGenerator::PackageComponents(bool ignoreGroup)
       cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Packaging component group: "
           << compGIt->first
           << std::endl);
+      // Get automatic dependencies
+      std::string autoDependencies;
+      std::vector<cmCPackComponentGroup *>::iterator depIt;
+      for (depIt = compGIt->second.Dependencies.begin();
+            depIt != compGIt->second.Dependencies.end();
+            ++depIt)
+        {
+        if(autoDependencies != "")
+          {
+          autoDependencies += ", ";
+          }
+        autoDependencies += cmsys::SystemTools::LowerCase(
+            this->GetOption("CPACK_PACKAGE_NAME")
+            );
+        autoDependencies += "-";
+        autoDependencies += cmsys::SystemTools::LowerCase((*depIt)->Name);
+        }
+      this->SetOption(
+          "CPACK_DEBIAN_PACKAGE_AUTODEPENDS",
+          autoDependencies.c_str()
+          );
       // Begin the archive for this group
       retval &= PackageOnePack(initialTopLevel,compGIt->first);
       }
@@ -307,7 +329,23 @@ int cmCPackDebGenerator::createDeb()
   const char* desc =       this->GetOption("CPACK_DEBIAN_PACKAGE_DESCRIPTION");
 
   // optional entries
+  std::string deps, autoDeps;
   const char* debian_pkg_dep = this->GetOption("CPACK_DEBIAN_PACKAGE_DEPENDS");
+  if(debian_pkg_dep && *debian_pkg_dep)
+    {
+    deps = std::string(debian_pkg_dep);
+    }
+  const char* debian_pkg_autodepends = this->GetOption("CPACK_DEBIAN_PACKAGE_AUTODEPENDS");
+  if(debian_pkg_autodepends && *debian_pkg_autodepends)
+    {
+    autoDeps = std::string(debian_pkg_autodepends);
+    }
+  if(autoDeps != "" && deps != "")
+    {
+    autoDeps += ", ";
+    }
+  deps = autoDeps + deps;
+
   const char* debian_pkg_rec =
                             this->GetOption("CPACK_DEBIAN_PACKAGE_RECOMMENDS");
   const char* debian_pkg_sug =
@@ -334,9 +372,9 @@ int cmCPackDebGenerator::createDeb()
     out << "Section: " << debian_pkg_section << "\n";
     out << "Priority: " << debian_pkg_priority << "\n";
     out << "Architecture: " << debian_pkg_arch << "\n";
-    if(debian_pkg_dep && *debian_pkg_dep)
+    if(deps != "")
       {
-      out << "Depends: " << debian_pkg_dep << "\n";
+      out << "Depends: " << deps << "\n";
       }
     if(debian_pkg_rec && *debian_pkg_rec)
       {
-- 
1.7.1