From bb88cf3dcb42328d3615c37026dd190a5bf18606 Mon Sep 17 00:00:00 2001
From: "Charles E. Rolke" <chug@apache.org>
Date: Wed, 1 Jul 2015 21:17:40 +0000
Subject: QPID-6611: Getting Visual Studio executables to run from where they
 are built. Leaving cmake as-is, this patch adds current VS build folder to
 the PATH. It further adds an arg to make-install.bat to select a build
 configuration:

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1688738 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1 | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'qpid/cpp')

diff --git a/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1 b/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1
index a698dc88ba..c9ed769e97 100644
--- a/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1
+++ b/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1
@@ -331,10 +331,14 @@ REM     >
 REM
 REM The solution was generated with cmake command line:
 REM $cmakeLine
+SET se_buildconfig=%1
 ECHO %PATH% | FINDSTR /I boost > NUL
 IF %ERRORLEVEL% EQU 0 ECHO WARNING: Boost is defined in your path multiple times!
 SET PATH=$boostRoot\lib;%PATH%
 SET QPID_BUILD_ROOT=$buildRoot
+IF NOT DEFINED se_buildconfig (GOTO :CONT)
+SET PATH=%QPID_BUILD_ROOT%\src\%se_buildconfig%;%PATH%
+:CONT
 ECHO Environment set for $slnName $studioVersion $vsPlatform $nBits-bit development.
 ")
     Write-Host "        $buildRoot\$outfileName"
@@ -385,15 +389,18 @@ function WriteMakeInstallBat
         [string] $vsEnvironment,
         [string] $vsBuildTarget
     )
-
+    $newTarget = $vsBuildTarget -replace "Debug", "%mi_buildconfig%"
     $out = @("@ECHO OFF
 REM
 REM Call this command procedure from a command prompt to run 'make install'
+REM   %1 selects build configuration. Defaults to Debug
 REM
 setlocal
-call $varfileName
+SET mi_buildconfig=%1
+IF NOT DEFINED mi_buildconfig (SET mi_buildconfig=Debug)
+call $varfileName %mi_buildconfig%
 call $vsEnvironment
-devenv qpid-cpp.sln /build $vsBuildTarget /project INSTALL
+devenv qpid-cpp.sln /build $newTarget /project INSTALL
 endlocal
 ")
     Write-Host "        $buildRoot\$outfileName"
-- 
cgit v1.2.1