From 53f90a4c283b19d2147eb42173e851ea710655b9 Mon Sep 17 00:00:00 2001
From: Nicolas <nherbaut@progexia.net>
Date: Fri, 18 Apr 2014 17:03:07 +0200
Subject: [PATCH] added patch support for directories

---
 Source/CPack/WiX/cmCPackWIXGenerator.cxx          |  9 ++++---
 Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx | 33 +++++++++++++++--------
 Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h   |  8 +++---
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 70f39b4..677afac 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -381,7 +381,7 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
   this->WixSources.push_back(directoryDefinitionsFilename);
 
   cmWIXDirectoriesSourceWriter directoryDefinitions(
-    this->Logger, directoryDefinitionsFilename);
+	  this->Logger, directoryDefinitionsFilename);
   directoryDefinitions.BeginElement("Fragment");
 
   std::string installRoot;
@@ -393,10 +393,11 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
   directoryDefinitions.BeginElement("Directory");
   directoryDefinitions.AddAttribute("Id", "TARGETDIR");
   directoryDefinitions.AddAttribute("Name", "SourceDir");
+  this->Patch.ApplyFragment("TARGETDIR", directoryDefinitions);
 
   size_t installRootSize =
     directoryDefinitions.BeginInstallationPrefixDirectory(
-      GetProgramFilesFolderId(), installRoot);
+	GetProgramFilesFolderId(), installRoot,this->Patch);
 
   std::string fileDefinitionsFilename =
     this->CPackTopLevel + "/files.wxs";
@@ -510,12 +511,12 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
   if(hasShortcuts)
     {
     directoryDefinitions.EmitStartMenuFolder(
-      GetOption("CPACK_WIX_PROGRAM_MENU_FOLDER"));
+      GetOption("CPACK_WIX_PROGRAM_MENU_FOLDER"),this->Patch);
     }
 
   if(this->HasDesktopShortcuts)
     {
-    directoryDefinitions.EmitDesktopFolder();
+    directoryDefinitions.EmitDesktopFolder(this->Patch);
     }
 
   directoryDefinitions.EndElement("Directory");
diff --git a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx
index dd71b59..23534e3 100644
--- a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx
@@ -14,40 +14,44 @@
 
 
 cmWIXDirectoriesSourceWriter::cmWIXDirectoriesSourceWriter(cmCPackLog* logger,
-  std::string const& filename):
-    cmWIXSourceWriter(logger, filename)
+  std::string const& filenameh):
+    cmWIXSourceWriter(logger, filenameh)
 {
-
+	
 }
 
 void cmWIXDirectoriesSourceWriter::EmitStartMenuFolder(
-  std::string const& startMenuFolder)
+  std::string const& startMenuFolder,cmWIXPatch &patch)
 {
   BeginElement("Directory");
   AddAttribute("Id", "ProgramMenuFolder");
+  patch.ApplyFragment("ProgramMenuFolder", *this);
 
   BeginElement("Directory");
   AddAttribute("Id", "PROGRAM_MENU_FOLDER");
+  patch.ApplyFragment("PROGRAM_MENU_FOLDER", *this);
   AddAttribute("Name", startMenuFolder);
   EndElement("Directory");
 
   EndElement("Directory");
 }
 
-void cmWIXDirectoriesSourceWriter::EmitDesktopFolder()
+void cmWIXDirectoriesSourceWriter::EmitDesktopFolder(cmWIXPatch &patch)
 {
   BeginElement("Directory");
   AddAttribute("Id", "DesktopFolder");
   AddAttribute("Name", "Desktop");
+  patch.ApplyFragment("DesktopFolder", *this);
   EndElement("Directory");
 }
 
 size_t cmWIXDirectoriesSourceWriter::BeginInstallationPrefixDirectory(
   std::string const& programFilesFolderId,
-  std::string const& installRootString)
+  std::string const& installRootString,cmWIXPatch &patch)
 {
   BeginElement("Directory");
   AddAttribute("Id", programFilesFolderId);
+  patch.ApplyFragment(programFilesFolderId, *this);
 
   std::vector<std::string> installRoot;
 
@@ -61,19 +65,26 @@ size_t cmWIXDirectoriesSourceWriter::BeginInstallationPrefixDirectory(
   for(size_t i = 1; i < installRoot.size(); ++i)
     {
     BeginElement("Directory");
-
+	std::string id;
     if(i == installRoot.size() - 1)
       {
-      AddAttribute("Id", "INSTALL_ROOT");
-      }
+      id="INSTALL_ROOT";
+	  }
     else
       {
       std::stringstream tmp;
       tmp << "INSTALL_PREFIX_" << i;
-      AddAttribute("Id", tmp.str());
+      id=tmp.str();
+	  
+	  
       }
 
-    AddAttribute("Name", installRoot[i]);
+	AddAttribute("Id", id);
+	AddAttribute("Name", installRoot[i]);
+	patch.ApplyFragment(id, *this);
+
+    
+	
 
 
   }
diff --git a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h
index 9ac0ec2..a80166b 100644
--- a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h
@@ -29,15 +29,17 @@ public:
   cmWIXDirectoriesSourceWriter(cmCPackLog* logger,
     std::string const& filename);
 
-  void EmitStartMenuFolder(std::string const& startMenuFolder);
+  void EmitStartMenuFolder(std::string const& startMenuFolder,cmWIXPatch &patch);
 
-  void EmitDesktopFolder();
+  void EmitDesktopFolder(cmWIXPatch &patch);
 
   size_t BeginInstallationPrefixDirectory(
       std::string const& programFilesFolderId,
-      std::string const& installRootString);
+      std::string const& installRootString,cmWIXPatch &patch);
 
   void EndInstallationPrefixDirectory(size_t size);
+
+	  
 };
 
 #endif
-- 
1.8.0.msysgit.0