sr-dev June 2009

sr-dev@lists.kamailio.org

33 participants
284 discussions

git:master: makefile: better "dirty" local copy detection
by Andrei Pelinescu-Onciul 25 Jun '09

25 Jun '09

Module: sip-router Branch: master Commit: 277225d51277d62063071e5b615dc83d8c409503 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=277225d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Jun 25 12:56:06 2009 +0200 makefile: better "dirty" local copy detection Better detection for local changes, when re-generating autover.h. --- Makefile | 8 +++++--- 1 files changed, 5 … [View More]

1 0

git:master: makefile: minor fixes
by Andrei Pelinescu-Onciul 25 Jun '09

25 Jun '09

Module: sip-router Branch: master Commit: 1849815b51ad28a86e8af72c36930474f89ae948 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1849815… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Jun 25 12:21:35 2009 +0200 makefile: minor fixes - main.d and core_cmd.d generation failed on clean sources, because of missing autover.h - make tar excludes now .git*, *.swo and includes … [View More]autover.h --- Makefile | 12 ++++++++---- Makefile.rules | 8 ++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 42daf72..307096b 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,8 @@ endif auto_gen=lex.yy.c cfg.tab.c #lexx, yacc etc -auto_gen_others=cfg.tab.h autover.h # auto generated, non-c +auto_gen_others=cfg.tab.h # auto generated, non-c +auto_gen_keep=autover.h # auto generated, should be included in archives COREPATH=. #include source related defs @@ -397,11 +398,12 @@ modules_search_path=$(subst $(space),:,$(strip\ # $(addprefix $(modules_target),$(modules_dirs)))) # special depends for main.o -main.o: autover.h +main.d main.o: autover.h main.o: DEFS+=-DMODS_DIR='"$(modules_search_path)"' + #special depends for core_cmd.o -core_cmd.o: autover.h +core_cmd.d core_cmd.o: autover.h include Makefile.shared @@ -657,13 +659,14 @@ dbg: sip-router dist: tar -tar: autover.h +tar: $(auto_gen_keep) $(TAR) -C .. \ --exclude=$(notdir $(CURDIR))/test* \ --exclude=$(notdir $(CURDIR))/tmp* \ --exclude=$(notdir $(CURDIR))/debian/$(MAIN_NAME) \ --exclude=$(notdir $(CURDIR))/debian/$(MAIN_NAME)-* \ --exclude=$(notdir $(CURDIR))/$(MAIN_NAME)_tls* \ + --exclude=.git* \ --exclude=CVS* \ --exclude=.svn* \ --exclude=.cvsignore \ @@ -682,6 +685,7 @@ tar: autover.h --exclude=*.patch \ --exclude=.\#* \ --exclude=*.swp \ + --exclude=*.swo \ ${tar_extra_args} \ -cf - $(notdir $(CURDIR)) | \ (mkdir -p tmp/_tar1; mkdir -p tmp/_tar2 ; \ diff --git a/Makefile.rules b/Makefile.rules index f377e23..99042c3 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -7,9 +7,9 @@ # # Uses: NAME, ALLDEP, CC, CFLAGS, C_DEFS, DEFS, C_INCLUDES, INCLUDES, LIBS, -# MKDEP, auto_gen, -# auto_gen_others, depends, objs, extra_objs, static_modules, -# static_modules_path, LD_RPATH +# MKDEP, auto_gen, auto_gen_others, auto_gen_keep, +# depends, objs, extra_objs, static_modules, static_modules_path, +# LD_RPATH # (all this must be defined previously!, see Makefile.defs & Makefile) # Optional: SER_LIBS - list of ser libraries that will be automatically # built if necessary. Format: path/shortname, where shortname is the @@ -205,7 +205,7 @@ clean-utils: .PHONY: realclean .PHONY: maintainer-clean proper distclean realclean maintainer-clean: local-clean - -@rm -f $(depends) $(auto_gen) $(auto_gen_others) \ + -@rm -f $(depends) $(auto_gen) $(auto_gen_others) $(auto_gen_keep) \ makecfg.lst 2>/dev/null maintainer-clean: clean-tmp [View Less]

1 0

Compilation on CentOS 5 error
by ha do 25 Jun '09

25 Jun '09

HI all i follow the instruction http://sip-router.org/wiki/migration/kamailio-3.0-config but when i compile but get the error [root@Vigor35 sip-router]# make all config.mak loaded Makefile.defs defs skipped gcc -g -O9 -funroll-loops -Wcast-align -minline-all-stringops -falign-loops -ftree-vectorize -mtune=athlon64 -Wall -DNAME='"ser"' -DVERSION='"2.1.0-dev23-make"' -DARCH='"i386"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 4.1.2"' -D__CPU_i386 -D__OS_linux -… [View More]

2 1

new feature: PV class $T_inv(pv)
by Daniel-Constantin Mierla 25 Jun '09

25 Jun '09

Hello, by loading the tmx module, one can get access to INVITE attributes while processing the CANCEL, see more at: http://sip-router.org/wiki/cookbooks/pseudo-variables/devel#t_inv_pv Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

2 1

new feature: fine access to xml documents
by Daniel-Constantin Mierla 25 Jun '09

25 Jun '09

Hello, several days ago I committed support for accessing components of xml documents using pseudo-variables based on XPath syntax. The new $xml(...) PV is implemented in the presence_xml module as it works with xml docs and links libxml2. Short description in the cookbook: https://sip-router.org/wiki/cookbooks/pseudo-variables/devel#presence_xml_p… As an example: - publish has the body: <?xml version='1.0' encoding='UTF-8'?> <presence xmlns='urn:ietf:params:xml:ns:pidf' xmlns:… [View More]

1 0

git:master: makefile: auto-generate autover.h based on the git sha
by Andrei Pelinescu-Onciul 24 Jun '09

24 Jun '09

Module: sip-router Branch: master Commit: 51690b9e45be569ca87e6d0af9e288a3656249f3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=51690b9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jun 24 21:11:24 2009 +0200 makefile: auto-generate autover.h based on the git sha Automatically re-generate autover.h each time some change in the repository happens. The file will contain a … [View More]macro (REPO_VER) set to the first 6 letters of the git sha. This allows unique identification for the git branch and commits from which the code was generated. If the code is not compiled from a git repository, use "unknown" for the REPO_VER. --- Makefile | 25 ++++++++++++++++++++++++- Makefile.targets | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2dc955b..68eff8c 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ endif auto_gen=lex.yy.c cfg.tab.c #lexx, yacc etc -auto_gen_others=cfg.tab.h # auto generated, non-c +auto_gen_others=cfg.tab.h autover.h # auto generated, non-c COREPATH=. #include source related defs @@ -394,8 +394,13 @@ modules_search_path=$(subst $(space),:,$(strip\ $(foreach m,$(modules_dirs),$($(m)_target)))) # $(addprefix $(modules_target),$(modules_dirs)))) +# special depends for main.o +main.o: autover.h main.o: DEFS+=-DMODS_DIR='"$(modules_search_path)"' +#special depends for core_cmd.o +core_cmd.o: autover.h + include Makefile.shared ifeq ($(config_mak),1) @@ -445,6 +450,24 @@ modules-cfg modules-list modules-lst: rm -f modules.lst $(MAKE) modules.lst +ifneq ($(wildcard .git),) +# if .git/ exists +repo_ver=$(shell git rev-parse --short=6 HEAD 2>/dev/null || echo "unknown" ) +autover_h_dep=.git +else +# else if .git/ does not exist +repo_ver="unknown" +autover_h_dep= +endif + +autover.h: $(autover_h_dep) + @echo "generating autover.h ($(autover_h_dep)) ..." + @echo "/* this file is autogenerated by make autover.h" >$@ + @echo " * DO NOT EDIT IT" >>$@ + @echo " */" >>$@ + @echo "" >>$@ + @echo "#define REPO_VER \"$(repo_ver)\"" >>$@ + .PHONY: all all: $(NAME) every-module diff --git a/Makefile.targets b/Makefile.targets index 0416b80..9ba0ef8 100644 --- a/Makefile.targets +++ b/Makefile.targets @@ -35,7 +35,7 @@ doc_targets:= README man install-doc install-man install-ser-man \ # auxiliary: maintance, debugging, etc. (don't affect code/objects) aux_targets:= TAGS tar dist cfg-defs cfg config config.mak print-modules \ dbg dbinstall librpath.lst makecfg.lst modules.lst modules-cfg \ - modules-list modules-lst mk-install_dirs + modules-list modules-lst mk-install_dirs autover.h # other targets that don't produce code in the current directory ("external") ext_targets:= every-module $(modules_dirs) libs utils \ install-cfg install-utils install-modules-all install-every-module\ [View Less]

1 0

git:master: makefile: REPO_VER: try to detect dirty local repo
by Andrei Pelinescu-Onciul 24 Jun '09

24 Jun '09

Module: sip-router Branch: master Commit: a868066e82310eef6f7e00d3b4e941ed50e7dc6f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a868066… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jun 24 22:25:33 2009 +0200 makefile: REPO_VER: try to detect dirty local repo - add -dirty to the git sha if when autover.h is generated the local repository contains locally modified files. - … [View More]

1 0

git:master: makefile: added CFG_NAME and SCR_NAME
by Andrei Pelinescu-Onciul 24 Jun '09

24 Jun '09

Module: sip-router Branch: master Commit: 6f816e54bf008059dded804c0e55e2e3ce60d358 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f816e5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jun 24 23:38:19 2009 +0200 makefile: added CFG_NAME and SCR_NAME CFG_NAME and SCR_NAME are used now to hold the name or prefix for the config and scripts _in_ the repository. All this configs and … [View More]scripts will be installed using MAIN_NAME (e.g. $(CFG_NAME)-basic.cfg is installed into etc/$(MAIN_NAME)/$(MAIN_NAME)-basic.cfg). This was needed to allow installing using different names, without having to revert the recent mass re-naming of man, config and scripts. --- Makefile | 45 +++++++++++++++++++++++++-------------------- Makefile.defs | 7 ++++++- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index a37999b..42daf72 100644 --- a/Makefile +++ b/Makefile @@ -735,7 +735,7 @@ install: install-bin install-every-module install-cfg \ .PHONY: dbinstall dbinstall: -@echo "Initializing $(MAIN_NAME) database" - scripts/mysql/$(MAIN_NAME)_mysql.sh create + scripts/mysql/$(SCR_NAME)_mysql.sh create -@echo "Done" .PHONY: README @@ -779,8 +779,9 @@ $(man_prefix)/$(man_dir)/man5: # note: sed with POSIX.1 regex doesn't support |, + or ? (darwin, solaris ...) install-cfg: $(cfg_prefix)/$(cfg_dir) sed $(foreach m,$(modules_dirs),\ - -e "s#/usr/[^:]*lib/$(MAIN_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ - < etc/$(MAIN_NAME)-basic.cfg > $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample + -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ + < etc/$(CFG_NAME)-basic.cfg > \ + $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample if [ -z "${skip_cfg_install}" -a \ ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg ]; then \ @@ -788,23 +789,24 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg; \ fi sed $(foreach m,$(modules_dirs),\ - -e "s#/usr/[^:]*lib/$(MAIN_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ - < etc/$(MAIN_NAME)-oob.cfg \ + -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ + < etc/$(CFG_NAME)-oob.cfg \ > $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample if [ -z "${skip_cfg_install}" -a \ - ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg ]; then \ + ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg ]; \ + then \ mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample \ $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg; \ fi # radius dictionary - $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(MAIN_NAME) - $(INSTALL_CFG) etc/dictionary.$(MAIN_NAME) $(cfg_prefix)/$(cfg_dir) + $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME) + $(INSTALL_CFG) etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir) # TLS configuration $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/tls.cfg $(INSTALL_CFG) modules/tls/tls.cfg $(cfg_prefix)/$(cfg_dir) - modules/tls/$(MAIN_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) + modules/tls/$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) install-bin: $(bin_prefix)/$(bin_dir) $(NAME) $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME) @@ -869,7 +871,8 @@ install-utils: utils $(bin_prefix)/$(bin_dir) # FIXME: This is a hack, this should be (and will be) done properly in # per-module Makefiles sed -e "s#^DEFAULT_SCRIPT_DIR.*#DEFAULT_SCRIPT_DIR=\"$(share_prefix)/$(share_dir)\"#g" \ - < scripts/mysql/$(MAIN_NAME)_mysql.sh > $(bin_prefix)/$(bin_dir)/$(MAIN_NAME)_mysql.sh + < scripts/mysql/$(SCR_NAME)_mysql.sh > \ + $(bin_prefix)/$(bin_dir)/$(MAIN_NAME)_mysql.sh chmod 755 $(bin_prefix)/$(bin_dir)/$(MAIN_NAME)_mysql.sh @@ -889,23 +892,25 @@ install-doc: $(doc_prefix)/$(doc_dir) install-every-module-doc $(INSTALL_DOC) README $(doc_prefix)/$(doc_dir) -install-$(MAIN_NAME)-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 - sed -e "s#/etc/$(MAIN_NAME)/$(MAIN_NAME)\.cfg#$(cfg_target)$(MAIN_NAME).cfg#g" \ +install-sr-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 + sed -e "s#/etc/$(CFG_NAME)/$(CFG_NAME)\.cfg#$(cfg_target)$(MAIN_NAME).cfg#g" \ -e "s#/usr/sbin/#$(bin_target)#g" \ $(foreach m,$(modules_dirs),\ - -e "s#/usr/lib/$(MAIN_NAME)/$(m)$[^_]$#$($(m)_target)\1#g") \ - -e "s#/usr/share/doc/$(MAIN_NAME)/#$(doc_target)#g" \ - < $(MAIN_NAME).8 > $(man_prefix)/$(man_dir)/man8/$(MAIN_NAME).8 + -e "s#/usr/lib/$(CFG_NAME)/$(m)$[^_]$#$($(m)_target)\1#g") \ + -e "s#/usr/share/doc/$(CFG_NAME)/#$(doc_target)#g" \ + < $(CFG_NAME).8 > \ + $(man_prefix)/$(man_dir)/man8/$(MAIN_NAME).8 chmod 644 $(man_prefix)/$(man_dir)/man8/$(MAIN_NAME).8 - sed -e "s#/etc/$(MAIN_NAME)/$(MAIN_NAME)\.cfg#$(cfg_target)$(MAIN_NAME).cfg#g" \ + sed -e "s#/etc/$(CFG_NAME)/$(CFG_NAME)\.cfg#$(cfg_target)$(MAIN_NAME).cfg#g" \ -e "s#/usr/sbin/#$(bin_target)#g" \ $(foreach m,$(modules_dirs),\ - -e "s#/usr/lib/$(MAIN_NAME)/$(m)$[^_]$#$($(m)_target)\1#g") \ - -e "s#/usr/share/doc/$(MAIN_NAME)/#$(doc_target)#g" \ - < $(MAIN_NAME).cfg.5 > $(man_prefix)/$(man_dir)/man5/$(MAIN_NAME).cfg.5 + -e "s#/usr/lib/$(CFG_NAME)/$(m)$[^_]$#$($(m)_target)\1#g") \ + -e "s#/usr/share/doc/$(CFG_NAME)/#$(doc_target)#g" \ + < $(CFG_NAME).cfg.5 > \ + $(man_prefix)/$(man_dir)/man5/$(MAIN_NAME).cfg.5 chmod 644 $(man_prefix)/$(man_dir)/man5/$(MAIN_NAME).cfg.5 -install-man: install-sip-router-man install-every-module-man +install-man: install-sr-man install-every-module-man diff --git a/Makefile.defs b/Makefile.defs index 4fdaa70..688eaa1 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -101,6 +101,11 @@ export makefile_defs $(info normal Makefile.defs exec) # main binary name MAIN_NAME=sip-router +#prefix for various configs and scripts +#config name/name-prefix for distributed configs +CFG_NAME=sip-router +#config name/name-prefix for distributed scripts +SCR_NAME=sip-router #version number VERSION = 2 @@ -1698,7 +1703,7 @@ export exported_vars # variable changeable only at configure time (once saved in config.mak they # cannot be overwritten from environment or command line, unless make cfg # is run) -saved_fixed_vars:= MAIN_NAME \ +saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME \ RELEASE OS ARCH \ C_DEFS DEFS_RM PROFILE CC LD MKDEP MKTAGS LDFLAGS C_INCLUDES \ MOD_LDFLAGS LIB_LDFLAGS LIB_SONAME LD_RPATH \ [View Less]

1 0

git:master: core: the version contains now the git sha if known
by Andrei Pelinescu-Onciul 24 Jun '09

24 Jun '09

Module: sip-router Branch: master Commit: 92721dc19c76b91e0e24683a9b2b47e2e40aefb8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=92721dc… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jun 24 21:15:06 2009 +0200 core: the version contains now the git sha if known The version numbers displayed by ser -V or sercmd core.version contain now the git sha. --- core_cmd.c | 3 ++- … [View More]

1 0

git:master: * Core, etc, documentation: renamed ser to sip-router
by Juha Heinanen 24 Jun '09

24 Jun '09

Module: sip-router Branch: master Commit: 5d1a75a61b349690125db87c1e48b3de580613e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d1a75a… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Jun 24 15:44:10 2009 +0300 * Core, etc, documentation: renamed ser to sip-router * Renamed ser to sip-router in Makefile, etc files and some core files. * Renamed some etc files from ser based name to sip-router based … [View More]

8 44

← Newer
1
...
7
8
9
10
11
12
13
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2009