sr-dev

sr-dev@lists.kamailio.org

15 participants
44233 discussions

git:master: makefile: MAIN_NAME reverted

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 5c00f5c2987b9cbdae7734db89019f6ef1d3f815 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c00f5c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jun 24 23:55:16 2009 +0200 makefile: MAIN_NAME reverted MAIN_NAME reverted to ser (should be changed _only_ when we agree on the short name). --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 688eaa1..f262f43 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -100,7 +100,7 @@ export makefile_defs $(info normal Makefile.defs exec) # main binary name -MAIN_NAME=sip-router +MAIN_NAME=ser #prefix for various configs and scripts #config name/name-prefix for distributed configs CFG_NAME=sip-router

15 years, 6 months

Re: [sr-dev] [Kamailio-Users] new feature: fine access to xml documents

by Daniel-Constantin Mierla

On 06/25/2009 11:31 AM, Iñaki Baz Castillo wrote: > El Jueves, 25 de Junio de 2009, Daniel-Constantin Mierla escribió: > >> 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 >> seudo-variables >> >> As an example: >> - publish has the body: >> >> <?xml version='1.0' encoding='UTF-8'?> >> <presence xmlns='urn:ietf:params:xml:ns:pidf' >> xmlns:dm='urn:ietf:params:xml:ns:pidf:data-model' >> xmlns:rpid='urn:ietf:params:xml:ns:pidf:rpid' >> xmlns:c='urn:ietf:params:xml:ns:pidf:cipid' entity='sip:daniel@asipto.com'> >> <tuple id='t8b484917'> >> <status><basic>open</basic></status> >> </tuple> >> <dm:person >> id='p7562ef60'><rpid:activities><rpid:unknown/></rpid:activities></dm:perso >> n> </presence> >> >> Getting the presence status: >> >> # this is needed because libxml2 cannot work with default no-prefix ns, >> so we alias the "p" prefix. >> modparam("presence_xml", "xml_ns", "p=urn:ietf:params:xml:ns:pidf") >> >> $xml(a=>doc) = $rb; >> $xml(a=>xpath:/p:presence/p:tuple/p:status/p:basic) >> >> Next is to update the presence modules to be able to work with the >> documents that have been updated in the config. >> >> Comments, opinions and improvements are welcome! >> > > This is more than great! > > It would make possible exotic routing decissions based on presence status... > ... or based on other content of the xml doc -- you may have there geo positions and send it to the appropriate server. > or perhaps not yet? I understand that this makes possible to extract XML nodes > when processing a request, but would it be possible to extract them from the > "presentity" table? > Yes, if you load it you can do it. For example, next piece of config is valid as well: $xml(a=>doc) = '<?xml version="1.0" encoding="UTF-8"?><presence entity="abc"><mynode>abc</mynode></presence>'; xlog("$xml(a=>xpath:/presence/mynode)\n"); Probably not very clear in my first email, but you can change the xml content: $xml(a=>xpath:/presence/mynode) = "123"; Note that if you assigned the sip message body to $xml(name=>doc), body does not get changed, the operations are done on a replica. Cheers, Daniel > A simpler approach for what I mean would be having a mini API to get presence > basic status (some module that connects to DB with "presentity" table): > > if ( is_presence_basic_status_open($ru) ) { > ...route the MESSAGE... > } > > XD > > > -- Daniel-Constantin Mierla http://www.asipto.com/

15 years, 6 months

git:master: makefile: better "dirty" local copy detection

by Andrei Pelinescu-Onciul

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 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 307096b..b7ea63f 100644 --- a/Makefile +++ b/Makefile @@ -458,9 +458,11 @@ ifneq ($(wildcard .git),) # if .git/ exists repo_ver=$(shell RV=`git rev-parse --verify --short=6 HEAD 2>/dev/null`;\ [ -n "$$RV" ] && \ - test -n "`git diff-index --name-only HEAD >/dev/null`" && \ + test -n "`git update-index --refresh --unmerged >/dev/null\ + ; git diff-index --name-only HEAD 2>/dev/null | \ + grep -v Makefile`" &&\ RV="$$RV"-dirty; echo "$$RV") -autover_h_dep=.git +autover_h_dep=.git $(filter-out $(auto_gen), $(sources)) cfg.y cfg.lex else # else if .git/ does not exist repo_ver= @@ -469,7 +471,7 @@ endif autover.h: $(autover_h_dep) - @echo "generating autover.h ($(autover_h_dep)) ..." + @echo "generating autover.h ..." @echo "/* this file is autogenerated by make autover.h" >$@ @echo " * DO NOT EDIT IT" >>$@ @echo " */" >>$@

15 years, 6 months

git:master: makefile: minor fixes

by Andrei Pelinescu-Onciul

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 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

15 years, 6 months

Compilation on CentOS 5 error

by ha do

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 -DSER_VER=2001000 -DCFG_DIR='"/usr/local/etc/ser/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_IPV6 -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DDBG_QM_MALLOC -DUSE_TLS -DTLS_HOOKS -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -c action.c -o action.o In file included from parser/../mem/../futexlock.h:52, from parser/../mem/../lock_ops.h:85, from parser/../mem/shm_mem.h:76, from parser/../ut.h:67, from parser/../ip_addr.h:49, from parser/msg_parser.h:57, from select.h:38, from route_struct.h:47, from action.h:35, from action.c:58: /usr/include/linux/futex.h:108: error: expected â)â before â*â token /usr/include/linux/futex.h:112: error: expected â)â before â*â token make: *** [action.o] Error 1

15 years, 6 months

new feature: PV class $T_inv(pv)

by Daniel-Constantin Mierla

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/

15 years, 6 months

new feature: fine access to xml documents

by Daniel-Constantin Mierla

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:dm='urn:ietf:params:xml:ns:pidf:data-model' xmlns:rpid='urn:ietf:params:xml:ns:pidf:rpid' xmlns:c='urn:ietf:params:xml:ns:pidf:cipid' entity='sip:daniel@asipto.com'> <tuple id='t8b484917'> <status><basic>open</basic></status> </tuple> <dm:person id='p7562ef60'><rpid:activities><rpid:unknown/></rpid:activities></dm:person> </presence> Getting the presence status: # this is needed because libxml2 cannot work with default no-prefix ns, so we alias the "p" prefix. modparam("presence_xml", "xml_ns", "p=urn:ietf:params:xml:ns:pidf") $xml(a=>doc) = $rb; $xml(a=>xpath:/p:presence/p:tuple/p:status/p:basic) Next is to update the presence modules to be able to work with the documents that have been updated in the config. Comments, opinions and improvements are welcome! Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

15 years, 6 months

git:master: core: the version contains now the git sha if known

by Andrei Pelinescu-Onciul

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 ++- main.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core_cmd.c b/core_cmd.c index 4e33d49..7f21480 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -28,6 +28,7 @@ #include <time.h> #include <sys/types.h> #include <signal.h> +#include "autover.h" #include "mem/mem.h" #include "mem/shm_mem.h" #include "sr_module.h" @@ -298,7 +299,7 @@ static const char* core_version_doc[] = { static void core_version(rpc_t* rpc, void* c) { - rpc->add(c, "s", SERVER_HDR); + rpc->add(c, "s", SERVER_HDR " " REPO_VER ); } diff --git a/main.c b/main.c index d3329c5..e26b3e1 100644 --- a/main.c +++ b/main.c @@ -176,6 +176,7 @@ #ifdef DEBUG_DMALLOC #include <dmalloc.h> #endif +#include "autover.h" #include "version.h" /* define SIG_DEBUG by default */ @@ -186,7 +187,7 @@ #endif static char id[]="@(#) $Id$"; -static char* version=SER_FULL_VERSION; +static char* version=SER_FULL_VERSION " " REPO_VER; static char* flags=SER_COMPILE_FLAGS; char compiled[]= __TIME__ " " __DATE__ ;

15 years, 6 months

git:master: makefile: added CFG_NAME and SCR_NAME

by Andrei Pelinescu-Onciul

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 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 \

15 years, 6 months

git:master: makefile: REPO_VER: try to detect dirty local repo

by Andrei Pelinescu-Onciul

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. - make tar forces autover.h generation --- Makefile | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 68eff8c..a37999b 100644 --- a/Makefile +++ b/Makefile @@ -62,6 +62,8 @@ # $(MAKE) invocation (andrei) # 2009-04-22 don't rebuild config.mak or modules.lst if not needed # (e.g. on clean) (andrei) +# 2009-06-24 auto-generate autover.h, containing the REPO_VER macro, defined +# to the top git commit sha (if git is found) (andrei) # # check make version @@ -452,14 +454,18 @@ modules-cfg modules-list modules-lst: ifneq ($(wildcard .git),) # if .git/ exists -repo_ver=$(shell git rev-parse --short=6 HEAD 2>/dev/null || echo "unknown" ) +repo_ver=$(shell RV=`git rev-parse --verify --short=6 HEAD 2>/dev/null`;\ + [ -n "$$RV" ] && \ + test -n "`git diff-index --name-only HEAD >/dev/null`" && \ + RV="$$RV"-dirty; echo "$$RV") autover_h_dep=.git else # else if .git/ does not exist -repo_ver="unknown" +repo_ver= 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" >$@ @@ -651,7 +657,7 @@ dbg: sip-router dist: tar -tar: +tar: autover.h $(TAR) -C .. \ --exclude=$(notdir $(CURDIR))/test* \ --exclude=$(notdir $(CURDIR))/tmp* \

15 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev