improve appveyor script

appveyor.yml

@@ -1,21 +1,11 @@
-version: 1.0.{build}
+version: {build}
 branches:
   only:
   - master
 build_script:
-- call C:\Qt\5.5\msvc2013_64\bin\qtenv2.bat
-- call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
-- set "MY_ROOT=%APPVEYOR_BUILD_FOLDER:\=/%"
-- set MY_ROOT=%MY_ROOT%/work/install
-- mkdir  %APPVEYOR_BUILD_FOLDER%\work\install
-- mkdir  %APPVEYOR_BUILD_FOLDER%\work\build
-- mkdir  %APPVEYOR_BUILD_FOLDER%\work\build\extra-cmake-modules
-- mkdir  %APPVEYOR_BUILD_FOLDER%\work\build\snorenotify
-- cd %APPVEYOR_BUILD_FOLDER%\work
-- git clone git://anongit.kde.org/extra-cmake-modules.git
-- cd %APPVEYOR_BUILD_FOLDER%\work\build\extra-cmake-modules
-- cmake -G"NMake Makefiles" %APPVEYOR_BUILD_FOLDER%\work\extra-cmake-modules -DCMAKE_INSTALL_PREFIX="%MY_ROOT%"
-- nmake install
-- cd %APPVEYOR_BUILD_FOLDER%\work\build\snorenotify
-- cmake -G"NMake Makefiles" %APPVEYOR_BUILD_FOLDER% -DWITH_SNORE_DAEMON=ON -DWITH_FRONTENDS=ON -DCMAKE_INSTALL_PREFIX="%MY_ROOT%"
-- nmake
+- ps: >-
+   $env:APPVEYOR_BUILD_FOLDER\ci\msvc.ps1 
+   
+
+cache:
+- work\git -> appveyor.yml

ci/ci.psm1

@@ -0,0 +1,11 @@
+#Set environment variables for Visual Studio Command Prompt
+#http://stackoverflow.com/questions/2124753/how-i-can-use-powershell-with-the-visual-studio-command-prompt
+function batCall([string] $path, [string] $arg)
+{
+cmd /c "$(path)&set" |
+foreach {
+  if ($_ -match "=") {
+    $v = $_.split("="); set-item -force -path "ENV:\$($v[0])"  -value "$($v[1])"
+  }
+}
+}

ci/msvc.ps1

@@ -0,0 +1,25 @@
+Import-Module $env:APPVEYOR_BUILD_FOLDER\ci\ci.psm1
+
+batCall "C:\Qt\5.5\msvc2013_64\bin\qtenv2.bat"
+batCall "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
+
+$CMAKE_INSTALL_ROOT=$env:APPVEYOR_BUILD_FOLDER -replace "\\", "/"
+
+$CMAKE_INSTALL_ROOT=$CMAKE_INSTALL_ROOT/work/install
+mkdir $env:APPVEYOR_BUILD_FOLDER\work\install
+mkdir $env:APPVEYOR_BUILD_FOLDER\work\git
+mkdir $env:APPVEYOR_BUILD_FOLDER\work\build
+mkdir $env:APPVEYOR_BUILD_FOLDER\work\build\extra-cmake-modules
+mkdir $env:APPVEYOR_BUILD_FOLDER\work\build\snorenotify
+If ( -Not Test-Path $env:APPVEYOR_BUILD_FOLDER\work\git){
+    cd $env:APPVEYOR_BUILD_FOLDER\work\git
+    git clone git://anongit.kde.org/extra-cmake-modules.git
+}
+
+cd $env:APPVEYOR_BUILD_FOLDER\work\build\extra-cmake-modules
+cmake -G"NMake Makefiles" $env:APPVEYOR_BUILD_FOLDER\work\git\extra-cmake-modules -DCMAKE_INSTALL_PREFIX="$(CMAKE_INSTALL_ROOT)"
+nmake install
+
+cd $env:APPVEYOR_BUILD_FOLDER\work\build\snorenotify
+cmake -G"NMake Makefiles" %APPVEYOR_BUILD_FOLDER% -DWITH_SNORE_DAEMON=ON -DWITH_FRONTENDS=ON -DCMAKE_INSTALL_PREFIX="$(CMAKE_INSTALL_ROOT)"
+nmake

src/plugins/frontends/snarlnetwork/snarlnetwork.cpp

@@ -51,7 +51,6 @@ SnarlNetworkFrontend::~SnarlNetworkFrontend()
 
 void SnarlNetworkFrontend::slotActionInvoked(Snore::Notification notification)
 {
-
     if (notification.isActiveIn(this)) {
         snoreDebug(SNORE_DEBUG) << notification.closeReason();
         callback(notification, QLatin1String("SNP/1.1/304/Notification acknowledged/"));