Version bump

Author: TheOneRing

CMakeLists.txt

@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.4)
 
-project( snoretoast VERSION 0.5.99)
+project(snoretoast VERSION 0.6.0)
+# Always change the guid when the version is changed SNORETOAST_CALLBACK_GUID
+set(SNORETOAST_CALLBACK_GUID eb1fdd5b-8f70-4b5a-b230-998a2dc19303)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/)
 

README.md

@@ -19,7 +19,7 @@ Releases and binaries can be found [here](https://download.kde.org/stable/snoret
 
 ----------------------------------------------------------
 ```
-Welcome to SnoreToast 0.5.99.
+Welcome to SnoreToast 0.6.0.
 A command line application capable of creating Windows Toast notifications.
 
 ---- Usage ----

src/CMakeLists.txt

@@ -5,33 +5,22 @@ target_include_directories(SnoreToastActions INTERFACE
 )
 add_library(SnoreToast::SnoreToastActions ALIAS SnoreToastActions)
 
-
+configure_file(config.h.in config.h @ONLY)
 add_library(libsnoretoast STATIC snoretoasts.cpp toasteventhandler.cpp linkhelper.cpp utils.cpp)
 target_link_libraries(libsnoretoast PUBLIC runtimeobject shlwapi SnoreToast::SnoreToastActions)
 target_compile_definitions(libsnoretoast PRIVATE UNICODE _UNICODE __WRL_CLASSIC_COM_STRICT__ WIN32_LEAN_AND_MEAN NOMINMAX)
-target_compile_definitions(libsnoretoast PRIVATE
-    SNORETOAST_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}
-    SNORETOAST_VERSION_MINOR=${PROJECT_VERSION_MINOR}
-    SNORETOAST_VERSION_PATCH=${PROJECT_VERSION_PATCH}
-)
 target_compile_definitions(libsnoretoast PUBLIC __WRL_CLASSIC_COM_STRICT__)
 target_include_directories(libsnoretoast PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
 set_target_properties(libsnoretoast PROPERTIES EXPORT_NAME LibSnoreToast)
 add_library(SnoreToast::LibSnoreToast ALIAS libsnoretoast)
-
-
 generate_export_header(libsnoretoast)
 
 create_icon_rc(${PROJECT_SOURCE_DIR}/data/zzz.ico TOAST_ICON)
 add_executable(snoretoast WIN32 main.cpp ${TOAST_ICON})
 target_link_libraries(snoretoast PRIVATE SnoreToast::LibSnoreToast snoreretoastsources)
 target_compile_definitions(snoretoast PRIVATE UNICODE _UNICODE WIN32_LEAN_AND_MEAN NOMINMAX)
-# if there are changes to the callback mechanism we need to change the uuid for the activator SNORETOAST_CALLBACK_UUID
-target_compile_definitions(snoretoast PRIVATE
-    SNORETOAST_CALLBACK_UUID="{383803B6-AFDA-4220-BFC3-0DBF810106BF}"
-)
 add_executable(SnoreToast::SnoreToast ALIAS snoretoast)
 
 install(TARGETS snoretoast SnoreToastActions EXPORT LibSnoreToastConfig RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
-install(FILES snoretoastactions.h DESTINATION include/snoretoast)
+install(FILES snoretoastactions.h ${CMAKE_CURRENT_BINARY_DIR}/config.h DESTINATION include/snoretoast)
 install(EXPORT LibSnoreToastConfig DESTINATION lib/cmake/libsnoretoast NAMESPACE SnoreToast::)

src/config.h.in

@@ -0,0 +1,27 @@
+/*
+    SnoreToast is capable to invoke Windows 8 toast notifications.
+    Copyright (C) 2019  Hannah von Reth <vonreth@kde.org>
+
+    SnoreToast is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    SnoreToast is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with SnoreToast.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+
+#define SNORETOAST_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
+#define SNORETOAST_VERSION_MINOR @PROJECT_VERSION_MINOR@
+#define SNORETOAST_VERSION_PATCH @PROJECT_VERSION_PATCH@
+
+
+#define SNORETOAST_CALLBACK_GUID "@SNORETOAST_CALLBACK_GUID@"

src/main.cpp

@@ -16,6 +16,8 @@
     along with SnoreToast.  If not, see <http://www.gnu.org/licenses/>.
     */
 #include "snoretoasts.h"
+#include "config.h"
+
 #include "toasteventhandler.h"
 
 #include "snoretoastactioncenterintegration.h"

src/snoretoastactioncenterintegration.h

@@ -39,7 +39,7 @@ INotificationActivationCallback : public IUnknown
 };
 
 // The COM server which implements the callback notifcation from Action Center
-class DECLSPEC_UUID(SNORETOAST_CALLBACK_UUID) SnoreToastActionCenterIntegration
+class DECLSPEC_UUID(SNORETOAST_CALLBACK_GUID) SnoreToastActionCenterIntegration
     : public Microsoft::WRL::RuntimeClass<
               Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
               INotificationActivationCallback>
@@ -49,7 +49,7 @@ class DECLSPEC_UUID(SNORETOAST_CALLBACK_UUID) SnoreToastActionCenterIntegration
     {
         static std::wstring _uuid = [] {
             std::wstringstream out;
-            out << SNORETOAST_CALLBACK_UUID;
+            out << SNORETOAST_CALLBACK_GUID;
             return out.str();
         }();
         return _uuid;

src/snoretoasts.cpp

@@ -14,12 +14,13 @@
 
     You should have received a copy of the GNU Lesser General Public License
     along with SnoreToast.  If not, see <http://www.gnu.org/licenses/>.
-    */
+*/
 
 #include "snoretoasts.h"
 #include "toasteventhandler.h"
 #include "linkhelper.h"
 #include "utils.h"
+#include "config.h"
 
 #include <wrl\wrappers\corewrappers.h>
 #include <sstream>