Merge pull request #7 from alexmohr/dev

Added version info

Author: alexmohr

CMakeLists.txt

@@ -1,8 +1,13 @@
 cmake_minimum_required(VERSION 3.12)
 project(thinkpad_keyboard_backlight)
-set(CMAKE_INSTALL_PREFIX /usr/bin)
+set(PROJECT_VERSION_MAJOR  1)
+set(PROJECT_VERSION_MINOR  2)
+set(PROJECT_VERSION_PATCH  1)
 
+# Add version compile definition
+add_compile_definitions(VERSION="${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
+set(CMAKE_INSTALL_PREFIX /usr/bin)
 set(CMAKE_CXX_STANDARD 17)
 
 # Configure optimization
@@ -32,22 +37,27 @@ set(CMAKE_CXX_FLAGS "${OPTIMIZATION_LEVEL} \
 
 set(SERVICE_TARGET_PATH  /etc/systemd/system/keyboard_backlight.service)
 set(APP_TARGET_PATH ${CMAKE_INSTALL_PREFIX}/keyboard_backlight)
+set(APP_NAME keyboard_backlight)
 
 find_package (Threads)
 
 
-
-add_executable(keyboard_backlight kbd_backlight.cpp)
+add_executable(${APP_NAME} kbd_backlight.cpp)
 target_link_libraries (keyboard_backlight ${CMAKE_THREAD_LIBS_INIT})
 
 install(TARGETS keyboard_backlight DESTINATION ${CMAKE_INSTALL_PREFIX})
 
 add_custom_target(service
-        DEPENDS keyboard_backlight
+        DEPENDS ${APP_NAME}
         COMMAND sudo cp ${CMAKE_CURRENT_SOURCE_DIR}/keyboard_backlight.service /etc/systemd/system &&
         sudo systemctl enable --now keyboard_backlight.service
 )
 
 add_custom_target(uninstall
         COMMAND sudo rm -f ${SERVICE_TARGET_PATH}  ${APP_TARGET_PATH}
 )
+
+# Write version to PKGBUILD
+add_custom_command(TARGET ${APP_NAME} POST_BUILD
+        COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/PKGBUILD ${CMAKE_BINARY_DIR} &&
+        sed -i s/VERSION/${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}/g  ${CMAKE_BINARY_DIR}/PKGBUILD)

PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Alexander Mohr <keyboard_backlight at mohr dot io>
 
 pkgname=tp-kb-backlight-git
-pkgver=1.2
+pkgver=VERSION
 pkgrel=1
 pkgdesc='Automated keyboard backlight'
 arch=('x86_64')

README.md

@@ -52,7 +52,8 @@ sudo rm /usr/bin/keyboard_backlight
 
 ## Configuration
 ````
-tp_kbd_backlight help
+keyboard_backlight 1.2.1 
+    -h show this help
     -i ignore an input device
        This device does not re enable keyboard backlight.
        Separate multiple device by space.

kbd_backlight.cpp

@@ -55,8 +55,10 @@ enum MOUSE_MODE {
   NONE = 2
 };
 
-void help() {
-  printf("tp_kbd_backlight help\n"
+void help(const char* name) {
+  printf("%s %s \n", name, VERSION);
+  printf(""
+		 "    -h show this help\n"
 		 "    -i ignore an input device\n"
 		 "       This device does not re enable keyboard backlight.\n"
 		 "       Separate multiple device by space.\n"
@@ -253,7 +255,7 @@ void parse_opts(int argc,
   std::string token;
   unsigned long mode;
 
-  while ((c = getopt(argc, argv, "s:i:t:m:b:f")) != -1) {
+  while ((c = getopt(argc, argv, "hs:i:t:m:b:f")) != -1) {
 	switch (c) {
 	  case 'b':
 		backlightPath = optarg;
@@ -289,8 +291,9 @@ void parse_opts(int argc,
 		  exit(EXIT_FAILURE);
 		}
 		break;
+	  case 'h':
 	  default:
-		help();
+		help(argv[0]);
 		exit(EXIT_FAILURE);
 	}
   }