sr-dev

sr-dev@lists.kamailio.org

15 participants
44229 discussions

git:master: makefile: per module extra utils and cfgs install

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 6bfac69a5b6e4672ae24e51903612e09662ca36d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6bfac69… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 15:51:47 2009 +0200 makefile: per module extra utils and cfgs install Support for easy adding per module extra scripts, utils (require compile) or configs. The following new module makefile variables are supported: MOD_INSTALL_UTILS - list of utils directories that should be compiled and installed along the module. The utils must know how to install themselves (make install). E.g.: MOD_INSTALL_UTILS=../../utils/sercmd MOD_INSTALL_SCRIPTS - list of scripts (complete path including the file name) that should be installed along the module. E.g.: MOD_INSTALL_SCRIPTS=../../scripts/foo/foo.sh MOD_INSTALL_CFGS - list of extra config files that should be installed in the main config directory. They should be set before including Makefile.modules. --- Makefile.modules | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 110 insertions(+), 3 deletions(-) diff --git a/Makefile.modules b/Makefile.modules index d536272..fab1bf9 100644 --- a/Makefile.modules +++ b/Makefile.modules @@ -14,8 +14,41 @@ # 2009-03-10 replaced DEFS with C_DEFS and INCLUDES with C_INCLUDES (DEFS # and INCLUDES are now used only for "temporary" defines/includes # inside modules or libs) (andrei) +# 2009-10-01 added support for automatically installing extra utils, +# scripts and cfg files (andrei) # +# +# Variables that should be defined in the modules, prior to including +# this makefile: +# +# NAME - module binary name, complete with .so and no path (MUST). +# +# COREPATH - path to the main/core directory (OPTIONAL, default ../..) +# +# DEFS - per module extra defines (OPTIONAL) +# +# LIBS - per module extra libs (OPTIONAL) +# +# SER_LIBS - ser/sr libs that should be compiled, linked against and installed +# along the module. The format is: <path>/<shortname>, e.g. +# SER_LIBS=../../lib/srdb2/srdb2 for libsrdb2 with the sources +# in ../../lib/srdb2. (OPTIONAL) +# +# MOD_INSTALL_UTILS - list of utils directories that should be compiled and +# installed along the module. The utils must know how to +# install themselves (make install). +# E.g.: MOD_INSTALL_UTILS=../../utils/sercmd +# (OPTIONAL) +# +# MOD_INSTALL_SCRIPTS - list of scripts (complete path including the file name) +# that should be installed along the module. +# E.g.: MOD_INSTALL_SCRIPTS=../../scripts/foo/foo.sh +# (OPTIONAL) +# +# MOD_INSTALL_CFGS - list of extra config files that should be installed in +# the main config directory, along the module (OPTIONAL). + MOD_NAME=$(NAME:.so=) # allow placing modules in separate directory apart from ser core @@ -82,14 +115,88 @@ LIBS:=$(filter-out -ldl -lresolv, $(LIBS)) .PHONY: install .PHONY: install-libs -install: $(NAME) $(mods_dst) install-libs +.PHONY: install-utils +.PHONY: install-scripts +.PHONY: install-cfgs +install: $(NAME) $(mods_dst) install-libs install-utils install-scripts \ + install-cfg $(INSTALL_TOUCH) $(mods_dst)/$(NAME) $(INSTALL_MODULES) $(NAME) $(mods_dst) +ifneq (,$(SER_LIBS)) install-libs: - @for lib in $(dir $(SER_LIBS)); do \ + @for lib in $(dir $(SER_LIBS)) ; do \ $(call try_err, $(MAKE) -C "$${lib}" install-if-newer ) ;\ - done + done; true + +else +install-libs: + +endif # $(SER_LIBS) + +ifneq (,$(MOD_INSTALL_UTILS)) +install-utils: + @for ut in $(MOD_INSTALL_UTILS) ; do \ + $(call try_err, $(MAKE) -C "$${ut}" install-if-newer ) ;\ + done; true + +else +install-utils: + +endif # $(MOD_INSTALL_UTILS) + +ifneq (,$(MOD_INSTALL_SCRIPTS)) +install-scripts: $(bin_prefix)/$(bin_dir) + @for r in $(MOD_INSTALL_SCRIPTS) ; do \ + if [ -n "$$r" ]; then \ + if [ -f "$$r" ]; then \ + $(call try_err, $(INSTALL_TOUCH) \ + $(bin_prefix)/$(bin_dir)/`basename "$$r"` ); \ + $(call try_err,\ + $(INSTALL_SCRIPT) "$$r" $(bin_prefix)/$(bin_dir) ); \ + else \ + echo "ERROR: $$r not found" ; \ + if [ ${err_fail} = 1 ] ; then \ + exit 1; \ + fi ; \ + fi ; \ + fi ; \ + done; true + +else +install-scripts: + +endif # $(MOD_INSTALL_SCRIPTS) + +ifneq (,$(MOD_INSTALL_CFGS)) +install-cfg: $(cfg_prefix)/$(cfg_dir) + @for r in $(MOD_INSTALL_CFGS) ; do \ + if [ -n "$$r" ]; then \ + if [ -f "$$r" ]; then \ + $(call try_err, $(INSTALL_TOUCH) \ + $(cfg_prefix)/$(cfg_dir)/`basename "$$r"` ); \ + $(call try_err,\ + $(INSTALL_CFG) "$$r" $(cfg_prefix)/$(cfg_dir) ); \ + else \ + echo "ERROR: $$r not found" ; \ + if [ ${err_fail} = 1 ] ; then \ + exit 1; \ + fi ; \ + fi ; \ + fi ; \ + done; true + +else +install-cfg: + +endif # $(MOD_INSTALL_CFGS) + + +$(bin_prefix)/$(bin_dir): + mkdir -p $@ + +$(cfg_prefix)/$(cfg_dir): + mkdir -p $@ # README build rules ifneq (,$(wildcard doc/Makefile))

15 years, 3 months

git:master: makefile: libs install-if-newer minor fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 1b5b2a85d3ca43ff7302dc4f04ea64dc9792b6ee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b5b2a8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 13:47:05 2009 +0200 makefile: libs install-if-newer minor fix - install-if-newer did re-install the library every time --- Makefile.libs | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.libs b/Makefile.libs index d1f6f3e..21df837 100644 --- a/Makefile.libs +++ b/Makefile.libs @@ -152,9 +152,10 @@ endif .PHONY:install-if-newer -install-if-newer: $(lib_prefix)/$(lib_dir)/$(LIB_RUNTIME_NAME) +install-if-newer: $(lib_prefix)/$(lib_dir)/$(LIB_RUNTIME_NAME) -$(lib_prefix)/$(lib_dir)/$(LIB_RUNTIME_NAME): $(LIB_NAME) $(LIBINAME_F) install +$(lib_prefix)/$(lib_dir)/$(LIB_RUNTIME_NAME): $(LIB_NAME) $(LIBINAME_F) + @$(MAKE) install ifneq ($(strip $(LIBINAME_F)),)

15 years, 3 months

git:master: makefile: modules install obeys $(err_fail)

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: f37495005e66e8f7ff0a6bf94bc9d25e437b2d9a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f374950… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 13:45:15 2009 +0200 makefile: modules install obeys $(err_fail) - if err_fail is 1 and a library fails to install the whole make install will fail --- Makefile.modules | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Makefile.modules b/Makefile.modules index 0b85655..d536272 100644 --- a/Makefile.modules +++ b/Makefile.modules @@ -64,10 +64,12 @@ LDFLAGS:=$(MOD_LDFLAGS) endif +err_fail?=1 include $(COREPATH)/Makefile.dirs include $(COREPATH)/Makefile.targets include $(COREPATH)/Makefile.rules +include $(COREPATH)/Makefile.shared # default: if not overwritten by the main Makefile, install in modules mods_dst=$(modules_prefix)/$(modules_dir)/modules @@ -86,7 +88,7 @@ install: $(NAME) $(mods_dst) install-libs install-libs: @for lib in $(dir $(SER_LIBS)); do \ - $(MAKE) -C "$${lib}" install-if-newer ;\ + $(call try_err, $(MAKE) -C "$${lib}" install-if-newer ) ;\ done # README build rules

15 years, 3 months

git:master: makefile: make install for utils

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 911f3742596a127913e6033cf1ad52d5084ad0dd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=911f374… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 13:42:36 2009 +0200 makefile: make install for utils - make install for utils - various small Makefile.utils fixes --- Makefile.utils | 39 ++++++++++++++++++++++++++++++++++----- 1 files changed, 34 insertions(+), 5 deletions(-) diff --git a/Makefile.utils b/Makefile.utils index 8c31594..0c38a79 100644 --- a/Makefile.utils +++ b/Makefile.utils @@ -8,6 +8,7 @@ # -------- # 2009-04-23 initial version derived from Makefile.modules (andrei) +UTIL_NAME=$(NAME) # default path to the core makefiles COREPATH ?=../.. @@ -20,6 +21,9 @@ override modules= override static_modules= override static_modules_path= +# temporary def (visible only in the util makefile, not exported) +DEFS += + ifneq ($(makefile_defs_included),1) $(error "the local makefile does not include Makefile.defs!") endif @@ -41,20 +45,45 @@ include $(COREPATH)/Makefile.sources # the rest of makefile and try only to remake the config ifeq ($(makefile_defs),1) +err_fail?=1 include $(COREPATH)/Makefile.dirs include $(COREPATH)/Makefile.targets include $(COREPATH)/Makefile.rules +include $(COREPATH)/Makefile.shared + +# default: if not overwritten by the main Makefile, install in bin_dir +util_dst=$(bin_prefix)/$(bin_dir) + +$(util_dst): + mkdir -p $(util_dst) modules: +.PHONY: install +.PHONY: install-libs +install: $(NAME) $(util_dst) install-libs + $(INSTALL_TOUCH) $(util_dst)/$(NAME) + $(INSTALL_BIN) $(NAME) $(util_dst) + +install-libs: + @for lib in $(dir $(SER_LIBS)); do \ + $(call try_err, $(MAKE) -C "$${lib}" install-if-newer ) ;\ + done + +.PHONY: install-if-newer +install-if-newer: $(util_dst)/$(NAME) + +$(util_dst)/$(NAME): $(NAME) + @$(MAKE) install + # README build rules ifneq (,$(wildcard doc/Makefile)) #doc/Makefile present => we can generate README README: doc/*.xml - $(MAKE) -C doc $(MOD_NAME).txt - mv doc/$(MOD_NAME).txt $@ + $(MAKE) -C doc $(UTIL_NAME).txt + mv doc/$(UTIL_NAME).txt $@ else # do nothing @@ -63,12 +92,12 @@ README: endif #man page build rules -ifneq (,$(wildcard $(MOD_NAME).xml)) +ifneq (,$(wildcard $(UTIL_NAME).xml)) -$(MOD_NAME).7: $(MOD_NAME).xml +$(UTIL_NAME).7: $(UTIL_NAME).xml docbook2x-man -s ../../doc/stylesheets/serdoc2man.xsl $< -man: $(MOD_NAME).7 +man: $(UTIL_NAME).7 else

15 years, 3 months

debian control file misses libpcre3-dev dependency

by Klaus Darilion

regards klaus PS: I know I could fix it myself, but I used git some time ago and already forgot the commands and workflow - so maybe another one can do it quite faster :-)

15 years, 3 months

Siremis not secure

by Iñaki Baz Castillo

Hi, after installing Siremis any one can visit this URL: http://SERVER_IP/siremis-0.9.3/siremis/metadata/Config.xml and see the database settings. -- Iñaki Baz Castillo <ibc(a)aliax.net>

15 years, 3 months

git:master: makefile: use -fsigned-char on some archs

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 4ef2fe37b80d26f34a656daeb890825e4e21f5fc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4ef2fe3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 11:28:02 2009 +0200 makefile: use -fsigned-char on some archs Use -fsigned-char for gcc on ppc, ppc64, arm and armv6 to avoid possible bugs (most people assume char is signed). --- Makefile.defs | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index aa38af0..88abb70 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -72,6 +72,8 @@ # 2009-09-29 for gcc 4.2+ use -fno-strict-overflow (andrei) # 2009-09-30 find the target architecture from the compiler and not # from the host (andrei) +# 2009-10-01 use -fsigned-char for gcc on ppc, ppc64, arm and arm6 +# (on those archs char is unsigned by default) (andrei) # check if already included/exported @@ -1057,7 +1059,7 @@ ifeq ($(ARCH), arm) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS=-O9 -funroll-loops $(PROFILE) + CFLAGS=-O9 -funroll-loops -fsigned-char $(PROFILE) #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) CFLAGS+= -ftree-vectorize -fno-strict-overflow @@ -1105,7 +1107,7 @@ ifeq ($(ARCH), arm6) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS=-march=armv6 -O9 -funroll-loops \ + CFLAGS=-march=armv6 -O9 -funroll-loops -fsigned-char \ $(PROFILE) #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) @@ -1335,7 +1337,7 @@ ifeq ($(ARCH), ppc) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS= -O9 -funroll-loops $(PROFILE) + CFLAGS= -O9 -funroll-loops -fsigned-char $(PROFILE) #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) CPU ?= powerpc @@ -1384,7 +1386,7 @@ ifeq ($(ARCH), ppc64) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS= -O9 -funroll-loops $(PROFILE) + CFLAGS= -O9 -funroll-loops -fsigned-char $(PROFILE) #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) CPU ?= powerpc64

15 years, 3 months

git:master: uac: use signed char (minor fix)

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: a5af9eccf88a7696a5b3519da4651859f4a354f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5af9ec… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 11:25:43 2009 +0200 uac: use signed char (minor fix) On some platform/compiler combination char can be unsigned by default (e.g. gcc arm and ppc) => use signed char when comparing it with 0. --- modules_k/uac/from.c | 2 +- modules_s/uac/from.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/uac/from.c b/modules_k/uac/from.c index dc3bbcb..4657e11 100644 --- a/modules_k/uac/from.c +++ b/modules_k/uac/from.c @@ -123,7 +123,7 @@ static inline int decode_from( str *src , str *dst) int idx; int end; int i,j; - char c; + signed char c; /* Count '-' at end and disregard them */ for( n=0,i=src->len-1; src->s[i]=='-'; i--) diff --git a/modules_s/uac/from.c b/modules_s/uac/from.c index e9e3243..f7abf88 100644 --- a/modules_s/uac/from.c +++ b/modules_s/uac/from.c @@ -110,7 +110,7 @@ static inline int decode_from( str *src , str *dst) int idx; int end; int i,j; - char c; + signed char c; /* Count '-' at end and disregard them */ for( n=0,i=src->len-1; src->s[i]=='-'; i--)

15 years, 3 months

git:master: libsrdb1: fix bad include

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 64e3977d3b6b605711f68ea8bd820c16e5bdd7c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=64e3977… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 30 20:28:03 2009 +0200 libsrdb1: fix bad include Removed unneeded #include </usr/include/limits.h> which breaks cross-compiling (#include <limits.h> is enough). --- lib/srdb1/db_ut.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/db_ut.c b/lib/srdb1/db_ut.c index 498ad7f..16e2f4f 100644 --- a/lib/srdb1/db_ut.c +++ b/lib/srdb1/db_ut.c @@ -35,7 +35,6 @@ #include "../../mem/mem.h" #include "../../dprint.h" #include <limits.h> -#include </usr/include/limits.h> #include <errno.h> #include <stdio.h> #include <stdlib.h>

15 years, 3 months

git:master: usrloc(s): gcc 2.9x var decls. fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 4cd5605bb9b28e6ffb872068d0aab833ea3d8811 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4cd5605… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 01:26:52 2009 +0200 usrloc(s): gcc 2.9x var decls. fixes variable declarations must be at the beginning of the function and not intercalated in the code. --- modules_s/usrloc/ul_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_s/usrloc/ul_mod.c b/modules_s/usrloc/ul_mod.c index 61307bd..0afc98f 100644 --- a/modules_s/usrloc/ul_mod.c +++ b/modules_s/usrloc/ul_mod.c @@ -207,7 +207,6 @@ static int mod_init(void) static int build_db_cmds(void) { - INFO("usrloc: build_db_cmds()\n"); db_fld_t del_contact_match[] = { {.name = uid_col.s, .type = DB_STR}, {.name = contact_col.s, .type = DB_STR}, @@ -234,6 +233,7 @@ static int build_db_cmds(void) dlist_t* ptr; int i; + INFO("usrloc: build_db_cmds()\n"); for(cmd_n = 0, ptr = root; ptr; cmd_n++, ptr = ptr->next); del_contact = pkg_malloc(cmd_n);

15 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev