sr-dev

sr-dev@lists.kamailio.org

13 participants
44202 discussions

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 11e41144f5e558bd2764372f2c61a915e10d5a20 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11e4114… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 21:55:30 2009 +0200 auth: added doc/Makefile - makefile rules to generate documentation - entities.xml => kam_entities.xml - module_faq.xml => kam_module_faq.xml --- modules_k/auth/doc/Makefile | 40 ++++++++++++++++++++++++++++++++++++++++ modules_k/auth/doc/auth.xml | 4 ++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/modules_k/auth/doc/Makefile b/modules_k/auth/doc/Makefile new file mode 100644 index 0000000..666ca2e --- /dev/null +++ b/modules_k/auth/doc/Makefile @@ -0,0 +1,40 @@ +# +# The list of documents to build (without extensions) +# +DOCUMENTS = auth + +# +# The root directory containing Makefile.doc +# +ROOT_DIR=../../.. + +# +# Validate docbook documents before generating output +# (may be slow) +# +#VALIDATE=1 + +# +# You can override the CSS used in generated +# HTML documents here +# +#HTML_CSS=/style/docbook.css + +# +# You can override the stylesheet used to generate +# xhtml documents here +# +#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl + +# +# You can override the stylesheet used to generate +# plain text documents here +# +#TXT_XSL=$(XHTML_XSL) + +# +# K documentation style +# +DOCBOOK_MODE=k + +include $(ROOT_DIR)/Makefile.doc diff --git a/modules_k/auth/doc/auth.xml b/modules_k/auth/doc/auth.xml index 588bd35..5d959de 100644 --- a/modules_k/auth/doc/auth.xml +++ b/modules_k/auth/doc/auth.xml @@ -3,10 +3,10 @@ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ <!ENTITY admin SYSTEM "auth_admin.xml"> -<!ENTITY faq SYSTEM "../../../doc/module_faq.xml"> +<!ENTITY faq SYSTEM "../../../doc/kam_module_faq.xml">  -<!ENTITY % docentities SYSTEM "../../../doc/entities.xml"> +<!ENTITY % docentities SYSTEM "../../../doc/kam_entities.xml"> %docentities; ]>

15 years, 8 months

git:master: alias_db: added doc/Makefile

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7028d27fd0d1f6802326ac78a1be5909f7ac7a68 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7028d27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 21:56:18 2009 +0200 alias_db: added doc/Makefile - makefile rules to generate documentation - entities.xml => kam_entities.xml - module_faq.xml => kam_module_faq.xml --- modules_k/alias_db/doc/Makefile | 40 +++++++++++++++++++++++++++++++++++ modules_k/alias_db/doc/alias_db.xml | 4 +- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/modules_k/alias_db/doc/Makefile b/modules_k/alias_db/doc/Makefile new file mode 100644 index 0000000..5013ff7 --- /dev/null +++ b/modules_k/alias_db/doc/Makefile @@ -0,0 +1,40 @@ +# +# The list of documents to build (without extensions) +# +DOCUMENTS = alias_db + +# +# The root directory containing Makefile.doc +# +ROOT_DIR=../../.. + +# +# Validate docbook documents before generating output +# (may be slow) +# +#VALIDATE=1 + +# +# You can override the CSS used in generated +# HTML documents here +# +#HTML_CSS=/style/docbook.css + +# +# You can override the stylesheet used to generate +# xhtml documents here +# +#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl + +# +# You can override the stylesheet used to generate +# plain text documents here +# +#TXT_XSL=$(XHTML_XSL) + +# +# K documentation style +# +DOCBOOK_MODE=k + +include $(ROOT_DIR)/Makefile.doc diff --git a/modules_k/alias_db/doc/alias_db.xml b/modules_k/alias_db/doc/alias_db.xml index ba8e474..eabbf8f 100644 --- a/modules_k/alias_db/doc/alias_db.xml +++ b/modules_k/alias_db/doc/alias_db.xml @@ -3,12 +3,12 @@ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ <!ENTITY admin SYSTEM "alias_db_admin.xml"> -<!ENTITY faq SYSTEM "../../../doc/module_faq.xml"> +<!ENTITY faq SYSTEM "../../../doc/kam_module_faq.xml"> <!ENTITY aliasdbsql SYSTEM "alias_db.sql">  -<!ENTITY % docentities SYSTEM "../../../doc/entities.xml"> +<!ENTITY % docentities SYSTEM "../../../doc/kam_entities.xml"> %docentities; ]>

15 years, 8 months

git:master: Merge branch 'master' of ssh://daniel@git.sip-router.org/ sip-router

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a477fdfb940e86aca763e505c67ffa4af7c1e8ea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a477fdf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 21:57:58 2009 +0200 Merge branch 'master' of ssh://daniel@git.sip-router.org/sip-router * 'master' of ssh://daniel@git.sip-router.org/sip-router: * Module: presence ---

15 years, 8 months

git:master: makefile: make README removes the txt from doc/

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8c6e0b056196c94aa957f95736dc7fcad83a1f16 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c6e0b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 21:45:49 2009 +0200 makefile: make README removes the txt from doc/ - generation of README file for modules removes the txt file from doc/ directory --- Makefile.modules | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.modules b/Makefile.modules index da2c37f..0b85655 100644 --- a/Makefile.modules +++ b/Makefile.modules @@ -95,7 +95,7 @@ ifneq (,$(wildcard doc/Makefile)) README: doc/*.xml $(MAKE) -C doc $(MOD_NAME).txt - cp doc/$(MOD_NAME).txt $@ + mv doc/$(MOD_NAME).txt $@ else # do nothing

15 years, 8 months

git:master: makefile: K mode for documentation generation

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 371312a736015cd3ca654b72729d3385e56fcc69 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=371312a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 21:47:10 2009 +0200 makefile: K mode for documentation generation - K has some extra parameters to XSLTPROC - new option to be able to set the path for css file used inside generated html --- Makefile.doc | 338 ++++++++++++++++++++++++++++++---------------------------- 1 files changed, 177 insertions(+), 161 deletions(-) diff --git a/Makefile.doc b/Makefile.doc index 4cc6791..c6e7cab 100644 --- a/Makefile.doc +++ b/Makefile.doc @@ -1,161 +1,177 @@ -# -# $Id$ -# - -# -# The name of the index file (the one which will be built by default -# without specifying a target -# -DOCUMENTS ?= index - -# -# The root of the document tree, this is used to determine the directory -# of auxiliary files. The variable should be overwritten by per-directory -# Makefiles -# -ROOT_DIR ?= ../../.. - -# -# Output directory where files produced by XSL stylesheets should be stored, -# by default we output to the same directory, documents that are chunked may -# choose to override this to write all chunks in a subdirectory instead -# -OUTPUT_DIR ?= . - -# -# Stylesheet used to generate dependencies from XML files -# -DEP_XSL ?= $(ROOT_DIR)/doc/stylesheets/dep.xsl - -# -# Default stylesheet used to generate XHTML -# -XHTML_XSL ?= $(ROOT_DIR)/doc/stylesheets/xhtml.xsl - -# -# Default stylesheet used to generate Drupal HTML without html headers -# -DRUPAL_XSL ?= $(ROOT_DIR)/doc/stylesheets/drupal.xsl - -# -# Default stylesheet used to generate HTML -# -HTML_XSL ?= $(ROOT_DIR)/doc/stylesheets/html.chunked.xsl - -# -# Stylesheet used to generate plain text documents, -# this is usually the one used for xhtml -# -TXT_XSL ?= $(ROOT_DIR)/doc/stylesheets/txt.xsl - -# -# Stylesheet used to generate FO (Formatted Objects) -# This is used by PDF generators -# -FO_XSL ?= $(ROOT_DIR)/doc/stylesheets/fo.xsl - -# -# Disable document validation by default -# -VALIDATE ?= 0 - -CATALOG=$(ROOT_DIR)/doc/catalog.xml - -LYNX ?= lynx -DIA ?= dia -XSLTPROC ?= xsltproc -XMLLINT ?= /usr/bin/xmllint -XEP ?= /usr/bin/xep - -LYNX_FLAGS ?= -nolist -DIA_ARGS ?= -XSLTPROC_FLAGS ?= -XMLLINT_FLAGS ?= --xinclude --postvalid --noout -XEP_FLAGS ?= - -ifeq ($(VALIDATE), 0) - override XSLTPROC_FLAGS := $(XSLTPROC_FLAGS) --novalid -endif - -alldep = Makefile $(ROOT_DIR)/Makefile.doc $(DEP_XSL) $(EXTRA_DEPS) - -all: xhtml - -xml_files = $(addsuffix .xml, $(DOCUMENTS)) -dep_files = $(addsuffix .d, $(DOCUMENTS)) -xhtml_files = $(addsuffix .xhtml, $(DOCUMENTS)) -html_files = $(addsuffix .html, $(DOCUMENTS)) -txt_files = $(addsuffix .txt, $(DOCUMENTS)) -pdf_files = $(addsuffix .pdf, $(DOCUMENTS)) - -xhtml: $(xhtml_files) -html: $(html_files) -txt: $(txt_files) -pdf: $(pdf_files) -drupal: override HTML_XSL := $(DRUPAL_XSL) -drupal: $(html_files) - - -%.xhtml: %.xml %.d $(alldep) $(XHTML_XSL) - XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ - --xinclude \ - --stringparam base.dir "$(OUTPUT_DIR)/" \ - --stringparam root.filename "$(basename $<)" \ - --stringparam html.ext ".xhtml" \ - $(XHTML_XSL) $< - -%.html: %.xml %.d $(alldep) $(HTML_XSL) - XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ - --xinclude \ - --stringparam base.dir "$(OUTPUT_DIR)/" \ - --stringparam root.filename "$(basename $<)" \ - --stringparam html.ext ".html" \ - --stringparam html.stylesheet ser.css \ - $(HTML_XSL) $< - -%.fo: %.xml $(alldep) $(FO_XSL) - XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ - --xinclude \ - -o $@ $(FO_XSL) $< - -%.pdf: %.fo %.d $(alldep) - $(XEP) $(XEP_FLAGS) -fo $< -pdf $@ - -%.txt: %.xml %.d $(alldep) - XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ - --xinclude \ - $(TXT_XSL) $< | $(LYNX) $(LYNX_FLAGS) -stdin -dump > $@ - -%.png: %.dia $(alldep) - $(DIA) $(DIA_ARGS) -t png -e $@ $< - -%.d: %.xml $(alldep) - $(XSLTPROC) $(XSLTPROC_FLAGS) \ - --nonet \ - --novalid \ - --stringparam output "$@" \ - $(DEP_XSL) $< - -.PHONY: check -check: $(xml_files) - XML_CATALOG_FILES=$(CATALOG) $(XMLLINT) $(XMLLINT_FLAGS) $< - -.PHONY: clean -clean: - @rm -f $(txt_files) - @rm -f $(xhtml_files) - @rm -f $(pdf_files) - @rm -f $(html_files) - -.PHONY: proper realclean distclean -proper realclean distclean: clean - @rm -f $(dep_files) *~ - - -ifeq (,$(MAKECMDGOALS)) -include $(dep_files) -endif -ifneq (,$(filter-out clean proper realclean distclean check, $(MAKECMDGOALS))) -include $(dep_files) -endif - +# +# $Id$ +# + +# +# The name of the index file (the one which will be built by default +# without specifying a target +# +DOCUMENTS ?= index + +# +# The root of the document tree, this is used to determine the directory +# of auxiliary files. The variable should be overwritten by per-directory +# Makefiles +# +ROOT_DIR ?= ../../.. + +# +# Output directory where files produced by XSL stylesheets should be stored, +# by default we output to the same directory, documents that are chunked may +# choose to override this to write all chunks in a subdirectory instead +# +OUTPUT_DIR ?= . + +# +# Stylesheet used to generate dependencies from XML files +# +DEP_XSL ?= $(ROOT_DIR)/doc/stylesheets/dep.xsl + +# +# Default stylesheet used to generate XHTML +# +XHTML_XSL ?= $(ROOT_DIR)/doc/stylesheets/xhtml.xsl + +# +# Default stylesheet used to generate Drupal HTML without html headers +# +DRUPAL_XSL ?= $(ROOT_DIR)/doc/stylesheets/drupal.xsl + +# +# Default stylesheet used to generate HTML +# +HTML_XSL ?= $(ROOT_DIR)/doc/stylesheets/html.chunked.xsl + +# +# Stylesheet used to generate plain text documents, +# this is usually the one used for xhtml +# +TXT_XSL ?= $(ROOT_DIR)/doc/stylesheets/txt.xsl + +# +# Stylesheet used to generate FO (Formatted Objects) +# This is used by PDF generators +# +FO_XSL ?= $(ROOT_DIR)/doc/stylesheets/fo.xsl + +# +# Disable document validation by default +# +VALIDATE ?= 0 + +# +# K docbook style +# +ifeq ($(DOCBOOK_MODE), k) + HTML_CSS=/css/kam-module-docbook.css + XSLTPROC_FLAGS+= --stringparam section.autolabel 1 \ + --stringparam section.label.includes.component.label 1 \ + --stringparam generate.toc "book toc,title,figure,table,example" +endif + +# +# Default CSS used in generated HTMLs +# +HTML_CSS ?= ser.css + +CATALOG=$(ROOT_DIR)/doc/catalog.xml + +LYNX ?= lynx +DIA ?= dia +XSLTPROC ?= xsltproc +XMLLINT ?= /usr/bin/xmllint +XEP ?= /usr/bin/xep + +LYNX_FLAGS ?= -nolist +DIA_ARGS ?= +XSLTPROC_FLAGS ?= +XMLLINT_FLAGS ?= --xinclude --postvalid --noout +XEP_FLAGS ?= + +ifeq ($(VALIDATE), 0) + override XSLTPROC_FLAGS := $(XSLTPROC_FLAGS) --novalid +endif + +alldep = Makefile $(ROOT_DIR)/Makefile.doc $(DEP_XSL) $(EXTRA_DEPS) + +all: xhtml + +xml_files = $(addsuffix .xml, $(DOCUMENTS)) +dep_files = $(addsuffix .d, $(DOCUMENTS)) +xhtml_files = $(addsuffix .xhtml, $(DOCUMENTS)) +html_files = $(addsuffix .html, $(DOCUMENTS)) +txt_files = $(addsuffix .txt, $(DOCUMENTS)) +pdf_files = $(addsuffix .pdf, $(DOCUMENTS)) + +xhtml: $(xhtml_files) +html: $(html_files) +txt: $(txt_files) +pdf: $(pdf_files) +drupal: override HTML_XSL := $(DRUPAL_XSL) +drupal: $(html_files) + + +%.xhtml: %.xml %.d $(alldep) $(XHTML_XSL) + XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ + --xinclude \ + --stringparam base.dir "$(OUTPUT_DIR)/" \ + --stringparam root.filename "$(basename $<)" \ + --stringparam html.ext ".xhtml" \ + --stringparam html.stylesheet $(HTML_CSS) \ + $(XHTML_XSL) $< + +%.html: %.xml %.d $(alldep) $(HTML_XSL) + XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ + --xinclude \ + --stringparam base.dir "$(OUTPUT_DIR)/" \ + --stringparam root.filename "$(basename $<)" \ + --stringparam html.ext ".html" \ + --stringparam html.stylesheet $(HTML_CSS) \ + $(HTML_XSL) $< + +%.fo: %.xml $(alldep) $(FO_XSL) + XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ + --xinclude \ + -o $@ $(FO_XSL) $< + +%.pdf: %.fo %.d $(alldep) + $(XEP) $(XEP_FLAGS) -fo $< -pdf $@ + +%.txt: %.xml %.d $(alldep) + XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ + --xinclude \ + $(TXT_XSL) $< | $(LYNX) $(LYNX_FLAGS) -stdin -dump > $@ + +%.png: %.dia $(alldep) + $(DIA) $(DIA_ARGS) -t png -e $@ $< + +%.d: %.xml $(alldep) + $(XSLTPROC) $(XSLTPROC_FLAGS) \ + --nonet \ + --novalid \ + --stringparam output "$@" \ + $(DEP_XSL) $< + +.PHONY: check +check: $(xml_files) + XML_CATALOG_FILES=$(CATALOG) $(XMLLINT) $(XMLLINT_FLAGS) $< + +.PHONY: clean +clean: + @rm -f $(txt_files) + @rm -f $(xhtml_files) + @rm -f $(pdf_files) + @rm -f $(html_files) + +.PHONY: proper realclean distclean +proper realclean distclean: clean + @rm -f $(dep_files) *~ + + +ifeq (,$(MAKECMDGOALS)) +include $(dep_files) +endif +ifneq (,$(filter-out clean proper realclean distclean check, $(MAKECMDGOALS))) +include $(dep_files) +endif +

15 years, 8 months

git:master: * Module: presence

by Juha Heinanen

Module: sip-router Branch: master Commit: 50c83331d15723022e758984b01fd5edb7e11d17 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=50c8333… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Apr 21 21:38:26 2009 +0300 * Module: presence Fixed wrong error message. --- modules_k/presence/presence.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index 67f082f..9aac54c 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -541,8 +541,8 @@ static struct mi_root* mi_refreshWatchers(struct mi_root* cmd, void* param) return 0; if(node->value.s== NULL || node->value.len== 0) { - LM_ERR( "empty event parameter\n"); - return init_mi_tree(400, "Empty event parameter", 21); + LM_ERR( "empty refresh type parameter\n"); + return init_mi_tree(400, "Empty refresh type parameter", 28); } if(str2int(&node->value, &refresh_type)< 0) {

15 years, 8 months

how to generate README?

by jh＠tutpro.com

in k, i can generate README of a module like this (from INSTALL): -generate README file for textops module make modules=modules/textops modules-readme when i try it in sip-router, i get: jh@taimen:/usr/src/orig/sip-router$ rm modules_k/textops/README jh@taimen:/usr/src/orig/sip-router$ make modules=modules_k/textops modules-readme config.mak loaded Makefile.defs defs skipped Makefile:350: "make TLS option is obsoleted, try TLS_HOOKS or CORE_TLS" config.mak included make[1]: Entering directory `/usr/src/orig/sip-router/modules_k/textops' make[1]: Nothing to be done for `README'. make[1]: Leaving directory `/usr/src/orig/sip-router/modules_k/textops' i tried 'make man', but it didn't generate textops README either. -- juha

15 years, 8 months

git:master: Merge branch 'master' of ssh://jh@git.sip-router.org/sip-router

by Juha Heinanen

Module: sip-router Branch: master Commit: 4dce83ec72e26a2ce3b705fa8a59878d2bea5b65 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4dce83e… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Apr 21 19:33:11 2009 +0300 Merge branch 'master' of ssh://jh@git.sip-router.org/sip-router * 'master' of ssh://jh@git.sip-router.org/sip-router: fix crash in carrierroute related to failed config file loading ---

15 years, 8 months

git:master: fix crash in carrierroute related to failed config file loading

by Henning Westerholt

Module: sip-router Branch: master Commit: 6fc84149d62956192257c0fe9af728121f5d71e9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6fc8414… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Apr 21 18:23:51 2009 +0200 fix crash in carrierroute related to failed config file loading --- modules/carrierroute/cr_config.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/carrierroute/cr_config.c b/modules/carrierroute/cr_config.c index 642f911..87969fa 100644 --- a/modules/carrierroute/cr_config.c +++ b/modules/carrierroute/cr_config.c @@ -104,6 +104,10 @@ static cfg_t * parse_config(void) { }; cfg = cfg_init(opts, CFGF_NONE); + if (cfg == NULL) { + LM_ERR("could not initialize configuration\n"); + return NULL; + } cfg_set_error_function(cfg, conf_error);

15 years, 8 months

another git and make question

by jh＠tutpro.com

if i delete a file and then do 'git pull', git claims that my repo is up to date, which is not true: jh@taimen:/usr/src/orig/sip-router$ rm modules.lst jh@taimen:/usr/src/orig/sip-router$ git pull jh(a)git.sip-router.org's password: Already up-to-date. in svn if i do 'svn update', it fetches for me the missing file. if i try explicitly pull the missing file, i get this: jh@taimen:/usr/src/orig/sip-router$ git pull modules.lst fatal: 'modules.lst': unable to chdir or not a git archive fatal: The remote end hung up unexpectedly does anyone know how to get my repo up to date if files are missing? -- juha

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev