mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-13 12:59:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'dot-dir'

Browse Source 
830a7d8803 cmArchiveWrite: Remove ./ suffix from zip archives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4288
This commit is contained in:
Brad King
2020-01-28 16:03:55 +00:00
committed by Kitware Robot
parent cb8bd146c9 830a7d8803
commit ee5edfbda2
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmArchiveWrite.cxx
View File

@@ -200,8 +200,10 @@ bool cmArchiveWrite::Add(std::string path, size_t skip, const char* prefix,
bool cmArchiveWrite::AddPath(const char* path, size_t skip, const char* prefix,
bool recursive)
{
if (!this->AddFile(path, skip, prefix)) {
return false;
if (strcmp(path, ".") != 0 || this->Format != "zip") {
if (!this->AddFile(path, skip, prefix)) {
return false;
}
}
if ((!cmSystemTools::FileIsDirectory(path) || !recursive) ||
cmSystemTools::FileIsSymlink(path)) {
@@ -210,6 +212,9 @@ bool cmArchiveWrite::AddPath(const char* path, size_t skip, const char* prefix,
cmsys::Directory d;
if (d.Load(path)) {
std::string next = cmStrCat(path, '/');
if (next == "./" && this->Format == "zip") {
next.clear();
}
std::string::size_type end = next.size();
unsigned long n = d.GetNumberOfFiles();
for (unsigned long i = 0; i < n; ++i) {