Skip to content

Commit 517789d

Browse files
committed
Correct the name of the license file when multiple licenses are specified.
1 parent f002a94 commit 517789d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/Licence.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@ void License::write(const Options &options,const Config &config,const wstring na
2525
const auto targetDirectory=options.rootDirectory + L"Artifacts\\license\\";
2626
filesystem::create_directories(targetDirectory);
2727

28-
wofstream licenseFile(targetDirectory + name + L".txt");
2928
for (const auto& license : config.licenses())
3029
{
3130
const auto sourceFileName=options.rootDirectory + config.directory() + license;
3231
wifstream sourceLicenseFile(sourceFileName);
3332
if (!sourceLicenseFile)
3433
throwException(L"Failed to open license file: " + sourceFileName);
3534

36-
auto versionFileName=options.rootDirectory + config.directory() + L".ImageMagick\\ImageMagick.version.h";
37-
auto projectName=name;
35+
const auto path=filesystem::path(sourceFileName).parent_path();
36+
auto versionFileName=path.wstring() + L"\\.ImageMagick\\ImageMagick.version.h";
37+
auto projectName=path.filename().wstring();
3838
if (!filesystem::exists(versionFileName))
3939
{
40-
const auto configDirectory=sourceFileName.substr(0,sourceFileName.find_last_of(L"\\"));
41-
versionFileName=configDirectory + L"\\.ImageMagick\\ImageMagick.version.h";
42-
projectName=configDirectory.substr(configDirectory.find_last_of(L"\\") + 1);
40+
versionFileName=options.rootDirectory + config.directory() + L".ImageMagick\\ImageMagick.version.h";
41+
projectName=name;
4342
}
4443

44+
wofstream licenseFile(targetDirectory + projectName + L".txt");
4545
wifstream versionFile(versionFileName);
4646
if (versionFile)
4747
{

0 commit comments

Comments
 (0)