Changed daemon name to 'qtlicd'

10 files changed, 25 insertions, 25 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 585a7cd..a016ef0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@
 
 cmake_minimum_required(VERSION 3.1)
 
-project(licd)
+project(qtlicd)
 
 cmake_policy(SET CMP0042 NEW)
 
diff --git a/README.md b/README.md
index 26b0d36..8829c86 100644
--- a/README.md
+++ b/README.md
@@ -34,18 +34,18 @@ qtlicensetool ALWAYS reads its settings from the [default] section, no matter wh
 
 At first, start Qt License Server on some Windows machine
 
-- If you didn't edit daemon settings after building: Check the ip address from Win box where the License Server is running, then copy it  to the line stating 'server_addr' in the settings file (licd.ini). This will be user as the default site license server address. After installation, it must be edited:
-    Linux: (as root) in /opt/licd/licd.ini
-    Widows (as admin) in C:\Program Files/licd/licd.ini
+- If you didn't edit daemon settings after building: Check the ip address from Win box where the License Server is running, then copy it  to the line stating 'server_addr' in the settings file (qtlicd.ini). This will be user as the default site license server address. After installation, it must be edited:
+    Linux: (as root) in /opt/qtlicd/qtlicd.ini
+    Widows (as admin) in C:\Program Files/qtlicd/qtlicd.ini
 Start the daemon, as described in respective Linux/Windows INSTALL file.
 
-- You also can 'manually' start licd in no-daemon mode (as normal CLI app):
+- You also can 'manually' start qtlicd in no-daemon mode (as normal CLI app):
     - First make sure daemon is not running
     - from the command line, cd to the directory where daemon is installed, then give a command:
-        > ./licd --nodaemon (Linux/Mac)
-        > licd.exe --nodaemon (Windows)
+        > ./qtlicd --nodaemon (Linux/Mac)
+        > qtlicd.exe --nodaemon (Windows)
     - You now can see immediately what happens in there. Stop like any other app with Ctrl-C
-    - Note that where ever you start licd, it will always read settings from installation folder.
+    - Note that where ever you start qtlicd, it will always read settings from installation folder.
  # MOC-wrapper
     If the setup is made correct (moc binary changed to the link pointing to mocwrapper), MOC license checks should happen in backround without any user actions, each time a build is being done.
 
@@ -74,7 +74,7 @@ Start the daemon, as described in respective Linux/Windows INSTALL file.
         > qtlicensetool --daemonversion         : Prints out a daemon version number
 
 # To  test MOC and plugin interfaces without actually using MOC or Qt Creator (plugin):
-    Use any TCP/IP-enabled app to connect to localhost's port 60000 (or whichever is stated in licd.ini). For example, with telnet:
+    Use any TCP/IP-enabled app to connect to localhost's port 60000 (or whichever is stated in qtlicd.ini). For example, with telnet:
         telnet localhost 60000
 
     After connecting, issue a command like:
@@ -88,7 +88,7 @@ Start the daemon, as described in respective Linux/Windows INSTALL file.
 
 From each component included, you can ask their version using --version switch as follows:
     [app name] --version   <--- [app name].exe in Windows, of course
-        - where [app name] can be one of: 'licd', 'qtlicensetool', 'moc' (or 'mocwrapper')
-        - Note! By default, 'licd' and 'mocwrapper' are not in $PATH by default, so you must call them with their absolute path.
-           In Windows case, you can add "C:\Program Files\licd\" in environment PATH to ease up calling 'qtlongterm'
-In Linux, the binaries are in /opt/licd after installation, and "C:\Program Files\licd\" in Windows.
+        - where [app name] can be one of: 'qtlicd', 'qtlicensetool', 'moc' (or 'mocwrapper')
+        - Note! By default, 'qtlicd' and 'mocwrapper' are not in $PATH by default, so you must call them with their absolute path.
+           In Windows case, you can add "C:\Program Files\qtlicd\" in environment PATH to ease up calling 'qtlongterm'
+In Linux, the binaries are in /opt/qtlicd after installation, and "C:\Program Files\qtlicd\" in Windows.
diff --git a/build_linux.sh b/build_linux.sh
index c02b731..0297dcb 100755
--- a/build_linux.sh
+++ b/build_linux.sh
@@ -5,7 +5,7 @@
 #
 
 
-name=licd
+name=qtlicd
 deploy_dir=deploy
 INSTALL=false
 
diff --git a/include/commonsetup.h b/include/commonsetup.h
index a3cf72e..65a78e3 100644
--- a/include/commonsetup.h
+++ b/include/commonsetup.h
@@ -36,13 +36,13 @@
 #define LICENSE_FILE_EXTENSION      ".json"
 
 #if __APPLE__ || __MACH__
-    #define WORKING_DIR             "/opt/licd"
+    #define WORKING_DIR             "/opt/qtlicd"
 #elif __linux__
-    #define WORKING_DIR             "/opt/licd"
+    #define WORKING_DIR             "/opt/qtlicd"
 #else
     #define WORKING_DIR             "C:/Program Files/licd/"
 #endif
-#define DAEMON_SETTINGS_FILE    WORKING_DIR "/licd.ini"
+#define DAEMON_SETTINGS_FILE    WORKING_DIR "/qtlicd.ini"
 #define SHA256_HASH_SIZE        32
 #define SECS_IN_HOUR            3600
 #define SECS_IN_DAY             86400
diff --git a/include/version.h b/include/version.h
index 11b6707..15bdcbd 100644
--- a/include/version.h
+++ b/include/version.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #define DAEMON_VERSION_MAJOR     "2"
-#define DAEMON_VERSION_MINOR     "0.4"
+#define DAEMON_VERSION_MINOR     "1.0"
 #define DAEMON_VERSION           DAEMON_VERSION_MAJOR "." DAEMON_VERSION_MINOR
 #define LICD_SERVICE_DESCRIPTION "Qt Licensing service"
 #define COPYRIGHT_TEXT           "Copyright (C) 2022 The Qt Company Ltd"
diff --git a/linux_daemon/linuxdaemon.cpp b/linux_daemon/linuxdaemon.cpp
index 55b883d..0b8a10a 100644
--- a/linux_daemon/linuxdaemon.cpp
+++ b/linux_daemon/linuxdaemon.cpp
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
         }
         // If command-line parameter is "--version", show the version and exit.
         else if (strcmp(argv[1], "--version") == 0) {
-                std::cout << "Qt License Daemon (licd) v" << DAEMON_VERSION << " "
+                std::cout << "Qt License Daemon (qtlicd) v" << DAEMON_VERSION << " "
                         << COPYRIGHT_TEXT << std::endl;
                 return 0;
         }
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
         }
     }
     if (!all_ok) {
-        printf("\nUsage: qtlicenser [option] [value]\n");
+        printf("\nUsage: qtlicd [option] [value]\n");
         printf("Supported options are:\n");
         printf("  --port <port number>   : Specify TCP/IP server port. If omitted, default is used.\n");
         printf("  --nodaemon             : Run in non-daemon mode (in console like any other CLI app)\n");
diff --git a/linux_service_scripts/installer.sh b/linux_service_scripts/installer.sh
index 404fb90..fa87397 100755
--- a/linux_service_scripts/installer.sh
+++ b/linux_service_scripts/installer.sh
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-name=licd
+name=qtlicd
 installdir=/opt/${name}
 
 function exit_fail {
diff --git a/linux_service_scripts/licd.service b/linux_service_scripts/qtlicd.service
index 26ce52b..89cef48 100644
--- a/linux_service_scripts/licd.service
+++ b/linux_service_scripts/qtlicd.service
@@ -5,10 +5,10 @@ After=network-online.target
 
 [Service]
 User=root
-WorkingDirectory=/opt/licd
+WorkingDirectory=/opt/qtlicd
 Type=forking
-ExecStart=/opt/licd/licd
-ExecStop=/bin/killall licd
+ExecStart=/opt/qtlicd/qtlicd
+ExecStop=/bin/killall qtlicd
 RemainAfterExit=true
 
 Restart=on-failure
diff --git a/linux_service_scripts/uninstaller.sh b/linux_service_scripts/uninstaller.sh
index a1f19e4..5385dca 100755
--- a/linux_service_scripts/uninstaller.sh
+++ b/linux_service_scripts/uninstaller.sh
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-name=licd
+name=qtlicd
 
 function stop_daemon {
     running=true
diff --git a/licd.ini b/qtlicd.ini
index c9ee56f..c9ee56f 100644
--- a/licd.ini
+++ b/qtlicd.ini