projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable self message support for ZNC
[quassel.git]
/
appveyor.yml
diff --git
a/appveyor.yml
b/appveyor.yml
index
bb7cfc1
..
a29db76
100644
(file)
--- a/
appveyor.yml
+++ b/
appveyor.yml
@@
-1,23
+1,23
@@
version: '{build}'
build_script:
- ps: |
version: '{build}'
build_script:
- ps: |
- if ( !(Test-Path "$env:APPVEYOR_BUILD_FOLDER\work\appveyorHelp.psm1"))
- {
- mkdir $env:APPVEYOR_BUILD_FOLDER\work\
- Start-FileDownload https://raw.githubusercontent.com/TheOneRing/appVeyorHelp/master/appveyorHelp.psm1 -FileName $env:APPVEYOR_BUILD_FOLDER\work\appveyorHelp.psm1
- }
$ErrorActionPreference="Stop"
$ErrorActionPreference="Stop"
- Import-Module $env:APPVEYOR_BUILD_FOLDER\
work
\appveyorHelp.psm1
+ Import-Module $env:APPVEYOR_BUILD_FOLDER\
scripts\build
\appveyorHelp.psm1
- Init @("ninja", "png2ico", "nsis") ([ordered]@{"git://anongit.kde.org/extra-cmake-modules.git" = @{"branch" = "master"};
+ Init @("ninja", "png2ico", "nsis"
, "7zip.commandline"
) ([ordered]@{"git://anongit.kde.org/extra-cmake-modules.git" = @{"branch" = "master"};
"https://github.com/Snorenotify/SnoreGrowl.git" = @{"branch" = "v0.4.0"; "buildType" = "Release"};
"https://github.com/Snorenotify/SnoreGrowl.git" = @{"branch" = "v0.4.0"; "buildType" = "Release"};
- "git://anongit.kde.org/snorenotify.git" = @{"branch" = "v0.
6
.0"; "buildType" = "Release"}})
+ "git://anongit.kde.org/snorenotify.git" = @{"branch" = "v0.
7
.0"; "buildType" = "Release"}})
mkdir -Force $env:APPVEYOR_BUILD_FOLDER\work\build\$env:APPVEYOR_PROJECT_NAME
cd $env:APPVEYOR_BUILD_FOLDER\work\build\$env:APPVEYOR_PROJECT_NAME
mkdir -Force $env:APPVEYOR_BUILD_FOLDER\work\build\$env:APPVEYOR_PROJECT_NAME
cd $env:APPVEYOR_BUILD_FOLDER\work\build\$env:APPVEYOR_PROJECT_NAME
- LogExec cmake -G"Ninja" $env:APPVEYOR_BUILD_FOLDER -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_ROOT" -DUSE_QT5=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=ON -DWITH_WEBKIT=OFF
+ if($env:QT_VER -eq 5.5) {
+ $webkitOption = "-DWITH_WEBKIT=ON"
+ } else {
+ $webkitOption = "-DWITH_WEBKIT=OFF"
+ }
+ LogExec cmake -G"Ninja" $env:APPVEYOR_BUILD_FOLDER -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_ROOT" -DUSE_QT5=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=ON $webkitOption
CmakeImageInstall
$imageDir = CreateDeployImage @(
CmakeImageInstall
$imageDir = CreateDeployImage @(
@@
-34,18
+34,15
@@
build_script:
#snore
"bin\\.*snore.*\.dll",
"lib\\plugins\\libsnore.*\\libsnore_backend.*\.dll",
#snore
"bin\\.*snore.*\.dll",
"lib\\plugins\\libsnore.*\\libsnore_backend.*\.dll",
- "lib\\plugins\\libsnore.*\\libsnore_secondary_backend.*\.dll",
- #snorenotify 0.5
- "lib\\libsnore.*\\libsnore_backend.*\.dll",
- #
- "bin\\SnoreToast\.exe",
+ "lib\\plugins\\libsnore.*\\libsnore_settings_backend.*\.dll",
+ "lib\\plugins\\libsnore.*\\libsnore_secondarybackend.*\.dll", "lib\\plugins\\libsnore.*\\libsnore_settings_secondarybackend.*\.dll", "bin\\SnoreToast\.exe",
#
#Growl
"bin\\.*snoregrowl.*\.dll",
#
#ssl
#
#Growl
"bin\\.*snoregrowl.*\.dll",
#
#ssl
- "
bin
\\libeay32\.dll",
- "
bin
\\ssleay32\.dll",
+ "
.*
\\libeay32\.dll",
+ "
.*
\\ssleay32\.dll",
#
#icu
"bin\\icuin\d+\.dll",
#
#icu
"bin\\icuin\d+\.dll",
@@
-60,10
+57,16
@@
build_script:
"bin\\Qt5Opengl\.dll",
"bin\\Qt5Multimedia\.dll",
"bin\\Qt5MultimediaWidgets\.dll",
"bin\\Qt5Opengl\.dll",
"bin\\Qt5Multimedia\.dll",
"bin\\Qt5MultimediaWidgets\.dll",
+ "bin\\Qt5Positioning\.dll",
+ "bin\\Qt5PrintSupport\.dll",
"bin\\Qt5Qml\.dll",
"bin\\Qt5Quick\.dll",
"bin\\Qt5Script\.dll",
"bin\\Qt5Qml\.dll",
"bin\\Qt5Quick\.dll",
"bin\\Qt5Script\.dll",
+ "bin\\Qt5Sensors\.dll",
"bin\\Qt5Sql\.dll",
"bin\\Qt5Sql\.dll",
+ "bin\\Qt5WebChannel\.dll",
+ "bin\\Qt5WebKit\.dll",
+ "bin\\Qt5WebKitWidgets\.dll",
"bin\\Qt5Widgets\.dll",
"bin\\Qt5XmlPatterns\.dll",
"bin\\.*libglesv2\.dll",
"bin\\Qt5Widgets\.dll",
"bin\\Qt5XmlPatterns\.dll",
"bin\\.*libglesv2\.dll",
@@
-93,37
+96,40
@@
build_script:
"plugins\\phonon_backend\\.*",
"plugins\\phonon4qt5_backend\\.*") @(
#blacklist
"plugins\\phonon_backend\\.*",
"plugins\\phonon4qt5_backend\\.*") @(
#blacklist
+ "include",
".*\.h",
".*\.h",
- "lib\\plugins\\libsnore.*\\libsnore_backend_freedesktop\.dll"
+ "lib\\plugins\\libsnore.*\\libsnore_backend_freedesktop\.dll",
+ ".*\.pdb",
+ ".*plugind\.dll"
)
mv "$imageDir\bin\*" "$imageDir\"
#mv "$imageDir\lib\qca-qt5\crypto" "$imageDir\crypto"
)
mv "$imageDir\bin\*" "$imageDir\"
#mv "$imageDir\lib\qca-qt5\crypto" "$imageDir\crypto"
+ mv "$imageDir\qml\*" "$imageDir"
mv "$imageDir\plugins\*" "$imageDir"
if(Test-Path "$imageDir\lib\plugins")
{
mv "$imageDir\lib\plugins\*" "$imageDir"
}
mv "$imageDir\plugins\*" "$imageDir"
if(Test-Path "$imageDir\lib\plugins")
{
mv "$imageDir\lib\plugins\*" "$imageDir"
}
- #snorenotify 0.5 plugins
- if(Test-Path "$imageDir\lib\libsnore-qt5")
- {
- mv "$imageDir\lib\libsnore-qt5\*" "$imageDir"
- }
- rm -Recurse "$imageDir\plugins\*"
- rm -Recurse "$imageDir\lib"
- rm -Recurse "$imageDir\bin"
+ DeleteEmptyFodlers $imageDir
7ZipDeployImage
NsisDeployImage $env:APPVEYOR_BUILD_FOLDER\scripts\build\NullsoftInstaller.nsi
environment:
7ZipDeployImage
NsisDeployImage $env:APPVEYOR_BUILD_FOLDER\scripts\build\NullsoftInstaller.nsi
environment:
- QT_VER: 5.
5
+ QT_VER: 5.
6
matrix:
matrix:
+ #msvc
+ - COMPILER: msvc2015_64
+ QT_VER: 5.6
+ - COMPILER: msvc2015
+ QT_VER: 5.6
+
#mingw
#mingw
+ - COMPILER: mingw49_32
+ QT_VER: 5.6
- COMPILER: mingw492_32
- COMPILER: mingw492_32
- #msvc
- - COMPILER: msvc2013
- - COMPILER: msvc2013_64
+ QT_VER: 5.5
test: off
test: off
@@
-131,4
+137,3
@@
cache:
- work\install -> appveyor.yml
- C:\ProgramData\chocolatey\bin -> appveyor.yml
- C:\ProgramData\chocolatey\lib -> appveyor.yml
- work\install -> appveyor.yml
- C:\ProgramData\chocolatey\bin -> appveyor.yml
- C:\ProgramData\chocolatey\lib -> appveyor.yml
- - work\appveyorHelp.psm1 -> appveyor.yml