Replace BUILD_TOOL_ARGS by BUILD_TOOL_FLAGS

Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
This commit is contained in:
FrancisANDRE 2015-12-15 00:25:11 +01:00
parent 7ad73d9f96
commit 23f3727dcf
2 changed files with 13 additions and 10 deletions

View File

@ -13,7 +13,6 @@ platform:
- Win32
- x64
configuration:
- release
- debug
@ -26,7 +25,7 @@ install:
- set
# MySQL 32 bit is not available by default on AppVeyor
- ps: |
if ($platform -eq "Win32")
if ($env:platform -eq "Win32")
{
if (Test-Path "c:\mysql-5.7.9-win32") {
echo "using mysql-5.7.9-win32 from cache"
@ -44,14 +43,18 @@ environment:
bundling: bundled
matrix:
# - builder: cmake
# ssl: Win32
# vc: amd64_x86
# target: x86
- builder: 120
linkmode: shared
- builder: 140
linkmode: shared
# - builder: 120
# linkmode: static_md
# - builder: 120
# linkmode: static_mt
before_build:
@ -103,14 +106,14 @@ build_script:
before_test:
- set PATH=%CD%\bin;%PATH%
- set EXCLUDE_TESTS=NetSLL_Win,Data/ODBC,Data/MySQL,PDF
- set EXCLUDE_TESTS=Data/ODBC,Data/MySQL,PDF
after_test:
test_script:
# - build\script\runtests2.cmd %suffix%
- ps: |
if ($env:$configuration -eq "release")
if ($env:configuration -eq "release")
{
& .\build\script\runtests2.cmd %suffix%
}

View File

@ -143,7 +143,7 @@ if "%BUILD_TOOL%"=="msbuild" (
if not %LOGGER%X==X (
set BUILD_TOOL_FLAGS=%BUILD_TOOL_FLAGS% /logger:%LOGGER%
)
set BUILD_TOOL_FLAGS=%BUILD_TOOL_ARGS% /nologo /v:%VERBOSITY%
set BUILD_TOOL_FLAGS=%BUILD_TOOL_FLAGS% /nologo /v:%VERBOSITY%
)
if not "%BUILD_TOOL%"=="msbuild" (
set ACTIONSW=/