From d31c6fd18f3f54ba7e8c7f102fd784b50e5663ec Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 3 Oct 2010 13:52:49 +0400 Subject: [PATCH] Simplify doc-files installation Signed-off-by: Peter Lemenkov --- apps/ann_b2b/CMakeLists.txt | 1 - apps/announce_transfer/CMakeLists.txt | 1 - apps/announcement/CMakeLists.txt | 1 - apps/annrecorder/CMakeLists.txt | 1 - apps/auth_b2b/CMakeLists.txt | 1 - apps/call_timer/CMakeLists.txt | 1 - apps/callback/CMakeLists.txt | 1 - apps/click2dial/CMakeLists.txt | 1 - apps/conf_auth/CMakeLists.txt | 1 + apps/conference/CMakeLists.txt | 1 - apps/dsm/CMakeLists.txt | 3 +-- apps/early_announce/CMakeLists.txt | 1 - apps/gateway/CMakeLists.txt | 1 - apps/ivr/CMakeLists.txt | 1 - apps/jsonrpc/CMakeLists.txt | 1 - apps/mailbox/CMakeLists.txt | 3 ++- apps/monitoring/CMakeLists.txt | 1 - apps/msg_storage/CMakeLists.txt | 1 - apps/pin_collect/CMakeLists.txt | 1 + apps/precoded_announce/CMakeLists.txt | 1 - apps/py_sems/CMakeLists.txt | 1 - apps/reg_agent/CMakeLists.txt | 1 - apps/sst_b2b/CMakeLists.txt | 1 - apps/sw_prepaid_sip/CMakeLists.txt | 1 - apps/twit/CMakeLists.txt | 1 + apps/voicebox/CMakeLists.txt | 1 - apps/voicemail/CMakeLists.txt | 1 - apps/webconference/CMakeLists.txt | 1 - apps/xmlrpc2di/CMakeLists.txt | 1 - cmake/config.rules.txt | 34 +++++++++++++++------------ cmake/module.rules.txt | 7 ++++++ 31 files changed, 32 insertions(+), 42 deletions(-) diff --git a/apps/ann_b2b/CMakeLists.txt b/apps/ann_b2b/CMakeLists.txt index 0fae5a07..f077d1d0 100644 --- a/apps/ann_b2b/CMakeLists.txt +++ b/apps/ann_b2b/CMakeLists.txt @@ -4,4 +4,3 @@ AnnounceB2B.cpp SET(sems_module_name ann_b2b) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/announce_transfer/CMakeLists.txt b/apps/announce_transfer/CMakeLists.txt index 1bfe4130..40977854 100644 --- a/apps/announce_transfer/CMakeLists.txt +++ b/apps/announce_transfer/CMakeLists.txt @@ -4,4 +4,3 @@ AnnounceTransfer.cpp SET(sems_module_name announce_transfer) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/announcement/CMakeLists.txt b/apps/announcement/CMakeLists.txt index bbb5e9b5..531807fe 100644 --- a/apps/announcement/CMakeLists.txt +++ b/apps/announcement/CMakeLists.txt @@ -4,4 +4,3 @@ Announcement.cpp SET(sems_module_name announcement) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/annrecorder/CMakeLists.txt b/apps/annrecorder/CMakeLists.txt index 548071f1..171c1d61 100644 --- a/apps/annrecorder/CMakeLists.txt +++ b/apps/annrecorder/CMakeLists.txt @@ -15,4 +15,3 @@ your_prompt.wav SET(sems_module_name annrecorder) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/auth_b2b/CMakeLists.txt b/apps/auth_b2b/CMakeLists.txt index a707906b..b31470d3 100644 --- a/apps/auth_b2b/CMakeLists.txt +++ b/apps/auth_b2b/CMakeLists.txt @@ -4,4 +4,3 @@ AuthB2B.cpp SET(sems_module_name auth_b2b) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/call_timer/CMakeLists.txt b/apps/call_timer/CMakeLists.txt index c822e2c2..c3f8d946 100644 --- a/apps/call_timer/CMakeLists.txt +++ b/apps/call_timer/CMakeLists.txt @@ -4,4 +4,3 @@ CallTimer.cpp SET(sems_module_name call_timer) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/callback/CMakeLists.txt b/apps/callback/CMakeLists.txt index 0ae2d71e..872d06ab 100644 --- a/apps/callback/CMakeLists.txt +++ b/apps/callback/CMakeLists.txt @@ -4,4 +4,3 @@ CallBack.cpp SET(sems_module_name callback) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/click2dial/CMakeLists.txt b/apps/click2dial/CMakeLists.txt index 779cc5ee..9a2f6ac9 100644 --- a/apps/click2dial/CMakeLists.txt +++ b/apps/click2dial/CMakeLists.txt @@ -4,4 +4,3 @@ Click2Dial.cpp SET(sems_module_name click2dial) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/conf_auth/CMakeLists.txt b/apps/conf_auth/CMakeLists.txt index 7812c387..f2ed0be9 100644 --- a/apps/conf_auth/CMakeLists.txt +++ b/apps/conf_auth/CMakeLists.txt @@ -3,3 +3,4 @@ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/python.rules.txt) PYTHON_SOURCES_COMPILE(conf_auth.py ivr) +SEMS_INSTALL_CONFIGS(conf_auth) diff --git a/apps/conference/CMakeLists.txt b/apps/conference/CMakeLists.txt index 40c70638..8e4bc046 100644 --- a/apps/conference/CMakeLists.txt +++ b/apps/conference/CMakeLists.txt @@ -23,4 +23,3 @@ ENDIF(MYSQLPP_FOUND) SET(sems_module_name conference) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/dsm/CMakeLists.txt b/apps/dsm/CMakeLists.txt index 6025c4ed..456bc4c2 100644 --- a/apps/dsm/CMakeLists.txt +++ b/apps/dsm/CMakeLists.txt @@ -4,7 +4,7 @@ ADD_SUBDIRECTORY (lib) ADD_SUBDIRECTORY (mods) SET(sems_module_name dsm) -SET(sems_config_files dsm_in_prompts dsm_out_prompts) +SET(dsm_config_files dsm dsm_in_prompts dsm_out_prompts) SET(dsm_doc_files ../../doc/dsm/Readme.dsm.txt ../../doc/dsm/dsm_syntax.txt @@ -12,4 +12,3 @@ SET(dsm_doc_files ) SET(dsm_doc_dirs ../../doc/dsm) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/early_announce/CMakeLists.txt b/apps/early_announce/CMakeLists.txt index 184d2825..43c374e2 100644 --- a/apps/early_announce/CMakeLists.txt +++ b/apps/early_announce/CMakeLists.txt @@ -11,4 +11,3 @@ ENDIF(MYSQLPP_FOUND) SET(sems_module_name early_announce) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/gateway/CMakeLists.txt b/apps/gateway/CMakeLists.txt index e18389ad..2d6f36d2 100644 --- a/apps/gateway/CMakeLists.txt +++ b/apps/gateway/CMakeLists.txt @@ -12,4 +12,3 @@ INCLUDE_DIRECTORIES(${MISDN_INCLUDE_DIR}/mISDNuser) SET(sems_module_name gateway) SET(sems_module_libs mISDN isdnnet) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/ivr/CMakeLists.txt b/apps/ivr/CMakeLists.txt index 6ddb586e..928b5296 100644 --- a/apps/ivr/CMakeLists.txt +++ b/apps/ivr/CMakeLists.txt @@ -21,7 +21,6 @@ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${PYTHON_LIB_FLAGS}" SET(sems_module_name ivr) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/python.rules.txt) PYTHON_SOURCES_COMPILE(py/log.py ivr) diff --git a/apps/jsonrpc/CMakeLists.txt b/apps/jsonrpc/CMakeLists.txt index ea8a62ff..3d053fff 100644 --- a/apps/jsonrpc/CMakeLists.txt +++ b/apps/jsonrpc/CMakeLists.txt @@ -10,4 +10,3 @@ ADD_DEFINITIONS(-I${LIBEV_INCLUDE_DIR}) SET(sems_module_name jsonrpc) SET(sems_module_libs ${sems_module_libs} ev) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/mailbox/CMakeLists.txt b/apps/mailbox/CMakeLists.txt index 3d9acb74..7fe23e45 100644 --- a/apps/mailbox/CMakeLists.txt +++ b/apps/mailbox/CMakeLists.txt @@ -14,7 +14,6 @@ set (audio_files you_have.wav ) SET(sems_module_name mailbox) -SET(sems_config_files mailbox_query) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/python.rules.txt) @@ -24,3 +23,5 @@ PYTHON_SOURCES_COMPILE(mailbox_query.py ivr) PYTHON_SOURCES_COMPILE(imap_mailbox/MailboxURL.py ivr/imap_mailbox) PYTHON_SOURCES_COMPILE(imap_mailbox/__init__.py ivr/imap_mailbox) PYTHON_SOURCES_COMPILE(imap_mailbox/imap4ext.py ivr/imap_mailbox) + +SEMS_INSTALL_CONFIGS("mailbox;mailbox_query") diff --git a/apps/monitoring/CMakeLists.txt b/apps/monitoring/CMakeLists.txt index 4494a5cc..50438b25 100644 --- a/apps/monitoring/CMakeLists.txt +++ b/apps/monitoring/CMakeLists.txt @@ -4,4 +4,3 @@ Monitoring.cpp SET(sems_module_name monitoring) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/msg_storage/CMakeLists.txt b/apps/msg_storage/CMakeLists.txt index 88711272..ae237553 100644 --- a/apps/msg_storage/CMakeLists.txt +++ b/apps/msg_storage/CMakeLists.txt @@ -8,4 +8,3 @@ MsgStorage.cpp SET(sems_module_name msg_storage) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/pin_collect/CMakeLists.txt b/apps/pin_collect/CMakeLists.txt index ff2535d0..bb6b8ef3 100644 --- a/apps/pin_collect/CMakeLists.txt +++ b/apps/pin_collect/CMakeLists.txt @@ -9,3 +9,4 @@ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/python.rules.txt) PYTHON_SOURCES_COMPILE(pin_collect.py ivr) +SEMS_INSTALL_CONFIGS(pin_collect) diff --git a/apps/precoded_announce/CMakeLists.txt b/apps/precoded_announce/CMakeLists.txt index ab79f6f1..1ace09a9 100644 --- a/apps/precoded_announce/CMakeLists.txt +++ b/apps/precoded_announce/CMakeLists.txt @@ -9,4 +9,3 @@ test.predef SET(sems_module_name precoded_announce) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/py_sems/CMakeLists.txt b/apps/py_sems/CMakeLists.txt index 40b7be31..084ac37c 100644 --- a/apps/py_sems/CMakeLists.txt +++ b/apps/py_sems/CMakeLists.txt @@ -23,7 +23,6 @@ INCLUDE_DIRECTORIES (sip) SET(sems_module_name py_sems) SET(sems_module_libs sip) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/python.rules.txt) PYTHON_SOURCES_COMPILE(py/py_sems_log.py plug-in) diff --git a/apps/reg_agent/CMakeLists.txt b/apps/reg_agent/CMakeLists.txt index 385295a5..bf4446ef 100644 --- a/apps/reg_agent/CMakeLists.txt +++ b/apps/reg_agent/CMakeLists.txt @@ -4,4 +4,3 @@ RegistrationAgent.cpp SET(sems_module_name reg_agent) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/sst_b2b/CMakeLists.txt b/apps/sst_b2b/CMakeLists.txt index fbefd025..6d8b376b 100644 --- a/apps/sst_b2b/CMakeLists.txt +++ b/apps/sst_b2b/CMakeLists.txt @@ -4,4 +4,3 @@ SSTB2B.cpp SET(sems_module_name sst_b2b) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/sw_prepaid_sip/CMakeLists.txt b/apps/sw_prepaid_sip/CMakeLists.txt index 433c7001..7698e390 100644 --- a/apps/sw_prepaid_sip/CMakeLists.txt +++ b/apps/sw_prepaid_sip/CMakeLists.txt @@ -4,4 +4,3 @@ SWPrepaidSIP.cpp SET(sems_module_name sw_prepaid_sip) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/twit/CMakeLists.txt b/apps/twit/CMakeLists.txt index adf3ddba..dd496051 100644 --- a/apps/twit/CMakeLists.txt +++ b/apps/twit/CMakeLists.txt @@ -12,3 +12,4 @@ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/python.rules.txt) PYTHON_SOURCES_COMPILE(twit.py ivr) +SEMS_INSTALL_CONFIGS(twit) diff --git a/apps/voicebox/CMakeLists.txt b/apps/voicebox/CMakeLists.txt index 662bc6a5..9c3a5fc5 100644 --- a/apps/voicebox/CMakeLists.txt +++ b/apps/voicebox/CMakeLists.txt @@ -65,4 +65,3 @@ you_have.wav SET(sems_module_name voicebox) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/voicemail/CMakeLists.txt b/apps/voicemail/CMakeLists.txt index b82736fd..e8696059 100644 --- a/apps/voicemail/CMakeLists.txt +++ b/apps/voicemail/CMakeLists.txt @@ -24,4 +24,3 @@ default_en.wav SET(sems_module_name voicemail) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/webconference/CMakeLists.txt b/apps/webconference/CMakeLists.txt index 21942a5c..0e9462da 100644 --- a/apps/webconference/CMakeLists.txt +++ b/apps/webconference/CMakeLists.txt @@ -26,4 +26,3 @@ wrong_pin.wav SET(sems_module_name webconference) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/apps/xmlrpc2di/CMakeLists.txt b/apps/xmlrpc2di/CMakeLists.txt index a11ac3b6..db17d1c3 100644 --- a/apps/xmlrpc2di/CMakeLists.txt +++ b/apps/xmlrpc2di/CMakeLists.txt @@ -16,4 +16,3 @@ IF(OPENSSL_FOUND) ENDIF(OPENSSL_FOUND) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) diff --git a/cmake/config.rules.txt b/cmake/config.rules.txt index a04a4d59..cf5fd887 100644 --- a/cmake/config.rules.txt +++ b/cmake/config.rules.txt @@ -1,17 +1,21 @@ -FOREACH (config_file ${sems_module_name} ${sems_config_files}) - # Check whether we providing a template for this config - FIND_PATH(SEMS_${sems_module_name}_CONFIG_${config_file}_TEMPLATE ${config_file}.conf.cmake PATHS ${CMAKE_CURRENT_SOURCE_DIR}/etc) +MACRO(SEMS_INSTALL_CONFIGS config_files) + FOREACH (config_file ${config_files}) + # Check whether we providing a template for this config + FIND_PATH(SEMS_${sems_module_name}_CONFIG_${config_file}_TEMPLATE ${config_file}.conf.cmake PATHS ${CMAKE_CURRENT_SOURCE_DIR}/etc) - IF (SEMS_${sems_module_name}_CONFIG_${config_file}_TEMPLATE) - # If we do provide a template, then process it and create real - # config - CONFIGURE_FILE ( - ${SEMS_${sems_module_name}_CONFIG_${config_file}_TEMPLATE}/${config_file}.conf.cmake - ${SEMS_${sems_module_name}_CONFIG_${config_file}_TEMPLATE}/${config_file}.conf - ) - ENDIF (SEMS_${sems_module_name}_CONFIG_${config_file}_TEMPLATE) + IF (SEMS_${sems_module_name}_CONFIG_${config_file}_TEMPLATE) + # If we do provide a template, then process it and create real + # config + CONFIGURE_FILE ( + ${SEMS_${sems_module_name}_CONFIG_${config_file}_TEMPLATE}/${config_file}.conf.cmake + ${SEMS_${sems_module_name}_CONFIG_${config_file}_TEMPLATE}/${config_file}.conf + ) + ENDIF (SEMS_${sems_module_name}_CONFIG_${config_file}_TEMPLATE) - INSTALL( - FILES ./etc/${config_file}.conf DESTINATION ${SEMS_CFG_PREFIX}/etc/sems/etc/ - ) -ENDFOREACH(config_file ${sems_module_name} ${sems_config_files}) + IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/etc/${config_file}.conf ) + INSTALL( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/etc/${config_file}.conf DESTINATION ${SEMS_CFG_PREFIX}/etc/sems/etc/ + ) + ENDIF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/etc/${config_file}.conf ) + ENDFOREACH (config_file ${config_files}) +ENDMACRO(SEMS_INSTALL_CONFIGS) diff --git a/cmake/module.rules.txt b/cmake/module.rules.txt index 90d88f17..20b6285f 100644 --- a/cmake/module.rules.txt +++ b/cmake/module.rules.txt @@ -5,6 +5,7 @@ # E.g. the issue, then speex module should be linked to -lspeex INCLUDE(${CMAKE_SOURCE_DIR}/cmake/doc.rules.txt) +INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) ADD_LIBRARY(sems_${sems_module_name} SHARED ${${sems_module_name}_SRCS}) @@ -28,3 +29,9 @@ IF(NOT DEFINED ${sems_module_name}_docs) ENDIF(NOT DEFINED ${sems_module_name}_docs) SEMS_INSTALL_DOCS("${${sems_module_name}_docs}" "${${sems_module_name}_doc_dirs}") + +IF(NOT DEFINED ${sems_module_name}_config_files) + SEMS_INSTALL_CONFIGS("${sems_module_name}") +ELSE(NOT DEFINED ${sems_module_name}_config_files) + SEMS_INSTALL_CONFIGS("${${sems_module_name}_config_files}") +ENDIF(NOT DEFINED ${sems_module_name}_config_files)