fix: fail copy *.so when build on docker on windows

takuya-takeuchi · Jul 12, 2019 · d6d391b · d6d391b
1 parent 3f0e0b8
commit d6d391b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/nuget/BuildOSX.ps1 b/nuget/BuildOSX.ps1
@@ -14,7 +14,7 @@ $Current = Get-Location
 $DlibDotNetRoot = (Split-Path (Get-Location) -Parent)
 $DlibDotNetSourceRoot = Join-Path $DlibDotNetRoot src
 
-$BuildSourceHash = [Config]::GetBinaryLibraryHash()
+$BuildSourceHash = [Config]::GetBinaryLibraryOSXHash()
 
 $BuildTargets = @()
 $BuildTargets += New-Object PSObject -Property @{Target = "cpu";  Architecture = 64; RID = "$OperatingSystem-x64";   CUDA = 0   }

diff --git a/nuget/BuildUbuntu16.ps1 b/nuget/BuildUbuntu16.ps1
@@ -23,7 +23,7 @@ $DockerFileDir = Join-Path $DockerDir build  | `
                  Join-Path -ChildPath $Distribution | `
                  Join-Path -ChildPath $DistributionVersion
 
-$BuildSourceHash = [Config]::GetBinaryLibraryHash()
+$BuildSourceHash = [Config]::GetBinaryLibraryLinuxHash()
 
 $BuildTargets = @()
 $BuildTargets += New-Object PSObject -Property @{Target = "cpu";  Architecture = 64; RID = "$OperatingSystem-x64";   CUDA = 0   }

diff --git a/nuget/BuildUtils.ps1 b/nuget/BuildUtils.ps1
@@ -118,20 +118,19 @@ class Config
       $this._Option = $Option
    }
 
-   static [hashtable] GetBinaryLibraryHash()
+   static [hashtable] GetBinaryLibraryWindowsHash()
    {
-      if ($global:IsWindows)
-      {
-         return [Config]::BuildLibraryWindowsHash
-      }
-      elseif ($global:IsMacOS)
-      {
-         return [Config]::BuildLibraryOSXHash
-      }
-      else
-      {
-         return [Config]::BuildLibraryLinuxHash
-      }
+      return [Config]::BuildLibraryWindowsHash
+   }
+
+   static [hashtable] GetBinaryLibraryOSXHash()
+   {
+      return [Config]::BuildLibraryOSXHash
+   }
+
+   static [hashtable] GetBinaryLibraryLinuxHash()
+   {
+      return [Config]::BuildLibraryLinuxHash
    }
 
    [int] GetArchitecture()

diff --git a/nuget/BuildWindows.ps1 b/nuget/BuildWindows.ps1
@@ -14,7 +14,7 @@ $Current = Get-Location
 $DlibDotNetRoot = (Split-Path (Get-Location) -Parent)
 $DlibDotNetSourceRoot = Join-Path $DlibDotNetRoot src
 
-$BuildSourceHash = [Config]::GetBinaryLibraryHash()
+$BuildSourceHash = [Config]::GetBinaryLibraryWindowsHash()
 
 $IntelMKLDir = $env:MKL_WIN
 if ([string]::IsNullOrEmpty($IntelMKLDir))