sr-dev

sr-dev@lists.kamailio.org

4 participants
44157 discussions

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)

by Xenofon Karamanos

Ok, i' ll see how to integrate lynx then. Currently, the target `modname_doc` will produce all forms in the build directory iirc, and then it would copy it to the `src/modules/module_name/docs` directory. (even though I opted to comment the copy command to not pollute the source files. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150282843(a)github.com>

3 weeks, 1 day

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)

by Daniel-Constantin Mierla

I see `output_dir` in the makefile for the docbooks, not for the code building: ``` doc/docbook/Makefile 39:output_dir ?= . ``` The variant with lynx has to be there, many doc generation scripts running on server rely on it, being also very common on linux distros and we know how the output is generated. We can experiment more with pandoc in the future. Are now different make targets (or some defines) to generate the text readme and the html readme? I could notice the `modname_doc` (e.g., `acc_doc`) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150282713(a)github.com>

3 weeks, 1 day

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)

by Xenofon Karamanos

The `pandoc` was an alternative I found that could achieve what `lynx` did for the text generation, since `lynx` is technically a text web-browser. Pandoc offers more forms to transform if needed, but of course, we can fall back on' Lynx' if it doesn't fit our needs or it's too slow. The `outpit_dir` is specific for docs or for the whole build? I -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150282373(a)github.com>

3 weeks, 1 day

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)

by Daniel-Constantin Mierla

@xkaraman: can the use of `pandoc` be made optional? What is the benefit of using it? The old makefiles needed only `xsltproc` (and `lynx` for text readme generation) and it seemed enough. Also, the generation of the html readmes for modules on the website is done the same way. Important it would be to support the output directory, like: ``` make output_dir=/tmp/kamailio-docs exclude_modules="" modules-doc ``` The above command generates all html files for modules' readmes and place them in /tmp/kamailio-docs. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150281498(a)github.com>

3 weeks, 1 day

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)

by Xenofon Karamanos

Yeah, looking into it. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150280974(a)github.com>

3 weeks, 1 day

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)

by Victor Seva

@xkaraman this change broke the build ``` cmake --build /home/runner/work/kamailio/kamailio/build -j8 [ 0%] Building C object src/modules/acc/CMakeFiles/acc.dir/acc.c.o [ 0%] Building C object src/modules/acc/CMakeFiles/acc.dir/acc_cdr.c.o gmake[2]: *** No rule to make target 'src/modules/xprint_doc', needed by 'src/modules/CMakeFiles/kamailio_docs'. Stop. [ 0%] Generating cfg.tab.c and cfg.tab.h from cfg.y gmake[1]: *** [CMakeFiles/Makefile2:3444: src/modules/CMakeFiles/kamailio_docs.dir/all] Error 2 [ 0%] Building C object src/modules/alias_db/CMakeFiles/alias_db.dir/alias_db.c.o gmake[1]: *** Waiting for unfinished jobs.... ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150280924(a)github.com>

3 weeks, 1 day

git:master:92f899f3: pua_dialoginfo: rename short global variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 92f899f3689f0f0b291590e82e61751b76b2539c URL: https://github.com/kamailio/kamailio/commit/92f899f3689f0f0b291590e82e61751… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-12T12:25:35+01:00 pua_dialoginfo: rename short global variable --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/92f899f3689f0f0b291590e82e61751… Patch: https://github.com/kamailio/kamailio/commit/92f899f3689f0f0b291590e82e61751… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 86febe2d1bd..26883cc27ad 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -76,7 +76,7 @@ MODULE_VERSION */ /* #define PUA_DIALOGINFO_DEBUG 1 */ -pua_api_t pua; +pua_api_t _pua_api; struct dlg_binds dlg_api; @@ -1063,15 +1063,15 @@ static int mod_init(void) return -1; } - if(bind_pua(&pua) < 0) { + if(bind_pua(&_pua_api) < 0) { LM_ERR("Can't bind pua\n"); return -1; } - if(pua.send_publish == NULL) { + if(_pua_api.send_publish == NULL) { LM_ERR("Could not import send_publish\n"); return -1; } - pua_send_publish = pua.send_publish; + pua_send_publish = _pua_api.send_publish; /* bind to the dialog API */ if(load_dlg_api(&dlg_api) != 0) {

3 weeks, 1 day

git:master:f24eed8b: cmake: Add kamailio_docs target to all if BUILD_DOC is ON

by Xenofon Karamanos

Module: kamailio Branch: master Commit: f24eed8ba01870361d916844a073df71cbc9e609 URL: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-12T11:20:35Z cmake: Add kamailio_docs target to all if BUILD_DOC is ON --- Modified: cmake/modules_docs.cmake Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… Patch: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7…

3 weeks, 1 day

git:master:21bdc234: cmake: Fix double $ typo. Fixes building with ninja

by Xenofon Karamanos

Module: kamailio Branch: master Commit: 21bdc234e219db83e085b055d4f81cb3ff63193d URL: https://github.com/kamailio/kamailio/commit/21bdc234e219db83e085b055d4f81cb… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-12T11:20:35Z cmake: Fix double $ typo. Fixes building with ninja --- Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/21bdc234e219db83e085b055d4f81cb… Patch: https://github.com/kamailio/kamailio/commit/21bdc234e219db83e085b055d4f81cb… --- diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index a927c1ee627..e651bb88c8b 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -11,7 +11,7 @@ message(STATUS "Temporary kamctl.{db} files in : ${KAMCTL_TMP_DIR}") file(MAKE_DIRECTORY ${KAMCTL_TMP_DIR}) set(BIN_DIR "${CMAKE_INSTALL_FULL_SBINDIR}") -set(LIB_DIR "$${CMAKE_INSTALL_FULL_LIBDIR}/${MAIN_NAME}/kamctl") +set(LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/${MAIN_NAME}/kamctl") set(CFG_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/${MAIN_NAME}") set(SHARE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/${MAIN_NAME}")

3 weeks, 1 day

git:master:170ddcca: cmake: Add option to not use git to gather commit info

by Xenofon Karamanos

Module: kamailio Branch: master Commit: 170ddcca96b3ee11f4daed1592f0cee9c753db2b URL: https://github.com/kamailio/kamailio/commit/170ddcca96b3ee11f4daed1592f0cee… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-12T11:19:48Z cmake: Add option to not use git to gather commit info --- Modified: src/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/170ddcca96b3ee11f4daed1592f0cee… Patch: https://github.com/kamailio/kamailio/commit/170ddcca96b3ee11f4daed1592f0cee… --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 30f80f0db32..2b02f33098f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,9 +24,13 @@ include(${CMAKE_SOURCE_DIR}/cmake/defs.cmake) # ----------------------- # The following produces core/autover.h Find Git +option(USE_GIT "Use git to get commit information" ON) find_package(Git QUIET) -if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") +if(USE_GIT + AND GIT_FOUND + AND EXISTS "${PROJECT_SOURCE_DIR}/.git" +) execute_process( COMMAND ${GIT_EXECUTABLE} rev-parse --verify --short=6 HEAD WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

3 weeks, 1 day

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev