kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-wix-cpack-crash' 

cb59f5da CPackWIX: Delay creation of cmWIXPatch until CPack has initialized Logger
This commit is contained in:
Brad King 2014-04-21 09:32:33 -04:00 committed by CMake Topic Stage
parent ba83d84714 cb59f5da97
commit 658cc11cf1
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/CPack/WiX/cmCPackWIXGenerator.cxx
View File

@ -33,14 +33,23 @@
cmCPackWIXGenerator::cmCPackWIXGenerator(): cmCPackWIXGenerator::cmCPackWIXGenerator():
HasDesktopShortcuts(false), HasDesktopShortcuts(false),
Patch(Logger) Patch(0)
{ {
} }
cmCPackWIXGenerator::~cmCPackWIXGenerator()
{
if(this->Patch)
{
delete this->Patch;
}
}
int cmCPackWIXGenerator::InitializeInternal() int cmCPackWIXGenerator::InitializeInternal()
{ {
componentPackageMethod = ONE_PACKAGE; componentPackageMethod = ONE_PACKAGE;
this->Patch = new cmWIXPatch(this->Logger);
return this->Superclass::InitializeInternal(); return this->Superclass::InitializeInternal();
} }
@ -232,7 +241,7 @@ bool cmCPackWIXGenerator::InitializeWiXConfiguration()
const char* patchFilePath = GetOption("CPACK_WIX_PATCH_FILE"); const char* patchFilePath = GetOption("CPACK_WIX_PATCH_FILE");
if(patchFilePath) if(patchFilePath)
{ {
this->Patch.LoadFragments(patchFilePath); this->Patch->LoadFragments(patchFilePath);
} }
return true; return true;
@ -525,7 +534,7 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
return false; return false;
} }
return this->Patch.CheckForUnappliedFragments(); return this->Patch->CheckForUnappliedFragments();
} }
std::string cmCPackWIXGenerator::GetProgramFilesFolderId() const std::string cmCPackWIXGenerator::GetProgramFilesFolderId() const
@ -857,13 +866,13 @@ void cmCPackWIXGenerator::AddDirectoryAndFileDefinitons(
desktopExecutables, desktopExecutables,
shortcutMap); shortcutMap);
this->Patch.ApplyFragment(subDirectoryId, directoryDefinitions); this->Patch->ApplyFragment(subDirectoryId, directoryDefinitions);
directoryDefinitions.EndElement("Directory"); directoryDefinitions.EndElement("Directory");
} }
else else
{ {
std::string componentId = fileDefinitions.EmitComponentFile( std::string componentId = fileDefinitions.EmitComponentFile(
directoryId, id, fullPath, this->Patch); directoryId, id, fullPath, *(this->Patch));
featureDefinitions.EmitComponentRef(componentId); featureDefinitions.EmitComponentRef(componentId);

3
Source/CPack/WiX/cmCPackWIXGenerator.h
View File

@ -35,6 +35,7 @@ public:
cmCPackTypeMacro(cmCPackWIXGenerator, cmCPackGenerator); cmCPackTypeMacro(cmCPackWIXGenerator, cmCPackGenerator);
cmCPackWIXGenerator(); cmCPackWIXGenerator();
~cmCPackWIXGenerator();
protected: protected:
virtual int InitializeInternal(); virtual int InitializeInternal();
@ -166,7 +167,7 @@ private:
std::string CPackTopLevel; std::string CPackTopLevel;
cmWIXPatch Patch; cmWIXPatch* Patch;
}; };
#endif #endif