From b7c3f95c912c6cc86ed40040b445c8827579899d Mon Sep 17 00:00:00 2001
From: Nicolas <nherbaut@progexia.net>
Date: Fri, 18 Apr 2014 16:24:41 +0200
Subject: [PATCH] fixed cpack wix patch issue due to bad logger initialization

---
 Source/CPack/WiX/cmCPackWIXGenerator.cxx          | 9 +++++++--
 Source/CPack/WiX/cmCPackWIXGenerator.h            | 2 ++
 Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx | 6 ++++++
 Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h   | 1 +
 Source/CPack/WiX/cmWIXPatch.cxx                   | 7 +++++--
 Source/CPack/WiX/cmWIXPatch.h                     | 4 +++-
 6 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index a385e40..70f39b4 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -33,7 +33,7 @@
 
 cmCPackWIXGenerator::cmCPackWIXGenerator():
   HasDesktopShortcuts(false),
-  Patch(Logger)
+  Patch()
 {
 
 }
@@ -137,6 +137,7 @@ bool cmCPackWIXGenerator::RunLightCommand(std::string const& objectFiles)
 
 int cmCPackWIXGenerator::PackageFiles()
 {
+  this->Patch.SetLogger(this->Logger);
   if(!PackageFilesImpl() || cmSystemTools::GetErrorOccuredFlag())
     {
     cmCPackLogger(cmCPackLog::LOG_ERROR,
@@ -817,7 +818,7 @@ void cmCPackWIXGenerator::AddDirectoryAndFileDefinitons(
   if(dir.GetNumberOfFiles() == 2)
     {
     std::string componentId = fileDefinitions.EmitComponentCreateFolder(
-      directoryId, GenerateGUID());
+		directoryId, GenerateGUID());
 
     featureDefinitions.EmitComponentRef(componentId);
 
@@ -1093,6 +1094,10 @@ void cmCPackWIXGenerator::CollectExtensions(
     }
 }
 
+ 
+ void cmCPackWIXGenerator::SetLogger(cmCPackLog* logger){
+	  this->Logger = logger; 
+}
 void cmCPackWIXGenerator::AddCustomFlags(
   std::string const& variableName, std::ostream& stream)
 {
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h
index 4c9f8c7..ee20ec4 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.h
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.h
@@ -61,6 +61,8 @@ protected:
     return true;
     }
 
+  virtual void SetLogger(cmCPackLog* logger);
+
 private:
   typedef std::map<std::string, std::string> id_map_t;
   typedef std::map<std::string, size_t> ambiguity_map_t;
diff --git a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx
index a93f89b..dd71b59 100644
--- a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx
+++ b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx
@@ -12,6 +12,7 @@
 
 #include "cmWIXDirectoriesSourceWriter.h"
 
+
 cmWIXDirectoriesSourceWriter::cmWIXDirectoriesSourceWriter(cmCPackLog* logger,
   std::string const& filename):
     cmWIXSourceWriter(logger, filename)
@@ -73,8 +74,11 @@ size_t cmWIXDirectoriesSourceWriter::BeginInstallationPrefixDirectory(
       }
 
     AddAttribute("Name", installRoot[i]);
+
+
   }
 
+
   return installRoot.size();
 }
 
@@ -84,4 +88,6 @@ void cmWIXDirectoriesSourceWriter::EndInstallationPrefixDirectory(size_t size)
     {
     EndElement("Directory");
     }
+
+  //patch.ApplyFragment(fileId, *this);
 }
diff --git a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h
index f51fdb4..9ac0ec2 100644
--- a/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h
+++ b/Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h
@@ -14,6 +14,7 @@
 #define cmWIXDirectoriesSourceWriter_h
 
 #include "cmWIXSourceWriter.h"
+#include "cmWIXPatch.h"
 
 #include <CPack/cmCPackGenerator.h>
 
diff --git a/Source/CPack/WiX/cmWIXPatch.cxx b/Source/CPack/WiX/cmWIXPatch.cxx
index b5202e0..6a9ad43 100644
--- a/Source/CPack/WiX/cmWIXPatch.cxx
+++ b/Source/CPack/WiX/cmWIXPatch.cxx
@@ -14,12 +14,15 @@
 
 #include <CPack/cmCPackGenerator.h>
 
-cmWIXPatch::cmWIXPatch(cmCPackLog* logger):
-  Logger(logger)
+cmWIXPatch::cmWIXPatch()
 {
 
 }
 
+void cmWIXPatch::SetLogger(cmCPackLog* logger){
+	this->Logger=logger;
+}
+
 void cmWIXPatch::LoadFragments(std::string const& patchFilePath)
 {
   cmWIXPatchParser parser(Fragments, Logger);
diff --git a/Source/CPack/WiX/cmWIXPatch.h b/Source/CPack/WiX/cmWIXPatch.h
index 7b7b2f1..5485758 100644
--- a/Source/CPack/WiX/cmWIXPatch.h
+++ b/Source/CPack/WiX/cmWIXPatch.h
@@ -24,7 +24,7 @@
 class cmWIXPatch
 {
 public:
-  cmWIXPatch(cmCPackLog* logger);
+  cmWIXPatch();
 
   void LoadFragments(std::string const& patchFilePath);
 
@@ -32,6 +32,8 @@ public:
 
   bool CheckForUnappliedFragments();
 
+  void SetLogger(cmCPackLog* logger);
+
 private:
   void ApplyElement(const cmWIXPatchElement& element,
     cmWIXSourceWriter& writer);
-- 
1.8.0.msysgit.0