Renamed ImageMagick config folder.

ImageMagick · Mar 31, 2024 · 18ff04e · 18ff04e
1 parent a775f38
commit 18ff04e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Configure/Project.cpp b/Configure/Project.cpp
@@ -240,7 +240,7 @@ Project* Project::create(const ConfigureWizard &wizard,const wstring &configFold
   wstring
     configPath;
 
-  configPath=configFolder + L"\\" + name + L"\\ImageMagick";
+  configPath=configFolder + L"\\" + name + L"\\.ImageMagick";
   config.open(pathFromRoot(configPath + L"\\Config.txt"));
   if (!config)
   {
@@ -553,12 +553,12 @@ void Project::setNoticeAndVersion()
       versionFileName;
 
     folder=filesystem::path(licenseFileName).parent_path();
-    versionFileName=folder.wstring()+L"\\ImageMagick\\ImageMagick.version.h";
+    versionFileName=folder.wstring()+L"\\.ImageMagick\\ImageMagick.version.h";
     versionFile=filesystem::path(versionFileName).wstring();
     if (!filesystem::exists(versionFile))
       {
         folder=folder.parent_path();
-        versionFileName=folder.wstring()+L"\\ImageMagick\\ImageMagick.version.h";
+        versionFileName=folder.wstring()+L"\\.ImageMagick\\ImageMagick.version.h";
         versionFile=filesystem::path(versionFileName).wstring();
         if (!filesystem::exists(versionFile))
           throwException(L"Unable to find version file for: " + _name);

diff --git a/Configure/Solution.cpp b/Configure/Solution.cpp
@@ -430,7 +430,7 @@ void Solution::writeVersion(const VersionInfo &versionInfo) const
 
   folderName=_wizard.magickCoreProjectName();
   writeVersion(versionInfo,pathFromRoot(L"ImageMagick\\" + folderName + L"\\version.h.in"),pathFromRoot(L"ImageMagick\\" + folderName + L"\\version.h"));
-  filesystem::copy_file(pathFromRoot(L"ImageMagick\\" + folderName + L"\\version.h"),pathFromRoot(L"Build\\version.h"));
+  filesystem::copy_file(pathFromRoot(L"ImageMagick\\" + folderName + L"\\version.h"),pathFromRoot(L"Build\\version.h"),filesystem::copy_options::overwrite_existing);
   writeVersion(versionInfo,pathFromRoot(L"ImageMagick\\config\\configure.xml.in"),pathFromRoot(_wizard.binDirectory() + L"configure.xml"));
   writeVersion(versionInfo,pathFromRoot(L"Installer\\Inno\\inc\\version.isx.in"),pathFromRoot(L"Installer\\Inno\\inc\\version.isx"));
   writeVersion(versionInfo,pathFromRoot(L"Projects\\utilities\\ImageMagick.version.h.in"),pathFromRoot(L"Projects\\utilities\\ImageMagick.version.h"));