Skip to content

Commit eee60e4

Browse files
dlemstradlemstra
committed
Consistent naming.
1 parent f7eefe7 commit eee60e4

File tree

8 files changed

+45
-35
lines changed

8 files changed

+45
-35
lines changed

‎src/ConfigureApp.cpp‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ BOOL ConfigureApp::InitInstance()
7575
}
7676
}
7777

78-
void ConfigureApp::cleanupFolders(Options &options,WaitDialog &waitDialog)
78+
void ConfigureApp::cleanupDirectories(Options &options,WaitDialog &waitDialog)
7979
{
8080
filesystem::remove_all(options.rootDirectory + L"Artifacts\\demo");
8181
filesystem::remove_all(options.rootDirectory + L"Artifacts\\fuzz");
@@ -89,21 +89,30 @@ void ConfigureApp::cleanupFolders(Options &options,WaitDialog &waitDialog)
8989

9090
void ConfigureApp::copyFiles(Options &options)
9191
{
92-
wstring binFolder=options.rootDirectory + L"Artifacts\\bin";
92+
wstring binDirectory=options.rootDirectory + L"Artifacts\\bin";
9393

94-
if (!filesystem::exists(binFolder))
95-
filesystem::create_directories(binFolder);
94+
if (!filesystem::exists(binDirectory))
95+
filesystem::create_directories(binDirectory);
9696

97-
filesystem::copy(options.rootDirectory + L"Configure\\Configs\\xml\\*",binFolder,filesystem::copy_options::overwrite_existing);
98-
filesystem::copy(options.rootDirectory + L"Configure\\ColorProfiles\\*",binFolder,filesystem::copy_options::overwrite_existing);
97+
copyFiles(options.rootDirectory + L"Configure\\Configs\\xml",binDirectory);
98+
copyFiles(options.rootDirectory + L"Configure\\ColorProfiles",binDirectory);
99+
}
100+
101+
void ConfigureApp::copyFiles(const wstring &sourceDirectory,const wstring &targetDirectory)
102+
{
103+
for (const auto& entry : filesystem::directory_iterator(sourceDirectory))
104+
{
105+
if (entry.is_regular_file())
106+
filesystem::copy(entry.path(),targetDirectory + L"\\" + entry.path().filename().wstring(),filesystem::copy_options::overwrite_existing);
107+
}
99108
}
100109

101110
BOOL ConfigureApp::createFiles(Options &options,WaitDialog &waitDialog) const
102111
{
103112
waitDialog.setSteps(15);
104113

105-
waitDialog.nextStep(L"Cleaning up folders...");
106-
cleanupFolders(options,waitDialog);
114+
waitDialog.nextStep(L"Cleaning up directories...");
115+
cleanupDirectories(options,waitDialog);
107116

108117
waitDialog.nextStep(L"Copying files...");
109118
copyFiles(options);

‎src/ConfigureApp.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@ class ConfigureApp : public CWinApp
3535

3636
private:
3737

38-
static void cleanupFolders(Options &options,WaitDialog &waitDialog);
38+
static void cleanupDirectories(Options &options,WaitDialog &waitDialog);
3939

4040
static void copyFiles(Options &options);
4141

42+
static void copyFiles(const wstring &sourceDirectory,const wstring &targetDirectory);
43+
4244
BOOL createFiles(Options &options,WaitDialog &waitDialog) const;
4345

4446
const wstring getRootDirectory() const;

‎src/Options.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,17 @@ wstring Options::getEnvironmentVariable(const wchar_t *name)
119119

120120
VisualStudioVersion Options::getVisualStudioVersion()
121121
{
122-
if (hasVisualStudioFolder(L"2022"))
122+
if (hasVisualStudioDirectory(L"2022"))
123123
return(VisualStudioVersion::VS2022);
124-
else if (hasVisualStudioFolder(L"2019"))
124+
else if (hasVisualStudioDirectory(L"2019"))
125125
return(VisualStudioVersion::VS2019);
126-
else if (hasVisualStudioFolder(L"2017"))
126+
else if (hasVisualStudioDirectory(L"2017"))
127127
return(VisualStudioVersion::VS2017);
128128
else
129129
return(VSLATEST);
130130
}
131131

132-
bool Options::hasVisualStudioFolder(const wchar_t *name)
132+
bool Options::hasVisualStudioDirectory(const wchar_t *name)
133133
{
134134
wstring
135135
path;

‎src/Options.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class Options
6262

6363
static VisualStudioVersion getVisualStudioVersion();
6464

65-
static bool hasVisualStudioFolder(const wchar_t *name);
65+
static bool hasVisualStudioDirectory(const wchar_t *name);
6666

6767
set<wstring> _preBuildLibs;
6868
};

‎src/Project.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -608,9 +608,9 @@ void Project::writeLicense() const
608608
wstring projectName=name();
609609
if (!filesystem::exists(versionFileName))
610610
{
611-
wstring configFolder=sourceFileName.substr(0,sourceFileName.find_last_of(L"\\"));
612-
versionFileName=configFolder + L"\\.ImageMagick\\ImageMagick.version.h";
613-
projectName=configFolder.substr(configFolder.find_last_of(L"\\") + 1);
611+
wstring configDirectory=sourceFileName.substr(0,sourceFileName.find_last_of(L"\\"));
612+
versionFileName=configDirectory + L"\\.ImageMagick\\ImageMagick.version.h";
613+
projectName=configDirectory.substr(configDirectory.find_last_of(L"\\") + 1);
614614
}
615615

616616
wifstream versionFile(versionFileName);

‎src/Solution.cpp‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
#include "Solution.h"
2121

22-
const wstring Solution::solutionFolder(const Project &project)
22+
const wstring Solution::solutionDirectory(const Project &project)
2323
{
2424
switch (project.type())
2525
{
@@ -52,12 +52,11 @@ void Solution::write(const Options &options,const vector<Project> &projects)
5252
if (!file)
5353
throwException(L"Failed to open file: " + solutionFileName);
5454

55-
set<wstring> solutionFolders;
5655
file << L"Microsoft Visual Studio Solution File, Format Version 12.00" << endl;
5756
writeVisualStudioVersion(file,options);
5857
writeProjects(file,projects);
59-
writeConfigFolder(file,options);
60-
writeProjectFolders(file,projects);
58+
writeConfigDirectory(file,options);
59+
writeProjectDirectories(file,projects);
6160
file << L"Global" << endl;
6261
file << L"\tGlobalSection(SolutionConfigurationPlatforms) = preSolution" << endl;
6362
file << L"\t\tDebug|" << options.architectureName() << " = Debug|" << options.architectureName() << endl;
@@ -68,7 +67,7 @@ void Solution::write(const Options &options,const vector<Project> &projects)
6867
file << L"EndGlobal" << endl;
6968
}
7069

71-
void Solution::writeConfigFolder(wofstream &file,const Options& options)
70+
void Solution::writeConfigDirectory(wofstream &file,const Options& options)
7271
{
7372
file << "Project(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\") = \"Config\", \"Config\", \"{" << createGuid(L"Config") << "}\"" << endl;
7473
file << "\tProjectSection(SolutionItems) = preProject" << endl;
@@ -87,15 +86,15 @@ void Solution::writeConfigFolder(wofstream &file,const Options& options)
8786
file << "EndProject" << endl;
8887
}
8988

90-
void Solution::writeProjectFolders(wofstream &file,const vector<Project>& projects)
89+
void Solution::writeProjectDirectories(wofstream &file,const vector<Project>& projects)
9190
{
92-
set<wstring> solutionFolders;
91+
set<wstring> solutionDirectories;
9392
for (const auto& project : projects)
94-
solutionFolders.insert(solutionFolder(project));
93+
solutionDirectories.insert(solutionDirectory(project));
9594

96-
for (const auto& solutionFolder : solutionFolders)
95+
for (const auto& solutionDirectory : solutionDirectories)
9796
{
98-
file << "Project(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\") = \"" << solutionFolder << "\", \"" << solutionFolder << "\", \"{" << createGuid(solutionFolder) << "}\"" << endl;
97+
file << "Project(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\") = \"" << solutionDirectory << "\", \"" << solutionDirectory << "\", \"{" << createGuid(solutionDirectory) << "}\"" << endl;
9998
file << "EndProject" << endl;
10099
}
101100
}
@@ -127,7 +126,7 @@ void Solution::writeProjectsNesting(wofstream& file,const vector<Project>& proje
127126
file << L"\tGlobalSection(NestedProjects) = preSolution" << endl;
128127
for (const auto& project : projects)
129128
{
130-
file << L"\t\t{" << project.guid() << L"} = {" << createGuid(solutionFolder(project)) << L"}" << endl;
129+
file << L"\t\t{" << project.guid() << L"} = {" << createGuid(solutionDirectory(project)) << L"}" << endl;
131130
}
132131
file << L"\tEndGlobalSection" << endl;
133132
}

‎src/Solution.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ class Solution
2929
static void write(const Options &options,const vector<Project> &projects);
3030

3131
private:
32-
static const wstring solutionFolder(const Project & project);
32+
static const wstring solutionDirectory(const Project & project);
3333

3434
static const wstring solutionName(const Options &options);
3535

36-
static void writeConfigFolder(wofstream& file,const Options& options);
36+
static void writeConfigDirectory(wofstream& file,const Options& options);
3737

38-
static void writeProjectFolders(wofstream &file,const vector<Project>& projects);
38+
static void writeProjectDirectories(wofstream &file,const vector<Project>& projects);
3939

4040
static void writeProjects(wofstream& file,const vector<Project>& projects);
4141

‎src/XmlConfigFiles.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ const wstring XmlConfigFiles::getPolicyFileName(const Options &options)
3333

3434
void XmlConfigFiles::write(const Options &options)
3535
{
36-
const wstring configFolder=options.rootDirectory + L"ImageMagick\\config\\";
37-
const wstring targetFolder=options.rootDirectory + L"Artifacts\\bin\\";
36+
const wstring configDirectory=options.rootDirectory + L"ImageMagick\\config\\";
37+
const wstring targetDirectory=options.rootDirectory + L"Artifacts\\bin\\";
3838

39-
filesystem::copy_file(configFolder + getPolicyFileName(options),targetFolder + L"policy.xml",filesystem::copy_options::overwrite_existing);
39+
filesystem::copy_file(configDirectory + getPolicyFileName(options),targetDirectory + L"policy.xml",filesystem::copy_options::overwrite_existing);
4040

4141
vector<wstring> xmlFiles = { L"colors.xml", L"english.xml", L"locale.xml", L"log.xml", L"mime.xml", L"thresholds.xml" };
4242
for (auto& xmlFile : xmlFiles)
43-
filesystem::copy_file(configFolder + xmlFile,targetFolder + xmlFile,filesystem::copy_options::overwrite_existing);
43+
filesystem::copy_file(configDirectory + xmlFile,targetDirectory + xmlFile,filesystem::copy_options::overwrite_existing);
4444
}

0 commit comments

Comments
 (0)