fix: ignore configuration param for linux and osx

takuya-takeuchi · Jul 12, 2019 · ba10dc5 · ba10dc5
1 parent d5d34bd
commit ba10dc5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/nuget/BuildOSX.ps1 b/nuget/BuildOSX.ps1
@@ -55,7 +55,7 @@ foreach($BuildTarget in $BuildTargets)
       $dll = $BuildSourceHash[$key]
       $dstDir = Join-Path $Current $libraryDir
 
-      CopyToArtifact -configuration "Release" -srcDir $srcDir -build $build -libraryName $dll -dstDir $dstDir -rid $rid
+      CopyToArtifact -srcDir $srcDir -build $build -libraryName $dll -dstDir $dstDir -rid $rid
    }
 }
 

diff --git a/nuget/BuildUbuntu16.ps1 b/nuget/BuildUbuntu16.ps1
@@ -97,7 +97,7 @@ foreach($BuildTarget in $BuildTargets)
       $dll = $BuildSourceHash[$key]
       $dstDir = Join-Path $Current $libraryDir
 
-      CopyToArtifact -configuration "Release" -srcDir $srcDir -build $build -libraryName $dll -dstDir $dstDir -rid $rid
+      CopyToArtifact -srcDir $srcDir -build $build -libraryName $dll -dstDir $dstDir -rid $rid
    }
 }
 

diff --git a/nuget/BuildUtils.ps1 b/nuget/BuildUtils.ps1
@@ -416,11 +416,22 @@ function Build([Config]$Config)
    Set-Location -Path $Current
 }
 
-function CopyToArtifact([string]$configuration, [string]$srcDir, [string]$build, [string]$libraryName, [string]$dstDir, [string]$rid)
+function CopyToArtifact()
 {
-   $binary = Join-Path ${srcDir} ${build}  | `
-            Join-Path -ChildPath ${configuration} | `
-            Join-Path -ChildPath ${libraryName}
+   Param([string]$srcDir, [string]$build, [string]$libraryName, [string]$dstDir, [string]$rid, [string]$configuration="")
+
+   if ($configuration)
+   {
+      $binary = Join-Path ${srcDir} ${build}  | `
+               Join-Path -ChildPath ${configuration} | `
+               Join-Path -ChildPath ${libraryName}
+   }
+   else
+   {
+      $binary = Join-Path ${srcDir} ${build}  | `
+               Join-Path -ChildPath ${libraryName}
+   }
+
    $output = Join-Path $dstDir runtimes | `
             Join-Path -ChildPath ${rid} | `
             Join-Path -ChildPath native | `