[Cmake-commits] CMake branch, next, updated. v2.8.3-712-g2703aa2

[Eric Noulard]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2703aa2f6c2fea451e0d98915f02014ff6b86f4c (commit)
       via  d0eb89c17b86dd583d315b15b8ca71e32561f49a (commit)
       via  bd44b2cc5bc4c0152e38474fd549f6b495d3b1b7 (commit)
       via  7ce06dcc906ea3c6d39e663910df8c835f278ec6 (commit)
       via  7a85200249b80b492753299b5ae423b233d38d7b (commit)
       via  500711129ba286f07b10711fe9410fa52f3ef40c (commit)
       via  537180ab19f2f50a57e3ea1c8bb94d61d186d9b0 (commit)
       via  8bafdeb60edcb2c1f7b1fd8e18213129ccdf085a (commit)
      from  e7f6e52aace65c84499c49a59d370b5069cca70d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2703aa2f6c2fea451e0d98915f02014ff6b86f4c
commit 2703aa2f6c2fea451e0d98915f02014ff6b86f4c
Merge: e7f6e52 d0eb89c
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Mon Nov 29 13:01:16 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 29 13:01:16 2010 -0500

    Merge topic 'CPack-Bug11452-ComponentBreakage-v2' into next
    
    d0eb89c CPack backward compatibility fix 2.8.3-2.8.2 (bug 11452)
    bd44b2c KWSys Nightly Date Stamp
    7ce06dc KWSys Nightly Date Stamp
    7a85200 KWSys Nightly Date Stamp
    5007111 KWSys Nightly Date Stamp
    537180a KWSys Nightly Date Stamp
    8bafdeb KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0eb89c17b86dd583d315b15b8ca71e32561f49a
commit d0eb89c17b86dd583d315b15b8ca71e32561f49a
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Mon Nov 29 18:57:24 2010 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Mon Nov 29 18:57:24 2010 +0100

    CPack backward compatibility fix 2.8.3-2.8.2 (bug 11452)
    
    One should set CPACK_ARCHIVE_COMPONENT_INSTALL=1 in order to
    trigger component install for ARCHIVE generators

diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx
index 424c1a0..8bbf699 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -228,21 +228,23 @@ int cmCPackArchiveGenerator::PackageFiles()
 
   PrepareGroupingKind();
 
-  // CASE 1 : COMPONENT ALL-IN-ONE package
-  // If ALL GROUPS or ALL COMPONENTS in ONE package has been requested
-  // then the package file is unique and should be open here.
-  if (allComponentInOne || (allGroupInOne && (!this->ComponentGroups.empty())))
-    {
-    return PackageComponentsAllInOne(allComponentInOne);
-    }
-  // CASE 2 : COMPONENT CLASSICAL package(s) (i.e. not all-in-one)
-  // There will be 1 package for each component group
-  // however one may require to ignore component group and
-  // in this case you'll get 1 package for each component.
-  else if ((!this->ComponentGroups.empty()) || (ignoreComponentGroup))
-    {
-    return PackageComponents(ignoreComponentGroup);
-    }
+  if (SupportsComponentInstallation()) {
+    // CASE 1 : COMPONENT ALL-IN-ONE package
+    // If ALL GROUPS or ALL COMPONENTS in ONE package has been requested
+    // then the package file is unique and should be open here.
+    if (allComponentInOne || (allGroupInOne && (!this->ComponentGroups.empty())))
+      {
+      return PackageComponentsAllInOne(allComponentInOne);
+      }
+    // CASE 2 : COMPONENT CLASSICAL package(s) (i.e. not all-in-one)
+    // There will be 1 package for each component group
+    // however one may require to ignore component group and
+    // in this case you'll get 1 package for each component.
+    else if ((!this->ComponentGroups.empty()) || (ignoreComponentGroup))
+      {
+      return PackageComponents(ignoreComponentGroup);
+      }
+  }
 
   // CASE 3 : NON COMPONENT package.
   DECLARE_AND_OPEN_ARCHIVE(packageFileNames[0],archive);
@@ -278,5 +280,15 @@ int cmCPackArchiveGenerator::GenerateHeader(std::ostream*)
 }
 
 bool cmCPackArchiveGenerator::SupportsComponentInstallation() const {
-  return true;
+  // The Component installation support should only
+  // be activated if explicitly requested by the user
+  // (for backward compatibility reason)
+  if (IsSet("CPACK_ARCHIVE_COMPONENT_INSTALL"))
+    {
+    return true;
+    }
+  else
+    {
+    return false;
+    }
 }

-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/cmCPackArchiveGenerator.cxx |   44 +++++++++++++++++++-----------
 Source/kwsys/kwsysDateStamp.cmake        |    2 +-
 2 files changed, 29 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake