sr-dev

sr-dev@lists.kamailio.org

13 participants
45254 discussions

git:master: db_mysql: install shared *.sql files
by Andrei Pelinescu-Onciul 01 Oct '09

01 Oct '09

Module: sip-router Branch: master Commit: c7683811e99d30c95b0dfeaeeeee446cb6533d78 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c768381… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 16:51:36 2009 +0200 db_mysql: install shared *.sql files --- modules/db_mysql/Makefile | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/db_mysql/Makefile b/modules/db_mysql/Makefile index a1b8a8a..379fca5 100644 --- a/modules/db_mysql/Makefile +++ b/modules/db_mysql/Makefile @@ -21,6 +21,9 @@ LIBS=-L/usr/lib/mysql -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/mysql \ SERLIBPATH=../../lib SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1 +MOD_INSTALL_SHARE= ../../scripts/mysql/my_create.sql \ + ../../scripts/mysql/my_data.sql \ + ../../scripts/mysql/my_drop.sql install-mysql-script: $(bin_prefix)/$(bin_dir) sed -e "s#^DEFAULT_SCRIPT_DIR.*#DEFAULT_SCRIPT_DIR=\"$(share_prefix)/$(share_dir)\"#g" \

1 0

git:master: makefile: per modules arch. indep. files install support
by Andrei Pelinescu-Onciul 01 Oct '09

01 Oct '09

Module: sip-router Branch: master Commit: 80c36172af7040d9d1da75121dda90abcc640ce4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80c3617… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 16:48:30 2009 +0200 makefile: per modules arch. indep. files install support Support for easily adding arch. independent files that should be installed along a module. The following new module makefile variable is supported: MOD_INSTALL_SHARE - list of files to install into the arch-independent shared directory (by default /usr/local/share/$(MAIN_NAME)). --- Makefile.modules | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/Makefile.modules b/Makefile.modules index fab1bf9..f1f172b 100644 --- a/Makefile.modules +++ b/Makefile.modules @@ -48,6 +48,11 @@ # # MOD_INSTALL_CFGS - list of extra config files that should be installed in # the main config directory, along the module (OPTIONAL). +# +# MOD_INSTALL_SHARE - list of files to install into the arch-independent +# shared directory (by default +# /usr/local/share/$(MAIN_NAME)) +# MOD_NAME=$(NAME:.so=) @@ -119,7 +124,7 @@ LIBS:=$(filter-out -ldl -lresolv, $(LIBS)) .PHONY: install-scripts .PHONY: install-cfgs install: $(NAME) $(mods_dst) install-libs install-utils install-scripts \ - install-cfg + install-cfg install-share $(INSTALL_TOUCH) $(mods_dst)/$(NAME) $(INSTALL_MODULES) $(NAME) $(mods_dst) @@ -191,6 +196,29 @@ install-cfg: endif # $(MOD_INSTALL_CFGS) +ifneq (,$(MOD_INSTALL_SHARE)) +install-share: $(share_prefix)/$(share_dir) + @for r in $(MOD_INSTALL_SHARE) ; do \ + if [ -n "$$r" ]; then \ + if [ -f "$$r" ]; then \ + $(call try_err, $(INSTALL_TOUCH) \ + $(share_prefix)/$(share_dir)/`basename "$$r"` ); \ + $(call try_err,\ + $(INSTALL_SHARE) "$$r" $(share_prefix)/$(share_dir) ); \ + else \ + echo "ERROR: $$r not found" ; \ + if [ ${err_fail} = 1 ] ; then \ + exit 1; \ + fi ; \ + fi ; \ + fi ; \ + done; true + +else +install-share: + +endif # $(MOD_INSTALL_SHARE) + $(bin_prefix)/$(bin_dir): mkdir -p $@ @@ -198,6 +226,9 @@ $(bin_prefix)/$(bin_dir): $(cfg_prefix)/$(cfg_dir): mkdir -p $@ +$(share_prefix)/$(share_dir): + mkdir -p $@ + # README build rules ifneq (,$(wildcard doc/Makefile)) #doc/Makefile present => we can generate README

1 0

git:master: tls: updated to the new auto install cfg makefile
by Andrei Pelinescu-Onciul 01 Oct '09

01 Oct '09

Module: sip-router Branch: master Commit: ce383454955291178e9fd097711ca28a11363009 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce38345… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 16:01:34 2009 +0200 tls: updated to the new auto install cfg makefile --- modules/tls/Makefile | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/tls/Makefile b/modules/tls/Makefile index 8fac654..f3970a4 100644 --- a/modules/tls/Makefile +++ b/modules/tls/Makefile @@ -15,17 +15,14 @@ LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto \ # NOTE: depending on the way in which libssl was compiled you might # have to add -lz -lkrb5 (zlib and kerberos5). # E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5" - +MOD_INSTALL_CFGS=tls.cfg DEFS+=-DOPENSER_MOD_INTERFACE include ../../Makefile.modules -$(cfg_prefix)/$(cfg_dir): - mkdir -p $(cfg_prefix)/$(cfg_dir) -install-cfg: $(cfg_prefix)/$(cfg_dir) - $(INSTALL_CFG) tls.cfg $(cfg_prefix)/$(cfg_dir) +install-tls-cert: $(cfg_prefix)/$(cfg_dir) ./$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) -install: install-cfg +install-cfg: install-tls-cert

1 0

git:master: makefile: utils and cfg cleanup
by Andrei Pelinescu-Onciul 01 Oct '09

01 Oct '09

Module: sip-router Branch: master Commit: 48dd70783900038f379a35817df942dc59d5e646 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48dd707… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 16:02:51 2009 +0200 makefile: utils and cfg cleanup Moved sercmd, sip-router_mysql.sh and tls.cfg install to their respective modules. --- Makefile | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index b7d2bbe..ec2b9ba 100644 --- a/Makefile +++ b/Makefile @@ -336,7 +336,7 @@ cmodules=$(foreach mods,$(modules_dirs), $($(mods))) # which utils need compilation (directory path) and which to install # (full path including file name) utils_compile= utils/gen_ha1 utils/sercmd -utils_bin_install= utils/gen_ha1/gen_ha1 utils/sercmd/sercmd +utils_bin_install= utils/gen_ha1/gen_ha1 # sercmd is now installed by ctl utils_script_install= # This is the list of files to be installed into the arch-independent @@ -801,11 +801,6 @@ install-cfg: $(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/$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) - install-bin: $(bin_prefix)/$(bin_dir) $(NAME) $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME) $(INSTALL_BIN) $(NAME) $(bin_prefix)/$(bin_dir) @@ -866,12 +861,6 @@ install-utils: utils $(bin_prefix)/$(bin_dir) fi ;\ fi ; \ done; true - # 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/$(SCR_NAME)_mysql.sh > \ - $(bin_prefix)/$(bin_dir)/$(MAIN_NAME)_mysql.sh - chmod 755 $(bin_prefix)/$(bin_dir)/$(MAIN_NAME)_mysql.sh install-modules-all: install-every-module install-every-module-doc

1 0

git:master: ctl(s): automatically install sercmd
by Andrei Pelinescu-Onciul 01 Oct '09

01 Oct '09

Module: sip-router Branch: master Commit: 9e4c500f6e6e6ad0725316968878d3ae661ace8c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e4c500… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 15:56:56 2009 +0200 ctl(s): automatically install sercmd --- modules_s/ctl/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_s/ctl/Makefile b/modules_s/ctl/Makefile index eac18c0..144d4c5 100644 --- a/modules_s/ctl/Makefile +++ b/modules_s/ctl/Makefile @@ -7,6 +7,7 @@ include ../../Makefile.defs auto_gen= NAME=ctl.so LIBS= +MOD_INSTALL_UTILS=../../utils/sercmd # fifo support DEFS+=-DUSE_FIFO

1 0

git:master: makefile: per module extra utils and cfgs install
by Andrei Pelinescu-Onciul 01 Oct '09

01 Oct '09

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

1 0

git:master: makefile: libs install-if-newer minor fix
by Andrei Pelinescu-Onciul 01 Oct '09

01 Oct '09

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

1 0

git:master: makefile: modules install obeys $(err_fail)
by Andrei Pelinescu-Onciul 01 Oct '09

01 Oct '09

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

1 0

git:master: makefile: make install for utils
by Andrei Pelinescu-Onciul 01 Oct '09

01 Oct '09

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

1 0

debian control file misses libpcre3-dev dependency
by Klaus Darilion 01 Oct '09

01 Oct '09

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

3 3

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev