projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Merge pull request #165 from esainane/coreinfo-dirty-status"
[quassel.git]
/
appveyor.yml
diff --git
a/appveyor.yml
b/appveyor.yml
index
bb7cfc1
..
0aac172
100644
(file)
--- a/
appveyor.yml
+++ b/
appveyor.yml
@@
-10,14
+10,14
@@
build_script:
Import-Module $env:APPVEYOR_BUILD_FOLDER\work\appveyorHelp.psm1
Import-Module $env:APPVEYOR_BUILD_FOLDER\work\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=O
FF
+ 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=O
N
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,25
+96,22
@@
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
7ZipDeployImage
NsisDeployImage $env:APPVEYOR_BUILD_FOLDER\scripts\build\NullsoftInstaller.nsi
@@
-119,11
+119,11
@@
environment:
QT_VER: 5.5
matrix:
QT_VER: 5.5
matrix:
- #mingw
- - COMPILER: mingw492_32
#msvc
#msvc
- - COMPILER: msvc2013
- COMPILER: msvc2013_64
- COMPILER: msvc2013_64
+ - COMPILER: msvc2013
+ #mingw
+ - COMPILER: mingw492_32
test: off
test: off