extended --version output to include 3rd party, incremented version to

0.9.5

Author: zipproth

CMakeLists.txt

@@ -33,7 +33,7 @@ if(NOT CMAKE_C_COMPILER AND NOT CMAKE_CXX_COMPILER)
     endif()
 endif()
 
-project(zelph VERSION 0.9.4 LANGUAGES C CXX)
+project(zelph VERSION 0.9.5 LANGUAGES C CXX)
 
 include(GNUInstallDirs)
 
@@ -79,4 +79,4 @@ endif()
 if(PROJECT_IS_TOP_LEVEL)
     install(FILES ${CMAKE_SOURCE_DIR}/LICENSE
             DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/licenses/${PROJECT_NAME})
-endif()
+endif()

src/app/main.cpp

@@ -24,6 +24,7 @@ along with zelph. If not, see <https://www.gnu.org/licenses/>.
 */
 
 #include "interactive.hpp"
+#include "versions.hpp"
 
 #ifdef _WIN32
     #include <Windows.h> // for SetConsoleOutputCP
@@ -104,8 +105,7 @@ int main(int argc, char** argv)
 
         if (show_version)
         {
-            interactive.out("zelph " + zelph::console::Interactive::get_version());
-
+            std::cout << zelph::get_version_description() << std::endl;
             return 0;
         }
 

src/lib/CMakeLists.txt

@@ -233,6 +233,8 @@ add_library(zelph_lib SHARED
     repl_state.hpp
     script_engine.cpp
     script_engine.hpp
+    versions.cpp
+    versions.hpp
 
     chrono/stopwatch.cpp
     chrono/stopwatch.hpp

src/lib/command_executor.cpp

@@ -34,17 +34,10 @@ along with zelph. If not, see <https://www.gnu.org/licenses/>.
 #include "script_engine.hpp"
 #include "string/node_to_string.hpp"
 #include "string/string_utils.hpp"
+#include "versions.hpp"
 #include "wikidata/wikidata.hpp"
 #include "wikidata/wikidata_text_compressor.hpp"
 
-// for 3rd party versions
-#if __has_include(<mimalloc.h>)
-    #include "mimalloc.h"
-#endif
-#include <ankerl/unordered_dense.h>
-#include <bzlib.h>
-#include <capnp/common.h>
-
 #include <fstream>
 #include <iomanip>
 #include <map>
@@ -1537,34 +1530,15 @@ class console::CommandExecutor::Impl
     {
         if (cmd.size() != 1) throw std::runtime_error("Command .licenses takes no arguments");
 
-        _n->out("zelph incorporates the following third-party software:", true);
-        _n->out("------------------------------------------------------", true);
-
-        _n->out("Janet (v" + ScriptEngine::get_janet_version() + ") - MIT License", true);
-
-        std::string ud_version = std::to_string(ANKERL_UNORDERED_DENSE_VERSION_MAJOR) + "." + std::to_string(ANKERL_UNORDERED_DENSE_VERSION_MINOR) + "." + std::to_string(ANKERL_UNORDERED_DENSE_VERSION_PATCH);
-        _n->out("unordered_dense (v" + ud_version + ") - MIT License", true);
-
-        std::string capnp_version = std::to_string(CAPNP_VERSION_MAJOR) + "." + std::to_string(CAPNP_VERSION_MINOR) + "." + std::to_string(CAPNP_VERSION_MICRO);
-        _n->out("Cap'n Proto (v" + capnp_version + ") - MIT License", true);
-
-        std::string bz2_full      = BZ2_bzlibVersion();
-        size_t      bz2_comma_pos = bz2_full.find(',');
-        std::string bz2_version   = (bz2_comma_pos != std::string::npos) ? bz2_full.substr(0, bz2_comma_pos) : bz2_full;
-        _n->out("bzip2 (v" + bz2_version + ") - bzip2 License (BSD-style)", true);
+        std::istringstream stream(zelph::get_version_description());
+        std::string        line;
 
-        // 5. mimalloc (nur einkompiliert, wenn das Makro existiert)
-#if defined(MI_MALLOC_VERSION)
-        int         mi_major   = MI_MALLOC_VERSION / 1000;
-        int         mi_minor   = (MI_MALLOC_VERSION / 100) % 10;
-        int         mi_patch   = MI_MALLOC_VERSION % 100;
-        std::string mi_version = std::to_string(mi_major) + "." + std::to_string(mi_minor) + "." + std::to_string(mi_patch);
-        _n->out("mimalloc (v" + mi_version + ") - MIT License", true);
-#endif
-
-        _n->out("------------------------------------------------------", true);
-        _n->out("For full license texts and copyright notices, please refer to the", true);
-        _n->out("documentation or the source code repositories.", true);
+        while (std::getline(stream, line))
+        {
+            // Wir überspringen leere Zeilen am Ende nicht,
+            // aber std::getline verwirft das '\n'.
+            _n->out(line, true);
+        }
     }
     void cmd_log(const std::vector<std::string>& cmd)
     {

src/lib/network/zelph.cpp

@@ -39,7 +39,7 @@ using namespace zelph::network;
 
 std::string Zelph::get_version()
 {
-    return "0.9.4";
+    return "0.9.5";
 }
 
 Zelph::Zelph(const io::OutputHandler& output)

src/lib/versions.cpp

@@ -0,0 +1,89 @@
+/*
+Copyright (c) 2025, 2026 acrion innovations GmbH
+Authors: Stefan Zipproth, s.zipproth@acrion.ch
+
+This file is part of zelph, see https://github.com/acrion/zelph and https://zelph.org
+
+zelph is offered under a commercial and under the AGPL license.
+For commercial licensing, contact us at https://acrion.ch/sales. For AGPL licensing, see below.
+
+AGPL licensing:
+
+zelph is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+zelph 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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with zelph. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#include "versions.hpp"
+
+#include "interactive.hpp"
+#include "script_engine.hpp"
+
+#include <ankerl/unordered_dense.h>
+#include <bzlib.h>
+#include <capnp/common.h>
+
+#if __has_include(<mimalloc.h>)
+    #include <mimalloc.h>
+#endif
+
+#include <sstream>
+
+namespace zelph
+{
+    std::string get_version_description()
+    {
+        std::ostringstream oss;
+
+        // 1. zelph Version
+        oss << "zelph " << console::Interactive::get_version() << "\n\n";
+
+        // 2. Third-party software
+        oss << "zelph incorporates the following third-party software:\n";
+        oss << "------------------------------------------------------\n";
+
+        // Janet
+        oss << "Janet (v" << ScriptEngine::get_janet_version() << ") - MIT License\n";
+
+        // unordered_dense
+        oss << "unordered_dense (v"
+            << ANKERL_UNORDERED_DENSE_VERSION_MAJOR << "."
+            << ANKERL_UNORDERED_DENSE_VERSION_MINOR << "."
+            << ANKERL_UNORDERED_DENSE_VERSION_PATCH << ") - MIT License\n";
+
+        // Cap'n Proto
+        oss << "Cap'n Proto (v"
+            << CAPNP_VERSION_MAJOR << "."
+            << CAPNP_VERSION_MINOR << "."
+            << CAPNP_VERSION_MICRO << ") - MIT License\n";
+
+        // bzip2
+        std::string bz2_full      = BZ2_bzlibVersion();
+        size_t      bz2_comma_pos = bz2_full.find(',');
+        std::string bz2_version   = (bz2_comma_pos != std::string::npos) ? bz2_full.substr(0, bz2_comma_pos) : bz2_full;
+        oss << "bzip2 (v" << bz2_version << ") - bzip2 License (BSD-style)\n";
+
+        // mimalloc
+#if defined(MI_MALLOC_VERSION)
+        int mi_major = MI_MALLOC_VERSION / 1000;
+        int mi_minor = (MI_MALLOC_VERSION / 100) % 10;
+        int mi_patch = MI_MALLOC_VERSION % 100;
+        oss << "mimalloc (v" << mi_major << "." << mi_minor << "." << mi_patch << ") - MIT License\n";
+#endif
+
+        oss << "------------------------------------------------------\n";
+        oss << "For full license texts and copyright notices, please refer to the\n";
+        oss << "documentation or the source code repositories.";
+
+        return oss.str();
+    }
+}

src/lib/versions.hpp

@@ -0,0 +1,33 @@
+/*
+Copyright (c) 2025, 2026 acrion innovations GmbH
+Authors: Stefan Zipproth, s.zipproth@acrion.ch
+
+This file is part of zelph, see https://github.com/acrion/zelph and https://zelph.org
+
+zelph is offered under a commercial and under the AGPL license.
+For commercial licensing, contact us at https://acrion.ch/sales. For AGPL licensing, see below.
+
+AGPL licensing:
+
+zelph is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+zelph 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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with zelph. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include <string>
+
+namespace zelph
+{
+    std::string get_version_description();
+}