Aktualisierung der .gitignore zur Einbeziehung von Logdateien, Anpassung der CMake-Konfiguration für Multi-Config-Builds und Aktualisierung der Links im CSV-Dokument.

2025-09-12 13:31:47 +02:00
parent e8655dc79b
commit 0964f584d2
4 changed files with 92 additions and 37 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .git/*
 build/*
+logs/*.log
--- a/CMakeLists.txt.old
+++ b/CMakeLists.txt.old
@@ -0,0 +1,71 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(singlechat.wt LANGUAGES CXX)
+add_compile_options(-Wno-deprecated-declarations)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_COMPILER "/usr/bin/g++-12")
+set(CMAKE_PREFIX_PATH "/usr")
+
+# Set default build type if not specified
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
+
+# Set compiler flags based on build type
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    add_compile_options(-g)
+else()
+    add_compile_options(-O2)
+endif()
+
+add_executable(${PROJECT_NAME}
+    src/main.cpp
+    src/broadcast.h src/broadcast.cpp
+    src/app.h src/app.cpp
+    docroot/text.xml
+    docroot/ads.txt
+    docroot/links.csv
+)
+target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
+
+find_package(Threads REQUIRED)
+
+target_link_libraries(${PROJECT_NAME}
+    wt
+    wthttp
+    curl
+    xml2
+    ${CMAKE_THREAD_LIBS_INIT}
+)
+
+find_package(Boost COMPONENTS system filesystem REQUIRED)
+if(UNIX)
+    # Ubuntu-spezifische Include-Verzeichnisse
+    find_package(PkgConfig)
+    pkg_check_modules(XML2 libxml-2.0)
+    if(XML2_FOUND)
+        target_include_directories(${PROJECT_NAME} PRIVATE /usr/include/GraphicsMagick ${XML2_INCLUDE_DIRS})
+    endif()
+elseif(EXISTS "/etc/os-release" AND ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux"))
+    # Tumbleweed-spezifische Include-Verzeichnisse
+    target_include_directories(${PROJECT_NAME} PRIVATE /usr/include/GraphicsMagick)
+endif()
+
+if(Boost_FOUND)
+    include_directories(${Boost_INCLUDE_DIRS})
+    target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES} GraphicsMagick++ GraphicsMagick)
+endif()
+
+include(GNUInstallDirs)
+
+install(TARGETS ${PROJECT_NAME}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION /opt/ypchat/bin
+)
+install(DIRECTORY docroot/
+    DESTINATION /opt/ypchat/docroot
+)
+install(CODE "file(MAKE_DIRECTORY /opt/ypchat/logs)")
+install(CODE "execute_process(COMMAND chmod 777 /opt/ypchat/logs)")
--- a/CMakeLists.txt.user
+++ b/CMakeLists.txt.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 9.0.2, 2024-05-29T13:37:12. -->
+<!-- Written by QtCreator 9.0.2, 2024-10-21T08:08:04. -->
 <qtcreator>
 <data>
  <variable>EnvironmentId</variable>
@@ -81,9 +81,6 @@
    <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
    <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
   </valuemap>
-   <valuemap type="QVariantMap" key="CppEditor.QuickFix">
-    <value type="bool" key="UseGlobalSettings">true</value>
-   </valuemap>
  </valuemap>
 </data>
 <data>
@@ -97,15 +94,12 @@
   <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
   <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="CMake.Build.Type">Debug</value>
+    <value type="QString" key="CMake.Build.Type">Release</value>
    <value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
    <valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
-    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_GENERATOR:STRING=Ninja
-DCMAKE_BUILD_TYPE:STRING=Debug
-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
+    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_GENERATOR:STRING=Ninja Multi-Config
 -DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}
-DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable}
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}</value>
+-DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable}</value>
    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/torsten/Programs/SingleChat/build</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
@@ -153,13 +147,10 @@
    <value type="QString" key="CMake.Build.Type">Release</value>
    <value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
    <valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
-    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_GENERATOR:STRING=Ninja
-DCMAKE_BUILD_TYPE:STRING=Release
-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
+    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_GENERATOR:STRING=Ninja Multi-Config
 -DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}
-DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable}
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/torsten/Programs/build-SingleChat-Desktop-Release</value>
+-DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable}</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/torsten/Programs/SingleChat/../build-SingleChat-Desktop</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <value type="QString" key="CMakeProjectManager.MakeStep.BuildPreset"></value>
@@ -204,13 +195,10 @@
    <value type="QString" key="CMake.Build.Type">RelWithDebInfo</value>
    <value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
    <valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
-    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_GENERATOR:STRING=Ninja
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo
-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
+    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_GENERATOR:STRING=Ninja Multi-Config
 -DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}
-DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable}
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/torsten/Programs/build-SingleChat-Desktop-RelWithDebInfo</value>
+-DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable}</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/torsten/Programs/SingleChat/../build-SingleChat-Desktop</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <value type="QString" key="CMakeProjectManager.MakeStep.BuildPreset"></value>
@@ -255,14 +243,11 @@
    <value type="QString" key="CMake.Build.Type">RelWithDebInfo</value>
    <value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
    <valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
-    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_GENERATOR:STRING=Ninja
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo
-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
+    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_GENERATOR:STRING=Ninja Multi-Config
 -DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}
-DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable}
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}</value>
+-DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable}</value>
    <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/torsten/Programs/build-SingleChat-Desktop-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/torsten/Programs/SingleChat/../build-SingleChat-Desktop</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <value type="QString" key="CMakeProjectManager.MakeStep.BuildPreset"></value>
@@ -307,13 +292,10 @@
    <value type="QString" key="CMake.Build.Type">MinSizeRel</value>
    <value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
    <valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
-    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_GENERATOR:STRING=Ninja
-DCMAKE_BUILD_TYPE:STRING=MinSizeRel
-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
+    <value type="QString" key="CMake.Initial.Parameters">-DCMAKE_GENERATOR:STRING=Ninja Multi-Config
 -DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}
-DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable}
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/torsten/Programs/build-SingleChat-Desktop-MinSizeRel</value>
+-DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable}</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/torsten/Programs/SingleChat/../build-SingleChat-Desktop</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <value type="QString" key="CMakeProjectManager.MakeStep.BuildPreset"></value>
@@ -379,13 +361,13 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">singlechat.wt</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.singlechat.wt</value>
    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">singlechat.wt</value>
-    <value type="QString" key="RunConfiguration.Arguments">--docroot=&quot;../docroot/;/style.css,/resources&quot; --http-port=4500 --http-address=0.0.0.0</value>
+    <value type="QString" key="RunConfiguration.Arguments">--docroot=&quot;../../docroot&quot; --http-address=0.0.0.0 --http-port=5050</value>
    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
    <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/torsten/Programs/SingleChat/build</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/torsten/Programs/SingleChat/build/Release</value>
   </valuemap>
   <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
  </valuemap>
--- a/docroot/links.csv
+++ b/docroot/links.csv
@@ -1,3 +1,4 @@
 "Page Name","url"
 "Webtoolkit","https://www.webtoolkit.eu"
-"Your Part","https://your-part.de"
+"Trainingstagebuch","https://www.tt-tagebuch.de"
+"Social Network 'YourPart'","https://www.your-part.de"