Update appveyor settings

.appveyor.ini

@@ -1,7 +1,6 @@
 [General]
 Branch = master
-ShallowClone = True
-Command=craft
+ShallowClone = False
 
 # Variables defined here override the default value
 # The variable names are casesensitive
@@ -9,10 +8,17 @@ Command=craft
 #Values need to be overwritten to create a chache
 UseCache = True
 CreateCache = False
-QtVersion = 5.12.0
-OpenSslVersion = 1.1.1
+QtVersion = 5.12.4
 CacheVersion = Qt_${Variables:QtVersion}
 
+# just a snapshot
+CraftCoreRevision = bdc54581cdc2ddc87ebcbf1d7da5fe5bf4fbdc04
+CraftBlueprintRevision = 501b141a662ec134710b13492678d11918e9ff12
+
+# set APPVEYOR_BUILD_FOLDER to cwd, override on ci
+APPVEYOR_BUILD_FOLDER = ${Variables:Root}
+CiBuild = True
+
 # Settings applicable for all Crafts matrices
 # Settings are Category/key=value
 # Category is case sensitive
@@ -21,22 +27,20 @@ CacheVersion = Qt_${Variables:QtVersion}
 Version/ConfigVersion = 6
 
 Packager/Destination=${Variables:APPVEYOR_BUILD_FOLDER}/binaries
-Paths/Python = C:\Python36
-Paths/Python27 = C:\Python27
-Paths/DownloadDir = ${Variables:Root}\downloads
-ShortPath/Enabled = False
-ShortPath/EnableJunctions = True
-ShortPath/JunctionDir = C:\CM-SP\
-Packager/CacheDir = ${Variables:Root}\cache
+Paths/Python = C:/Python36
+Paths/Python27 = C:/Python27
+Paths/DownloadDir = ${Variables:Root}/downloads
+Blueprints/BlueprintRoot = ${Variables:Root}/blueprints
+ShortPath/JunctionDir = /_/
+Packager/CacheDir = ${Variables:Root}/cache
 Packager/UseCache = ${Variables:UseCache}
 Packager/CreateCache = ${Variables:CreateCache}
 Packager/CacheVersion = ${Variables:CacheVersion}
 ; Packager/RepositoryUrl = https://files.kde.org/craft/
 Packager/PackageType = PortablePackager
-Packager/Whitelist = *.pdb;*.sym;symbols
-Packager/RepositoryUrl = https://attic.owncloud.com/org/mirror/craft/
+Packager/RepositoryUrl =  https://files.kde.org/craft/master/;https://attic.owncloud.com/org/mirror/craft/
 Compile/BuildType = RelWithDebInfo
-ContinuousIntegration/Enabled = True
+ContinuousIntegration/Enabled = ${Variables:CiBuild}
 
 [BlueprintSettings]
 # don't try to pip install on the ci
@@ -45,11 +49,18 @@ binary/mysql.ignored = True
 libs/llvm-meta.ignored = True
 
 libs/qt5.version = ${Variables:QtVersion}
-win32libs/openssl.version = ${Variables:OpenSslVersion}
-craft/craft-core.version = master
+craft/craft-core.revision = ${Variables:CraftCoreRevision}
+craft/craft-blueprints-kde.revision = ${Variables:CraftBlueprintRevision}
 
 [windows-msvc2017_64-cl]
 General/ABI = windows-msvc2017_64-cl
 
 [windows-msvc2017_32-cl]
 General/ABI = windows-msvc2017_32-cl
+
+[macos-64-clang]
+Paths/Python =
+Paths/Python27 =
+General/ABI = macos-64-clang
+Compile/MakeProgram = make
+Packager/PackageType = MacDMGPackager

.appveyor.yml

@@ -3,7 +3,7 @@ version: '{build}-{branch}'
 branches:
   only:
     - master
-    - 2.5
+    - 2.6
 
 clone_depth: 50
 
@@ -11,7 +11,7 @@ clone_depth: 50
 init:
 - ps: |
     function craft($target) {
-        & C:\Python36\python.exe "C:\CraftMaster\CraftMaster\CraftMaster.py" --config "$env:APPVEYOR_BUILD_FOLDER\appveyor.ini" --variables "APPVEYOR_BUILD_FOLDER=$env:APPVEYOR_BUILD_FOLDER" --target $target -c $args
+        & C:\Python36\python.exe "C:\CraftMaster\CraftMaster\CraftMaster.py" --config "$env:APPVEYOR_BUILD_FOLDER\.appveyor.ini" --variables "APPVEYOR_BUILD_FOLDER=$env:APPVEYOR_BUILD_FOLDER" --target $target -c $args
         if($LASTEXITCODE -ne 0) {exit $LASTEXITCODE}
     }
 
@@ -30,14 +30,15 @@ build_script:
 - ps: |
     craft $env:TARGET --no-cache --src-dir $env:APPVEYOR_BUILD_FOLDER owncloud-client
 
-after_build:
-- ps: |
-    craft $env:TARGET --src-dir $env:APPVEYOR_BUILD_FOLDER --package owncloud-client
-
 test_script:
 - ps: |
    craft $env:TARGET --src-dir $env:APPVEYOR_BUILD_FOLDER --test owncloud-client
 
+after_test:
+- ps: |
+    craft $env:TARGET --src-dir $env:APPVEYOR_BUILD_FOLDER --package owncloud-client
+
+
 environment:
     matrix:
     - TARGET: windows-msvc2017_32-cl