Renamed Output folder to Artifacts.

ImageMagick · Aug 1, 2024 · 54fca9f · 54fca9f
1 parent 8bf5c10
commit 54fca9f
Show file tree

Hide file tree

Showing 18 changed files with 48 additions and 48 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+/Artifacts/*
+
 /Build/package.version.h
 /Build/version.h
 
@@ -13,12 +15,10 @@
 /ImageMagick
 
 /Installer/Inno/config.isx
-/Installer/Inno/Output/*
+/Installer/Inno/Artifacts/*
 
 /OptionalDependencies/*
 
-/Output/*
-
 /Projects/utilities/ImageMagick.version.h
 
 /*.Projects/*

diff --git a/Output/bin/delegates.xml → Artifacts/bin/delegates.xml b/Output/bin/delegates.xml → Artifacts/bin/delegates.xml
diff --git a/Output/bin/sRGB.icc → Artifacts/bin/sRGB.icc b/Output/bin/sRGB.icc → Artifacts/bin/sRGB.icc
diff --git a/Output/bin/type-ghostscript.xml → Artifacts/bin/type-ghostscript.xml b/Output/bin/type-ghostscript.xml → Artifacts/bin/type-ghostscript.xml
diff --git a/Output/bin/type.xml → Artifacts/bin/type.xml b/Output/bin/type.xml → Artifacts/bin/type.xml
diff --git a/Configure/ConfigureWizard.cpp b/Configure/ConfigureWizard.cpp
@@ -43,7 +43,7 @@ ConfigureWizard::~ConfigureWizard()
 
 const wstring ConfigureWizard::binDirectory() const
 {
-  return(L"Output\\bin\\");
+  return(L"Artifacts\\bin\\");
 }
 
 const wstring ConfigureWizard::channelMaskDepth() const

diff --git a/Configure/ProjectFile.cpp b/Configure/ProjectFile.cpp
@@ -238,13 +238,13 @@ bool ProjectFile::isLib() const
 
 const wstring ProjectFile::libDirectory() const
 {
-    return(rootPath + L"Output\\lib\\");
+    return(rootPath + L"Artifacts\\lib\\");
 }
 
 const wstring ProjectFile::outputDirectory() const
 {
   if (_project->isFuzz())
-    return(rootPath + L"Output\\fuzz\\");
+    return(rootPath + L"Artifacts\\fuzz\\");
 
   if (isLib())
     return(libDirectory());

diff --git a/Configure/Solution.cpp b/Configure/Solution.cpp
@@ -429,7 +429,7 @@ void Solution::writeNotice(const VersionInfo &versionInfo) const
   wofstream
     notice;
 
-  notice.open(pathFromRoot(L"Output\\NOTICE.txt"));
+  notice.open(pathFromRoot(L"Artifacts\\NOTICE.txt"));
   if (!notice)
     return;
 

diff --git a/Installer/Inno/README.txt b/Installer/Inno/README.txt
@@ -50,5 +50,5 @@ prompt.
 5)
    Distribution package is available as
 
-     VisualMagick\installer\output\ImageMagick-7.X-X-X-Q8-dll.exe
+     Artifacts\ImageMagick-7.X-X-X-Q8-dll.exe
 
diff --git a/Installer/Inno/inc/files-base.isx b/Installer/Inno/inc/files-base.isx
@@ -18,25 +18,25 @@
 
 ; Executables
 #ifdef MagickVersion7
-  Source: "..\..\Output\bin\magick.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
+  Source: "..\..\Artifacts\bin\magick.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
   #ifdef MagickDynamicPackage
-    Source: "..\..\Output\bin\compare.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
-    Source: "..\..\Output\bin\composite.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
-    Source: "..\..\Output\bin\conjure.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
-    Source: "..\..\Output\bin\identify.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
-    Source: "..\..\Output\bin\mogrify.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
-    Source: "..\..\Output\bin\montage.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
-    Source: "..\..\Output\bin\stream.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
+    Source: "..\..\Artifacts\bin\compare.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
+    Source: "..\..\Artifacts\bin\composite.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
+    Source: "..\..\Artifacts\bin\conjure.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
+    Source: "..\..\Artifacts\bin\identify.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
+    Source: "..\..\Artifacts\bin\mogrify.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
+    Source: "..\..\Artifacts\bin\montage.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
+    Source: "..\..\Artifacts\bin\stream.exe"; DestDir: {#MagickAppDirectory}; Tasks: legacy_support; Flags: ignoreversion
   #endif
 #else
-  Source: "..\..\Output\bin\convert.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
-  Source: "..\..\Output\bin\compare.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
-  Source: "..\..\Output\bin\composite.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
-  Source: "..\..\Output\bin\conjure.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
-  Source: "..\..\Output\bin\identify.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
-  Source: "..\..\Output\bin\mogrify.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
-  Source: "..\..\Output\bin\montage.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
-  Source: "..\..\Output\bin\stream.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
+  Source: "..\..\Artifacts\bin\convert.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
+  Source: "..\..\Artifacts\bin\compare.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
+  Source: "..\..\Artifacts\bin\composite.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
+  Source: "..\..\Artifacts\bin\conjure.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
+  Source: "..\..\Artifacts\bin\identify.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
+  Source: "..\..\Artifacts\bin\mogrify.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
+  Source: "..\..\Artifacts\bin\montage.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
+  Source: "..\..\Artifacts\bin\stream.exe"; DestDir: {#MagickAppDirectory}; Flags: ignoreversion
 #endif
 
 ; Path Tool

diff --git a/Installer/Inno/inc/files-configs.isx b/Installer/Inno/inc/files-configs.isx
@@ -17,14 +17,14 @@
 #endif
 
 ; Configuration files
-Source: "..\..\Output\bin\colors.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
-Source: "..\..\Output\bin\configure.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
-Source: "..\..\Output\bin\english.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
-Source: "..\..\Output\bin\delegates.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
-Source: "..\..\Output\bin\locale.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
-Source: "..\..\Output\bin\log.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
-Source: "..\..\Output\bin\policy.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
-Source: "..\..\Output\bin\sRGB.icc"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
-Source: "..\..\Output\bin\thresholds.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
-Source: "..\..\Output\bin\type.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
-Source: "..\..\Output\bin\type-ghostscript.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
+Source: "..\..\Artifacts\bin\colors.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
+Source: "..\..\Artifacts\bin\configure.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
+Source: "..\..\Artifacts\bin\english.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
+Source: "..\..\Artifacts\bin\delegates.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
+Source: "..\..\Artifacts\bin\locale.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
+Source: "..\..\Artifacts\bin\log.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
+Source: "..\..\Artifacts\bin\policy.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
+Source: "..\..\Artifacts\bin\sRGB.icc"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
+Source: "..\..\Artifacts\bin\thresholds.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
+Source: "..\..\Artifacts\bin\type.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
+Source: "..\..\Artifacts\bin\type-ghostscript.xml"; DestDir: {#MagickConfigDirectory}; Flags: confirmoverwrite
diff --git a/Installer/Inno/inc/files-development.isx b/Installer/Inno/inc/files-development.isx
@@ -17,13 +17,13 @@
 #endif
 
 ;  Development libraries
-Source: "..\..\Output\lib\CORE_RL_Magick++_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
+Source: "..\..\Artifacts\lib\CORE_RL_Magick++_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
 #ifdef MagickVersion7
-Source: "..\..\Output\lib\CORE_RL_MagickCore_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
-Source: "..\..\Output\lib\CORE_RL_MagickWand_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
+Source: "..\..\Artifacts\lib\CORE_RL_MagickCore_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
+Source: "..\..\Artifacts\lib\CORE_RL_MagickWand_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
 #else
-Source: "..\..\Output\lib\CORE_RL_magick_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
-Source: "..\..\Output\lib\CORE_RL_wand_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
+Source: "..\..\Artifacts\lib\CORE_RL_magick_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
+Source: "..\..\Artifacts\lib\CORE_RL_wand_.lib"; DestDir: "{app}\lib"; Tasks: install_Devel; Flags: ignoreversion
 #endif
 ;  Development headers
 #ifdef MagickVersion7

diff --git a/Installer/Inno/inc/files-dlls.isx b/Installer/Inno/inc/files-dlls.isx
@@ -45,7 +45,7 @@ Source: {#MSVCRedist}\{#MagickArchitecture}\Microsoft.VC143.MFC\mfc140u.dll; Des
 
 ; DLLs
 #ifdef MagickDynamicPackage
-Source: "..\..\Output\bin\CORE_RL*.dll"; DestDir: {#MagickLibDirectory}; Flags: ignoreversion
-Source: "..\..\Output\bin\IM_MOD_RL*.dll"; DestDir: {#MagickCodersDirectory}; Flags: ignoreversion
-Source: "..\..\Output\bin\FILTER_*.dll"; DestDir: {#MagickFiltersDirectory}; Flags: ignoreversion
+Source: "..\..\Artifacts\bin\CORE_RL*.dll"; DestDir: {#MagickLibDirectory}; Flags: ignoreversion
+Source: "..\..\Artifacts\bin\IM_MOD_RL*.dll"; DestDir: {#MagickCodersDirectory}; Flags: ignoreversion
+Source: "..\..\Artifacts\bin\FILTER_*.dll"; DestDir: {#MagickFiltersDirectory}; Flags: ignoreversion
 #endif
diff --git a/Installer/Inno/inc/files-documentation.isx b/Installer/Inno/inc/files-documentation.isx
@@ -19,7 +19,7 @@
 ; Release documentation files
 Source: "..\..\ImageMagick\ChangeLog.md"; DestDir: "{app}"; Flags: ignoreversion; DestName: "ChangeLog.md"
 Source: "..\..\ImageMagick\LICENSE"; DestDir: "{app}"; Flags: ignoreversion; DestName: "License.txt"
-Source: "..\..\Output\NOTICE.txt"; DestDir: "{app}"; Flags: ignoreversion;
+Source: "..\..\Artifacts\NOTICE.txt"; DestDir: "{app}"; Flags: ignoreversion;
 ; Web pages
 Source: "..\..\ImageMagick\index.html"; DestDir: "{app}"; Flags: ignoreversion isreadme
 Source: "..\..\ImageMagick\images\*.gif"; DestDir: "{app}\images"; Flags: ignoreversion

diff --git a/Installer/Inno/inc/setup.isx b/Installer/Inno/inc/setup.isx
@@ -57,5 +57,5 @@ LicenseFile=txt\license.rtf
 InfoBeforeFile=txt\before.rtf
 InfoAfterFile=txt\after.rtf
 UninstallDisplayIcon={#MagickAppDirectory}\ImageMagick.ico
-OutputDir=Output
+OutputDir=Artifacts
 OutputBaseFilename={#MagickPackageName}-{#MagickPackageFullVersionText}-Q{#QuantumDepth}{#Hdri}-{#MagickArchitecture}-{#MagickPackageType}
diff --git a/Installer/Msix/ImageMagick.Q16-HDRI.aip b/Installer/Msix/ImageMagick.Q16-HDRI.aip
@@ -121,7 +121,7 @@
     <ROW BootstrOptKey="GlobalOptions" DownloadFolder="[AppDataFolder][|Manufacturer]\[|ProductName]\prerequisites" Options="2"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="Build_MSIX" BuildName="Build_MSIX" BuildOrder="1" BuildType="7" PackageFolder="Output" PackageFileName="ImageMagick.Q16-HDRI" Languages="en" UwpTargetDesktop="TargetDeviceFamily" UwpAppXBuildPackageBundle="true" UwpAppInstallerManifestFile="MsixAppInstallerData.xml"/>
+    <ROW BuildKey="Build_MSIX" BuildName="Build_MSIX" BuildOrder="1" BuildType="7" PackageFolder="Artifacts" PackageFileName="ImageMagick.Q16-HDRI" Languages="en" UwpTargetDesktop="TargetDeviceFamily" UwpAppXBuildPackageBundle="true" UwpAppInstallerManifestFile="MsixAppInstallerData.xml"/>
     <ROW BuildKey="Build_MSIXSubBuild" BuildName="x64" BuildOrder="2" BuildType="8" ParentBuild="Build_MSIX"/>
     <ROW BuildKey="Build_MSIXSubBuild_1" BuildName="arm64" BuildOrder="3" BuildType="8" ParentBuild="Build_MSIX"/>
   </COMPONENT>

diff --git a/Projects/PerlMagick/Makefile.PL.in b/Projects/PerlMagick/Makefile.PL.in
@@ -64,7 +64,7 @@ sub MY::postamble
 {
   '
 create-import-library:
-  pexports ../../Output/bin/$$LIB_NAME$$.dll > $$LIB_NAME$$.def
+  pexports ../../Artifacts/bin/$$LIB_NAME$$.dll > $$LIB_NAME$$.def
   dlltool -d $$LIB_NAME$$.def -l $$LIB_NAME$$.a
 
 Magick.pm: create-import-library

diff --git a/Readme.md b/Readme.md
@@ -42,4 +42,4 @@ in the root of the repository:
 - IM7.StaticDLL.sln (Static Multi-threaded DLL runtimes)
 - IM7.Static.sln (Static Multi-threaded runtimes)
 
-Open the solution to start building ImageMagick. The binaries will be created in the `Output\bin` folder.
+Open the solution to start building ImageMagick. The binaries will be created in the `Artifacts\bin` folder.