Patches because of changes in the directory structure of ImageMagick.

Author: dlemstra

.devcontainer/post-create-command.sh

@@ -6,4 +6,4 @@ ln -s /ImageMagick/imagemagick-windows dependencies
 
 cd src/Magick.Native
 ../../build/shared/build.native.sh $DC_CONFIG $DC_ARCH $DC_OPEN_MP
-../../build/shared/copy.native.sh ../../build/$DC_CONFIG-$DC_ARCH/output $DC_CONFIG $DC_ARCH $DC_OPEN_MP
+../../build/shared/copy.native.sh ../../build/$DC_CONFIG-$DC_ARCH/artifacts $DC_CONFIG $DC_ARCH $DC_OPEN_MP

.dockerignore

@@ -1,11 +1,11 @@
 src/ImageMagick/imagemagick-windows
-src/ImageMagick/output
+src/ImageMagick/artifacts
 src/Magick.Native/.vs
 src/Magick.Native/bin
 src/Magick.Native/lib
 src/wasm-file-creator/lib
 src/wasm-file-creator/node_modules
-build/**/output
+build/**/artifacts
 publish
 tools
 .git

.gitignore

@@ -2,15 +2,14 @@
 .vscode
 publish/**/files/*
 src/ImageMagick/imagemagick-windows
-src/ImageMagick/output/*
 src/Magick.Native/lib
 src/Magick.Native/bin
 src/Magick.Native/Q8
 src/Magick.Native/Q16
 src/Magick.Native/Q16-HDRI
 src/wasm-file-creator/lib
 src/wasm-file-creator/node_modules
-**/output/*
+**/artifacts/*
 **/tools/*
 *.aps
 *.log

build/linux-arm64/verify.cmd

@@ -8,4 +8,4 @@ set image=mcr.microsoft.com/dotnet/runtime:6.0-focal-arm64v8
 rem set image=public.ecr.aws/lambda/dotnet:6-arm64
 
 docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-docker run -v %~dp0../:/build %image% /build/shared/verify.Native.sh /build/%config%-%arch%/output %config% %arch% %openmp%
+docker run -v %~dp0../:/build %image% /build/shared/verify.Native.sh /build/%config%-%arch%/artifacts %config% %arch% %openmp%

build/linux-musl-x64/verify.cmd

@@ -9,4 +9,4 @@ rem set image=mcr.microsoft.com/dotnet/aspnet:5.0-alpine
 rem set image=mcr.microsoft.com/dotnet/runtime:3.1-alpine
 rem set image=mcr.microsoft.com/dotnet/runtime:5.0-alpine
 
-docker run -v %~dp0../:/build %image% /bin/sh -c "apk update ; apk add bash ; /build/shared/verify.Native.sh /build/%config%-%arch%/output %config% %arch% %openmp%"
+docker run -v %~dp0../:/build %image% /bin/sh -c "apk update ; apk add bash ; /build/shared/verify.Native.sh /build/%config%-%arch%/artifacts %config% %arch% %openmp%"

build/linux-x64/verify.cmd

@@ -16,4 +16,4 @@ rem set image=mcr.microsoft.com/dotnet/runtime:latest
 rem set image=amazon/aws-lambda-dotnet:6
 rem set image=public.ecr.aws/lambda/dotnet:6-x86_64
 
-docker run -v %~dp0../:/build %image% /build/shared/verify.Native.sh /build/%config%-%arch%/output %config% %arch% %openmp%
+docker run -v %~dp0../:/build %image% /build/shared/verify.Native.sh /build/%config%-%arch%/artifacts %config% %arch% %openmp%

build/windows/build.imagemagick.ps1

@@ -31,7 +31,7 @@ function createSolution($configureOptions) {
 
 function copyIncludes($folder) {
     $source = fullPath "src\ImageMagick\imagemagick-windows"
-    $destination = fullPath "src\ImageMagick\output\includes\$folder"
+    $destination = fullPath "src\ImageMagick\artifacts\includes\$folder"
     Remove-Item $destination -Recurse -ErrorAction Ignore
     [void](New-Item -ItemType directory -Path "$destination\MagickCore")
     Copy-Item "$source\ImageMagick\MagickCore\*.h" "$destination\MagickCore"
@@ -46,8 +46,8 @@ function copyIncludes($folder) {
 }
 
 function copyResources($folder) {
-    $source = fullPath "src\ImageMagick\imagemagick-windows\Output\bin"
-    $destination = fullPath "src\ImageMagick\output\resources\$folder"
+    $source = fullPath "src\ImageMagick\imagemagick-windows\Artifacts\bin"
+    $destination = fullPath "src\ImageMagick\artifacts\resources\$folder"
     Remove-Item $destination -Recurse -ErrorAction Ignore
     [void](New-Item -ItemType directory -Path "$destination")
     foreach ($xmlFile in [IO.Directory]::GetFiles($source, "*.xml")) {
@@ -60,8 +60,8 @@ function copyResources($folder) {
 }
 
 function copyLibraries($config, $folder) {
-    $source = fullPath "src\ImageMagick\imagemagick-windows\Output\lib"
-    $destination = fullPath "src\ImageMagick\output\libraries\$folder"
+    $source = fullPath "src\ImageMagick\imagemagick-windows\Artifacts\lib"
+    $destination = fullPath "src\ImageMagick\artifacts\libraries\$folder"
     Remove-Item $destination -Recurse -ErrorAction Ignore
     [void](New-Item -ItemType directory -Path $destination)
     if ($config -eq "Debug") {
@@ -73,7 +73,7 @@ function copyLibraries($config, $folder) {
     }
 }
 
-function copyOutput($config, $name, $platformName) {
+function copyArtifacts($config, $name, $platformName) {
     $folder = "$config$name\$platformName"
     copyIncludes $folder
     copyResources $folder
@@ -105,7 +105,7 @@ function buildImageMagick($config, $name, $platformName) {
 
     $options = "Configuration=$config,Platform=$($platformName),VCBuildAdditionalOptions=/#arch:SSE"
     build "src\ImageMagick\imagemagick-windows\IM7.Static.$($platformName).sln" $options
-    copyOutput $config $name $platformName
+    copyArtifacts $config $name $platformName
 }
 
 function buildConfigure() {

build/windows/copy.native.ps1

@@ -24,7 +24,7 @@ function copyNative($config, $quantumName, $platformName, $destination) {
 
     $source = fullPath "src\Magick.Native\Resources\xml\*.xml"
     Copy-Item $source $resourcesFolder
-    $source = fullPath "src\ImageMagick\output\resources\$config$quantumName\$platformName\*.xml"
+    $source = fullPath "src\ImageMagick\artifacts\resources\$config$quantumName\$platformName\*.xml"
     Copy-Item $source $resourcesFolder
 }
 

build/linux-x64/output/.gitkeep renamed to src/ImageMagick/artifacts/includes/.gitkeep

@@ -145,7 +145,7 @@
   </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>.;..\ImageMagick\output\includes\$(Configuration)\$(PlatformName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..\ImageMagick\artifacts\includes\$(Configuration)\$(PlatformName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <WarningLevel>Level4</WarningLevel>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -156,7 +156,7 @@
       <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>..\ImageMagick\output\libraries\$(Configuration)\$(PlatformName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\ImageMagick\artifacts\libraries\$(Configuration)\$(PlatformName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>