generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-11-07 05:58:43 +01:00
Code Issues Projects Releases Wiki Activity

Retest cmake

Browse Source 
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
This commit is contained in:
FrancisANDRE
2015-12-20 07:26:22 +01:00
parent 21ce1a0ed7
commit 1accfa38fb
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
appveyor.yml
View File

@@ -37,8 +37,8 @@ environment:
# #
# Command executed with exception: MC: Compiling C:/projects/poco/Foundation/src/pocomsg.mc # Command executed with exception: MC: Compiling C:/projects/poco/Foundation/src/pocomsg.mc
# #
# - builder: cmake - builder: cmake
# vsver: 120 vsver: 120
# ------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------
- builder: msbuild - builder: msbuild
@@ -118,11 +118,11 @@ before_build:
- ps: | - ps: |
if ($env:vsver -eq "120") if ($env:vsver -eq "120")
{ {
pushd $env:VS120COMNTOOLS pushd $env:VS120COMNTOOLS; $yyyy='2013'
} }
if ($env:vsver -eq "140") if ($env:vsver -eq "140")
{ {
pushd $env:VS140COMNTOOLS pushd $env:VS140COMNTOOLS; $yyyy='2015'
} }
cmd /c "vsvars32.bat&set" | cmd /c "vsvars32.bat&set" |
foreach { foreach {
@@ -131,10 +131,7 @@ before_build:
} }
} }
popd popd
write-host "`nVisual Studio $env:vsver Command Prompt variables set." -ForegroundColor Yellow write-host "`nVisual Studio $yyyy Command Prompt variables set." -ForegroundColor Yellow
- where cl
- where mc
- where nmake
# MySQL # MySQL
- ps: | - ps: |
@@ -182,10 +179,9 @@ build_script:
$logger='C:\Progra~1\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll'; $logger='C:\Progra~1\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll';
$samples='samples';$tests='tests';$verbosity='minimal'; $samples='samples';$tests='tests';$verbosity='minimal';
$process = Start-Process -PassThru -NoNewWindow -Wait $process = Start-Process -PassThru -NoNewWindow -Wait -FilePath "buildwin.cmd" -RSO cout -RSE cerr `
-FilePath "buildwin.cmd" -Args "$env:vsver build $env:linkmode $env:configuration $env:platform `
-Args "$env:vsver build $env:linkmode $env:configuration $env:platform $samples $tests msbuild $verbosity $logger" $samples $tests msbuild $verbosity $logger";
-RSO cout -RSE cerr;
gc cout; gc cerr; gc cout; gc cerr;
} }
if ($env:builder -eq "cmake") if ($env:builder -eq "cmake")
@@ -199,11 +195,7 @@ build_script:
} }
} }
before_test: before_test:
- set PATH=%CD%\bin;%PATH%
- set PATH=%CD%\bin64;%PATH%
- set CPPUNIT_IGNORE="class CppUnit::TestCaller<class NTPClientTest>.testTimeSync" - set CPPUNIT_IGNORE="class CppUnit::TestCaller<class NTPClientTest>.testTimeSync"
- set POCO_BASE=%CD% - set POCO_BASE=%CD%
@@ -237,6 +229,7 @@ test_script:
{ {
$env:PATH = "$env:CD\bin64;" + $env:PATH;$suffix = 64; $env:PATH = "$env:CD\bin64;" + $env:PATH;$suffix = 64;
} }
foreach ($component in $components) { foreach ($component in $components) {
if ($excluded -notcontains $component) if ($excluded -notcontains $component)
{ {