Use cygwin for 32 bits and cygwin64 for 64 bits.

Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
This commit is contained in:
FrancisANDRE 2016-03-15 13:45:33 +01:00
parent 3f5324351b
commit eb4b1dbbde

View File

@ -104,8 +104,19 @@ matrix:
install:
- set POCO_BASE=%CD%
- set PATH=c:\cygwin\bin;%PATH%
- set PATH=C:\ProgramData\chocolatey\bin;%PATH%
- ps: |
if ($env:builder -eq "cygwin")
{
if ($env:platform -eq "Win32")
{
$env:PATH = "c:\cygwin\bin;" + $env:PATH
}
if ($env:platform -eq "x64")
{
$env:PATH = "c:\cygwin64\bin;" + $env:PATH
}
}
- uname -a
- cat /proc/cpuinfo
- cat /proc/meminfo
@ -132,8 +143,8 @@ install:
- ps: |
if ($env:builder -eq "cmake")
{
$env:PATH = $env:ChocolateyInstall + "\bin" + ";" + $env:PATH
$env:PATH = $env:ChocolateyInstall + "\lib\jom\content" + ";" + $env:PATH
$env:PATH = $env:ChocolateyInstall + "\bin;" + $env:PATH
$env:PATH = $env:ChocolateyInstall + "\lib\jom\content;" + $env:PATH
}
# -------------------------------------------------------------------------------------------
@ -281,10 +292,10 @@ before_build:
copy $from $to
}
}
$env:MYSQL_PWD="Password12!"
$cmd = 'mysql -e "create database pocotestdb;" --user=root';
iex "& $cmd"
}
$env:MYSQL_PWD="Password12!"
$cmd = 'mysql -e "create database pocotestdb;" --user=root';
iex "& $cmd"
# -------------------------------------------------------------------------------------------
# -------------------------------------------------------------------------------------------