Author: chug
Date: Wed Jul 1 21:17:40 2015
New Revision: 1688738
URL: http://svn.apache.org/r1688738
Log:
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:
Modified:
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1
Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1?rev=1688738&r1=1688737&r2=1688738&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1 (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1 Wed Jul 1
21:17:40 2015
@@ -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"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
