mirror of
https://github.com/reactos/CMake.git
synced 2024-11-26 21:10:29 +00:00
BUG: Preserve symlinks during installation. This addresses bug#4384.
This commit is contained in:
parent
e01cdf2065
commit
e105c7fedc
@ -474,8 +474,64 @@ public:
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private:
|
||||
bool InstallSymlink(const char* fromFile, const char* toFile, bool always);
|
||||
};
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
bool cmFileInstaller::InstallSymlink(const char* fromFile, const char* toFile,
|
||||
bool always)
|
||||
{
|
||||
// Inform the user about this file installation.
|
||||
std::string message = "Installing ";
|
||||
message += toFile;
|
||||
this->Makefile->DisplayStatus(message.c_str(), -1);
|
||||
|
||||
// Read the original symlink.
|
||||
std::string symlinkTarget;
|
||||
if(!cmSystemTools::ReadSymlink(fromFile, symlinkTarget))
|
||||
{
|
||||
cmOStringStream e;
|
||||
e << "INSTALL cannot read symlink \"" << fromFile
|
||||
<< "\" to duplicate at \"" << toFile << "\".";
|
||||
this->FileCommand->SetError(e.str().c_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
// Compare the symlink value to that at the destination if not
|
||||
// always installing.
|
||||
if(!always)
|
||||
{
|
||||
std::string oldSymlinkTarget;
|
||||
if(cmSystemTools::ReadSymlink(toFile, oldSymlinkTarget))
|
||||
{
|
||||
if(symlinkTarget == oldSymlinkTarget)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Remove the destination file so we can always create the symlink.
|
||||
cmSystemTools::RemoveFile(toFile);
|
||||
|
||||
// Create the symlink.
|
||||
if(!cmSystemTools::CreateSymlink(symlinkTarget.c_str(), toFile))
|
||||
{
|
||||
cmOStringStream e;
|
||||
e << "INSTALL cannot duplicate symlink \"" << fromFile
|
||||
<< "\" at \"" << toFile << "\".";
|
||||
this->FileCommand->SetError(e.str().c_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
// Add the file to the manifest.
|
||||
this->ManifestAppend(toFile);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
bool cmFileInstaller::InstallFile(const char* fromFile, const char* toFile,
|
||||
bool always)
|
||||
@ -489,6 +545,12 @@ bool cmFileInstaller::InstallFile(const char* fromFile, const char* toFile,
|
||||
return true;
|
||||
}
|
||||
|
||||
// Short-circuit for symbolic links.
|
||||
if(cmSystemTools::FileIsSymlink(fromFile))
|
||||
{
|
||||
return this->InstallSymlink(fromFile, toFile, always);
|
||||
}
|
||||
|
||||
// Inform the user about this file installation.
|
||||
std::string message = "Installing ";
|
||||
message += toFile;
|
||||
@ -541,6 +603,12 @@ bool cmFileInstaller::InstallDirectory(const char* source,
|
||||
return true;
|
||||
}
|
||||
|
||||
// Short-circuit for symbolic links.
|
||||
if(cmSystemTools::FileIsSymlink(source))
|
||||
{
|
||||
return this->InstallSymlink(source, destination, always);
|
||||
}
|
||||
|
||||
// Inform the user about this directory installation.
|
||||
std::string message = "Installing ";
|
||||
message += destination;
|
||||
|
Loading…
Reference in New Issue
Block a user