X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=appveyor.yml;h=e87b983e26d7c54cf31a47832194c21d0b63c2f1;hp=bb7cfc13e99aa20d4b22cd84fe5d7f80b40bf237;hb=2f3e8eee76e73ba48581509a9fd95b87f45ded48;hpb=9ad0c72c466afbc98a38b5f57f0ad8ed34d5f4c4

diff --git a/appveyor.yml b/appveyor.yml
index bb7cfc13..e87b983e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,26 +1,42 @@
 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"
 
-    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"};
-                                 "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
-    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
+
+    $webPrevOption = "-DWITH_WEBKIT=OFF -DWITH_WEBENGINE=ON"
+    $webPrevFiles = @(
+                      "bin\\Qt5Positioning\.dll",
+                      "bin\\Qt5PrintSupport\.dll",
+                      "bin\\Qt5Sensors\.dll",
+                      "bin\\Qt5WebChannel\.dll",
+                      "bin\\QtWebEngineProcess\.exe",
+                      "bin\\Qt5WebEngine\.dll",
+                      "bin\\Qt5WebEngineCore\.dll",
+                      "bin\\Qt5WebEngineWidgets\.dll",
+                      "resources\\icudtl\.dat",
+                      "resources\\qtwebengine_resources.pak",
+                      "resources\\qtwebengine_resources_100p.pak",
+                      "resources\\qtwebengine_resources_200p.pak")
+
+    if($env:COMPILER -eq "mingw49_32") {
+        $webPrevOption = "-DWITH_WEBKIT=OFF -DWITH_WEBENGINE=OFF"
+        $webPrevFiles = @()
+    }
+    
+    LogExec cmake -G"Ninja" $env:APPVEYOR_BUILD_FOLDER -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_ROOT" -DUSE_QT5=ON -DWITH_BREEZE=ON -DWITH_BREEZE_DARK=ON -DWITH_OXYGEN=ON $webPrevOption
     CmakeImageInstall
 
-    $imageDir = CreateDeployImage @(
+    $whitelist = @(
                             # whitelist
                             #quassel
                             "quassel.*",
@@ -34,18 +50,15 @@ build_script:
                             #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
-                            "bin\\libeay32\.dll",
-                            "bin\\ssleay32\.dll",
+                            ".*\\libeay32\.dll",
+                            ".*\\ssleay32\.dll",
                             #
                             #icu
                             "bin\\icuin\d+\.dll",
@@ -64,7 +77,10 @@ build_script:
                             "bin\\Qt5Quick\.dll",
                             "bin\\Qt5Script\.dll",
                             "bin\\Qt5Sql\.dll",
+                            "bin\\Qt5Svg\.dll",
+                            "bin\\Qt5WebChannel\.dll",
                             "bin\\Qt5Widgets\.dll",
+                            "bin\\Qt5Xml\.dll",
                             "bin\\Qt5XmlPatterns\.dll",
                             "bin\\.*libglesv2\.dll",
                             "bin\\.*libEGL\.dll",
@@ -75,6 +91,7 @@ build_script:
                             "plugins\\sqldrivers\\qsqlite(?!.*d\.dll).*\.dll$",
                             "plugins\\codecs\\(?!.*d\.dll).*\.dll$",
                             "plugins\\platforms\\qwindows(?!.*d\.dll).*\.dll$",
+                            "plugins\\iconengines\\(?!.*d\.dll).*\.dll$",
                             #
                             #
                             #zlib
@@ -91,39 +108,45 @@ build_script:
                             "bin\\libphononexperimental.*\.dll",
                             "bin\\phonon_backend\\.*",
                             "plugins\\phonon_backend\\.*",
-                            "plugins\\phonon4qt5_backend\\.*") @(
+                            "plugins\\phonon4qt5_backend\\.*")
+
+    $whitelist += $webPrevFiles
+
+    $imageDir = CreateDeployImage $whitelist @(
                             #blacklist
+                            "include",
                             ".*\.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\qml\*" "$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")
+    if(Test-Path "$imageDir\resources")
     {
-        mv "$imageDir\lib\libsnore-qt5\*" "$imageDir"
+        mv "$imageDir\resources\*" "$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:
-    QT_VER: 5.5
+    QT_VER: 5.6
 
     matrix:
-    #mingw
-    - COMPILER: mingw492_32
     #msvc
-    - COMPILER: msvc2013
-    - COMPILER: msvc2013_64
+    - COMPILER: msvc2015_64
+    - COMPILER: msvc2015
+
+    #mingw
+    - COMPILER: mingw49_32
 
 test: off
 
@@ -131,4 +154,3 @@ cache:
     - work\install -> appveyor.yml
     - C:\ProgramData\chocolatey\bin -> appveyor.yml
     - C:\ProgramData\chocolatey\lib -> appveyor.yml
-    - work\appveyorHelp.psm1 -> appveyor.yml