[Cmake-commits] CMake branch, next, updated. v3.2.0-873-g87f2a8a

[Nils Gladitz]

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  87f2a8a78ae564a0b964f5e2bb8b19778066811f (commit)
       via  2e16aff1e2218f042f403971403fe583fc5bec97 (commit)
       via  b0852ebc09eec44041e8aa624ec4bb17bda14dac (commit)
      from  49a85a895ac60be51f27c581ebb1460ce61a5b47 (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=87f2a8a78ae564a0b964f5e2bb8b19778066811f
commit 87f2a8a78ae564a0b964f5e2bb8b19778066811f
Merge: 49a85a8 2e16aff
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Mar 6 15:10:10 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 6 15:10:10 2015 -0500

    Merge topic 'fix-wixobj-filenames' into next
    
    2e16aff1 CPackWIX: Fix .wixobj output locations and filenames.
    b0852ebc CPackWIX: Support patching of root <Feature> elements.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e16aff1e2218f042f403971403fe583fc5bec97
commit 2e16aff1e2218f042f403971403fe583fc5bec97
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Mar 6 14:19:30 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Mar 6 21:09:19 2015 +0100

    CPackWIX: Fix .wixobj output locations and filenames.
    
    Preserve all but the last extension when generating .wixobj output
    filenames from source files and make sure they are unique.
    
    Output .wixobj files in cpack staging area instead
    of the current working directory.

diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 13edde3..257ce7a 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -265,13 +265,30 @@ bool cmCPackWIXGenerator::PackageFilesImpl()
 
   AppendUserSuppliedExtraSources();
 
+  std::set<std::string> usedBaseNames;
+
   std::stringstream objectFiles;
   for(size_t i = 0; i < this->WixSources.size(); ++i)
     {
     std::string const& sourceFilename = this->WixSources[i];
 
+    std::string baseName =
+      cmSystemTools::GetFilenameWithoutLastExtension(sourceFilename);
+
+    unsigned int counter = 0;
+    std::string uniqueBaseName = baseName;
+
+    while(usedBaseNames.find(uniqueBaseName) != usedBaseNames.end())
+      {
+      std::stringstream tmp;
+      tmp << baseName << ++counter;
+      uniqueBaseName = tmp.str();
+      }
+
+    usedBaseNames.insert(uniqueBaseName);
+
     std::string objectFilename =
-      cmSystemTools::GetFilenameWithoutExtension(sourceFilename) + ".wixobj";
+      this->CPackTopLevel + "/" + uniqueBaseName + ".wixobj";
 
     if(!RunCandleCommand(sourceFilename, objectFilename))
       {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0852ebc09eec44041e8aa624ec4bb17bda14dac
commit b0852ebc09eec44041e8aa624ec4bb17bda14dac
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Mar 6 20:40:53 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Mar 6 21:06:42 2015 +0100

    CPackWIX: Support patching of root <Feature> elements.

diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index 105df96..5fe51a6 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -148,8 +148,10 @@
 #  Currently fragments can be injected into most
 #  Component, File and Directory elements.
 #
-#  The special Id ``#PRODUCT`` can be used to inject content
-#  into the ``<Product>`` element.
+#  The following additional special Ids can be used:
+#
+#  * ``#PRODUCT`` for the ``<Product>`` element.
+#  * ``#PRODUCTFEATURE`` for the root ``<Feature>`` element.
 #
 #  The following example illustrates how this works.
 #
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 4b8daf8..13edde3 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -474,6 +474,7 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
 
   featureDefinitions.AddAttribute("Title", cpackPackageName);
   featureDefinitions.AddAttribute("Level", "1");
+  this->Patch->ApplyFragment("#PRODUCTFEATURE", featureDefinitions);
 
   const char* package = GetOption("CPACK_WIX_CMAKE_PACKAGE_REGISTRY");
   if(package)

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

Summary of changes:


hooks/post-receive
-- 
CMake