From 80c9fa76a469406c49033c6ab60d35a8017e44d4 Mon Sep 17 00:00:00 2001
From: Stefano Sinigardi <stesinigardi@hotmail.com>
Date: Sun, 3 Mar 2019 14:34:50 +0100
Subject: [PATCH] refresh build scripts

---
 build.ps1 | 68 +++++++++++++++++++++++++++++++++++++++----------------
 build.sh  |  7 ------
 2 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/build.ps1 b/build.ps1
index 708d9b65..e2657061 100755
--- a/build.ps1
+++ b/build.ps1
@@ -1,43 +1,73 @@
 #!/usr/bin/env pwsh
 
 $number_of_build_workers=8
-$vstype="Community"
+#$shared_lib="-DBUILD_SHARED_LIBS:BOOL=ON"
 
-if ((Get-Command "cl.exe" -ErrorAction SilentlyContinue) -eq $null)
-{
-  pushd "C:\Program Files (x86)\Microsoft Visual Studio\2017\${vstype}\Common7\Tools"
+if (Test-Path env:VCPKG_ROOT) {
+  $vcpkg_path = "$env:VCPKG_ROOT"
+  Write-Host "Found vcpkg in VCPKG_ROOT: $vcpkg_path"
+}
+elseif (Test-Path "${env:WORKSPACE}\vcpkg") {
+  $vcpkg_path = "${env:WORKSPACE}\vcpkg"
+  Write-Host "Found vcpkg in WORKSPACE\vcpkg: $vcpkg_path"
+}
+else {
+  Write-Host "Skipping vcpkg-enabled builds because the VCPKG_ROOT environment variable is not defined, using self-distributed libs`n" -ForegroundColor Yellow
+}
+
+if ($null -eq $env:VCPKG_DEFAULT_TRIPLET) {
+  Write-Host "No default triplet has been set-up for vcpkg. Defaulting to x64-windows`n" -ForegroundColor Yellow
+  $vcpkg_triplet = "x64-windows"
+}
+else {
+  $vcpkg_triplet = $env:VCPKG_DEFAULT_TRIPLET
+}
+
+if ($vcpkg_triplet -Match "x86") {
+  Throw "darknet is supported only in x64 builds!"
+}
+
+if ($null -eq (Get-Command "cl.exe" -ErrorAction SilentlyContinue)) {
+  $vstype = "Professional"
+  if (Test-Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\${vstype}\Common7\Tools") {
+    Write-Host "Found VS 2017 Professional"
+  }
+  else {
+    $vstype = "Community"
+    Write-Host "Found VS 2017 Community"
+  }
+  Push-Location "C:\Program Files (x86)\Microsoft Visual Studio\2017\${vstype}\Common7\Tools"
   cmd /c "VsDevCmd.bat -arch=x64 & set" |
-    foreach {
+    ForEach-Object {
     if ($_ -match "=") {
       $v = $_.split("="); set-item -force -path "ENV:\$($v[0])"  -value "$($v[1])"
     }
   }
-  popd
+  Pop-Location
   Write-Host "Visual Studio 2017 ${vstype} Command Prompt variables set.`n" -ForegroundColor Yellow
 }
 
-if (Test-Path env:VCPKG_ROOT) {
+if (Test-Path $vcpkg_path) {
   # DEBUG
   New-Item -Path .\build_win_debug -ItemType directory -Force
   Set-Location build_win_debug
-  cmake -G "Visual Studio 15 2017" -T "host=x64" -A "x64" "-DCMAKE_TOOLCHAIN_FILE=$env:VCPKG_ROOT\scripts\buildsystems\vcpkg.cmake" "-DVCPKG_TARGET_TRIPLET=$env:VCPKG_DEFAULT_TRIPLET"   "-DCMAKE_BUILD_TYPE=Debug" ..
-  cmake --build . --config Debug --parallel ${number_of_build_workers}
+  cmake -G "Visual Studio 15 2017" -T "host=x64" -A "x64" "-DCMAKE_TOOLCHAIN_FILE=$vcpkg_path\scripts\buildsystems\vcpkg.cmake" "-DVCPKG_TARGET_TRIPLET=$vcpkg_triplet" "-DCMAKE_BUILD_TYPE=Debug" $shared_lib ..
+  cmake --build . --config Debug --parallel ${number_of_build_workers} --target install
   Set-Location ..
 
   # RELEASE
   New-Item -Path .\build_win_release -ItemType directory -Force
   Set-Location build_win_release
-  cmake -G "Visual Studio 15 2017" -T "host=x64" -A "x64" "-DCMAKE_TOOLCHAIN_FILE=$env:VCPKG_ROOT\scripts\buildsystems\vcpkg.cmake" "-DVCPKG_TARGET_TRIPLET=$env:VCPKG_DEFAULT_TRIPLET"   "-DCMAKE_BUILD_TYPE=Release" ..
-  cmake --build . --config Release --parallel ${number_of_build_workers}
+  cmake -G "Visual Studio 15 2017" -T "host=x64" -A "x64" "-DCMAKE_TOOLCHAIN_FILE=$vcpkg_path\scripts\buildsystems\vcpkg.cmake" "-DVCPKG_TARGET_TRIPLET=$vcpkg_triplet" "-DCMAKE_BUILD_TYPE=Release" $shared_lib ..
+  cmake --build . --config Release --parallel ${number_of_build_workers} --target install
   Set-Location ..
 }
 else {
-  Write-Host "Skipping vcpkg-enabled builds because the VCPKG_ROOT environment variable is not defined`n" -ForegroundColor Yellow
+  # USE LOCAL PTHREAD LIB, NO VCPKG, ONLY RELEASE
+  # if you want to manually force this case, remove VCPKG_ROOT env variable and remember to use "vcpkg integrate remove" in case you had enabled user-wide vcpkg integration
+  New-Item -Path .\build_win_release_novcpkg -ItemType directory -Force
+  Set-Location build_win_release_novcpkg
+  cmake -G "Visual Studio 15 2017" -T "host=x64" -A "x64" $shared_lib ..
+  cmake --build . --config Release --parallel ${number_of_build_workers} --target install
+  Set-Location ..
 }
-
-# USE LOCAL PTHREAD LIB, NO VCPKG: remember to use "vcpkg.exe integrate remove" in case you had enable user-wide vcpkg integration
-New-Item -Path .\build_win_release_cuda_int_libs -ItemType directory -Force
-Set-Location build_win_release_cuda_int_libs
-cmake -G "Visual Studio 15 2017" -T "host=x64" -A "x64" ..
-cmake --build . --config Release --parallel ${number_of_build_workers}
-Set-Location ..
diff --git a/build.sh b/build.sh
index 444c5b24..aa6f9eda 100755
--- a/build.sh
+++ b/build.sh
@@ -2,13 +2,6 @@
 
 number_of_build_workers=8
 
-if [[ "$OSTYPE" == "darwin"* && "$1" == "gcc" ]]; then
-  export CC="/usr/local/bin/gcc-8"
-  export CXX="/usr/local/bin/g++-8"
-fi
-
-rm -f uselib darknet
-
 # DEBUG
 mkdir -p build_debug
 cd build_debug