Skip to content

Commit 45f00ea

Browse files
committed
Corrected install of resource on non windows platforms.
1 parent 921fc25 commit 45f00ea

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

build/shared/install.Magick.Native.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ set -e
33

44
github_username=$1
55
github_token=$2
6-
config=$3
7-
arch=$4
6+
platform=$3
7+
architecture=$4
88

99
cd src/Magick.Native
1010
./create-nuget-config.sh $github_username $github_token
11-
./install.sh $config $arch
11+
./install.sh $platform $architecture

src/Magick.Native/install.sh

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,30 @@ cleanupPackage() {
2121
}
2222

2323
copyToTestProject() {
24-
local runtime=$1
25-
local platform=$2
24+
local platform=$1
25+
local architecture=$2
2626
local quantum=$3
2727
local openmp=$4
2828

2929
folder=../../tests/Magick.NET.Tests/bin/Test$quantum$openmp/AnyCPU/net8.0
3030
mkdir -p $folder
31-
cp temp/$runtime/Release$quantum$openmp/$platform/Magick.Native-$quantum$openmp-$platform.dll* $folder | true
31+
cp temp/$platform/Release$quantum$openmp/$architecture/Magick.Native-$quantum$openmp-$architecture.dll* $folder | true
3232

33-
folder=resources/Release$quantum
33+
folder=resources/Release$quantum/$architecture
3434
mkdir -p $folder
35-
cp temp/resources/Release$quantum$openmp/*.xml $folder | true
35+
cp temp/resources/Release$quantum$openmp/$architecture/*.xml $folder | true
3636
}
3737

3838
copyToTestProjects() {
39-
local runtime=$1
40-
local platform=$2
41-
42-
copyToTestProject $runtime $platform "Q8" ""
43-
copyToTestProject $runtime $platform "Q16" ""
44-
copyToTestProject $runtime $platform "Q16-HDRI" ""
45-
copyToTestProject $runtime $platform "Q8" "-OpenMP"
46-
copyToTestProject $runtime $platform "Q16" "-OpenMP"
47-
copyToTestProject $runtime $platform "Q16-HDRI" "-OpenMP"
39+
local platform=$1
40+
local architecture=$2
41+
42+
copyToTestProject $platform $architecture "Q8" ""
43+
copyToTestProject $platform $architecture "Q16" ""
44+
copyToTestProject $platform $architecture "Q16-HDRI" ""
45+
copyToTestProject $platform $architecture "Q8" "-OpenMP"
46+
copyToTestProject $platform $architecture "Q16" "-OpenMP"
47+
copyToTestProject $platform $architecture "Q16-HDRI" "-OpenMP"
4848
}
4949

5050
cleanupPackage

0 commit comments

Comments
 (0)