diff --git a/appveyor.yml b/appveyor.yml index 14d68e62..72dea542 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,7 +40,7 @@ for: except: - master only_commits: - message: /\[build\]|\[deploy\]/ + message: /\[build\]/ configuration: - Debug @@ -90,8 +90,8 @@ deploy: - provider: NuGet api_key: - secure: I8fmE32nASXVHph+lmAlTKafL0YXmf/S021DgkCxe4+Sjgk2L9SIgp0IFQs9qESG - skip_symbols: true + secure: EY1214+kiGlWCnigIhzOkbjRqI+69VjELzgPdWREzWpNyuVK62V0x2ukoZiY8w6T + # skip_symbols: true artifact: /.*\.nupkg/ on: branch: master diff --git a/scripts/appveyor/appveyor_get_build.ps1 b/scripts/appveyor/appveyor_get_build.ps1 index cc44cb4d..9eea109c 100644 --- a/scripts/appveyor/appveyor_get_build.ps1 +++ b/scripts/appveyor/appveyor_get_build.ps1 @@ -8,7 +8,7 @@ function Get-AppVeyorBuild { throw "not an appveyor build." } - return Invoke-RestMethod -Method GET -Uri "https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG" -Headers @{ + return Invoke-RestMethod -Method GET -Uri "https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/build/$env:APPVEYOR_BUILD_VERSION" -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_API_TOKEN" "Content-type" = "application/json" } diff --git a/scripts/appveyor/install_coapp.ps1 b/scripts/appveyor/install_coapp.ps1 index d03d5c00..83041ac4 100644 --- a/scripts/appveyor/install_coapp.ps1 +++ b/scripts/appveyor/install_coapp.ps1 @@ -1,6 +1,6 @@ # Download the CoApp tools. -$msiPath = "$($env:USERPROFILE)\CoApp.Tools.Powershell.msi" -(New-Object Net.WebClient).DownloadFile('http://coapp.org/files/CoApp.Tools.Powershell.msi', $msiPath) +$msiPath = "$($env:USERPROFILE)\Development.CoApp.Tools.Powershell.msi" +(New-Object Net.WebClient).DownloadFile('http://coapp.org/files/Development.CoApp.Tools.Powershell.msi', $msiPath) # Install the CoApp tools from the downloaded .msi. Start-Process -FilePath msiexec -ArgumentList /i, $msiPath, /quiet -Wait diff --git a/scripts/coapp/kiwano.autopkg.template b/scripts/coapp/kiwano.autopkg.template index bf625a43..070b23d7 100644 --- a/scripts/coapp/kiwano.autopkg.template +++ b/scripts/coapp/kiwano.autopkg.template @@ -86,46 +86,30 @@ nuget { files { #defines { - SRC_ROOT = ..\..\src\; - KIWANO_ROOT = ${SRC_ROOT}kiwano\; - KIWANO_AUDIO_ROOT = ${SRC_ROOT}kiwano-audio\; - KIWANO_NETWORK_ROOT = ${SRC_ROOT}kiwano-network\; - KIWANO_IMGUI_ROOT = ${SRC_ROOT}kiwano-imgui\; - - OUTPUT_DIR = ..\..\projects\output\; + SRC_ROOT = ..\..\src; + OUTPUT_DIR = ..\..\projects\output; } include: { - ${SRC_ROOT}**\*.h, - ${SRC_ROOT}**\*.hpp + ${SRC_ROOT}\**\*.h, + ${SRC_ROOT}\**\*.hpp }; - [Win32, v140, Debug] { - lib += ${OUTPUT_DIR}v140\Win32\Debug\*.lib; - symbols += ${OUTPUT_DIR}v140\Win32\Debug\*.pdb; - } - [Win32, v140, Release] { - lib += ${OUTPUT_DIR}v140\Win32\Release\*.lib; - } - - [Win32, v141, Debug] { - lib += ${OUTPUT_DIR}v141\Win32\Debug\*.lib; - symbols += ${OUTPUT_DIR}v141\Win32\Debug\*.pdb; - } - [Win32, v141, Release] { - lib += ${OUTPUT_DIR}v141\Win32\Release\*.lib; - } - - [Win32, v142, Debug] { - lib += ${OUTPUT_DIR}v142\Win32\Debug\*.lib; - symbols += ${OUTPUT_DIR}v142\Win32\Debug\*.pdb; - } - [Win32, v142, Release] { - lib += ${OUTPUT_DIR}v142\Win32\Release\*.lib; - } - // kiwano-network 3-rd patry - bin += ${KIWANO_NETWORK_ROOT}dlls\*.dll; + bin: { ${SRC_ROOT}\kiwano-network\dlls\*.dll }; + + ("v140,v141,v142", "Win32", "Debug") => { + [${0},${1},${2}] { + lib: { ${OUTPUT_DIR}\${0}\${1}\${2}\*.lib }; + symbols: { ${OUTPUT_DIR}\${0}\${1}\${2}\*.pdb }; + }; + }; + + ("v140,v141,v142", "Win32", "Release") => { + [${0},${1},${2}] { + lib: { ${OUTPUT_DIR}\${0}\${1}\${2}\*.lib }; + }; + }; };