X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=appveyor.yml;h=30d9dc12d678138aad967e35815cebafa6269faf;hp=743531d19e569c80891019f60be147cce7e1a875;hb=d9a837786c9661ba733d1601ddbf7c83801233af;hpb=f6c73e9ba5696ce106ee1599afa00741204e6350

diff --git a/appveyor.yml b/appveyor.yml
index 743531d1..30d9dc12 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,131 +1,38 @@
 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
+image: Visual Studio 2017
 
-    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"}})
+init:
+- ps: |
+    function craft() {
+        & C:\python36\python.exe "C:\CraftMaster\$env:TARGET\craft\bin\craft.py" $args
+        if($LASTEXITCODE -ne 0) {exit $LASTEXITCODE}
+    }
 
+install:
+- ps: |
+    mkdir C:\CraftMaster | Out-Null
+    #use cmd to silence powershell behaviour for stderr
+    & cmd /C "git clone -q --depth=1 git://anongit.kde.org/craftmaster.git C:\CraftMaster\CraftMaster 2>&1"
+    & C:\python36\python.exe C:\CraftMaster\CraftMaster\CraftMaster.py --config $env:APPVEYOR_BUILD_FOLDER\appveyor.ini --target $env:TARGET
+    craft -p quassel
+    craft nsis
+    craft --install-deps quassel
 
-    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
-    CmakeImageInstall
+build_script:
+- ps: |
+    craft --no-cache --src-dir $env:APPVEYOR_BUILD_FOLDER quassel
 
-    $imageDir = CreateDeployImage @(
-                            # whitelist
-                            #quassel
-                            "quassel.*",
-                            #
-                            #gccruntime",
-                            "bin\\libgomp.*\.dll",
-                            "bin\\libgcc_s_.*\.dll",
-                            "bin\\libwinpthread.*\.dll",
-                            "bin\\libstdc.*\.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",
-                            #
-                            #Growl
-                            "bin\\.*snoregrowl.*\.dll",
-                            #
-                            #ssl
-                            ".*\\libeay32\.dll",
-                            ".*\\ssleay32\.dll",
-                            #
-                            #icu
-                            "bin\\icuin\d+\.dll",
-                            "bin\\icuuc\d+\.dll",
-                            "bin\\icudt\d+\.dll",
-                            #
-                            #qt
-                            "bin\\Qt5Core\.dll",
-                            "bin\\Qt5Declarative\.dll",
-                            "bin\\Qt5Gui\.dll",
-                            "bin\\Qt5Network\.dll",
-                            "bin\\Qt5Opengl\.dll",
-                            "bin\\Qt5Multimedia\.dll",
-                            "bin\\Qt5MultimediaWidgets\.dll",
-                            "bin\\Qt5Qml\.dll",
-                            "bin\\Qt5Quick\.dll",
-                            "bin\\Qt5Script\.dll",
-                            "bin\\Qt5Sql\.dll",
-                            "bin\\Qt5Widgets\.dll",
-                            "bin\\Qt5XmlPatterns\.dll",
-                            "bin\\.*libglesv2\.dll",
-                            "bin\\.*libEGL\.dll",
-                            "qml\\.*",
-                            #bin\\QtXml\.dll
-                            #
-                            "plugins\\imageformats\\(?!.*d\.dll).*\.dll$",
-                            "plugins\\sqldrivers\\qsqlite(?!.*d\.dll).*\.dll$",
-                            "plugins\\codecs\\(?!.*d\.dll).*\.dll$",
-                            "plugins\\platforms\\qwindows(?!.*d\.dll).*\.dll$",
-                            #
-                            #
-                            #zlib
-                            "bin\\libz.dll",
-                            #
-                            #qca
-                            "bin\\libqca.*\.dll",
-                            "lib\\qca-qt5\\crypto\\.*",
-                            "certs\\.*",
-                            #
-                            #phonon
-                            "bin\\libphonon.*\.dll",
-                            "bin\\phonon.*\.dll",
-                            "bin\\libphononexperimental.*\.dll",
-                            "bin\\phonon_backend\\.*",
-                            "plugins\\phonon_backend\\.*",
-                            "plugins\\phonon4qt5_backend\\.*") @(
-                            #blacklist
-                            "include",
-                            ".*\.h",
-                            "lib\\plugins\\libsnore.*\\libsnore_backend_freedesktop\.dll",
-                            ".*\.pdb",
-                            ".*plugind\.dll"
-                            )
+test_script:
+- ps: |
+    craft --src-dir $env:APPVEYOR_BUILD_FOLDER --test quassel
 
-    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"
-    }
-    DeleteEmptyFodlers $imageDir
-    7ZipDeployImage
-    NsisDeployImage $env:APPVEYOR_BUILD_FOLDER\scripts\build\NullsoftInstaller.nsi
+on_success:
+- ps: |
+    craft --src-dir $env:APPVEYOR_BUILD_FOLDER --package quassel
+    Get-ChildItem C:\CraftMaster\$env:TARGET\tmp\* | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
 
 environment:
-    QT_VER: 5.5
-
     matrix:
-    #msvc
-    - COMPILER: msvc2013_64
-    - COMPILER: msvc2013
-    #mingw
-    - COMPILER: mingw492_32
-
-test: off
-
-cache:
-    - work\install -> appveyor.yml
-    - C:\ProgramData\chocolatey\bin -> appveyor.yml
-    - C:\ProgramData\chocolatey\lib -> appveyor.yml
-    - work\appveyorHelp.psm1 -> appveyor.yml
+    - TARGET: windows-msvc2017_64-cl
+    - TARGET: windows-msvc2017_32-cl