From e81fc2ac9cf9888fa3d81a991730bde26207049b Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 19 Oct 2009 14:31:05 +0000 Subject: [PATCH] - Clean up installation of python files. Signed-off-by: Peter Lemenkov git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1547 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- apps/conf_auth/CMakeLists.txt | 2 +- apps/ivr/CMakeLists.txt | 2 +- apps/mailbox/CMakeLists.txt | 10 +++++----- apps/pin_collect/CMakeLists.txt | 2 +- apps/py_sems/CMakeLists.txt | 2 +- apps/twit/CMakeLists.txt | 2 +- cmake/python.rules.txt | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apps/conf_auth/CMakeLists.txt b/apps/conf_auth/CMakeLists.txt index 81af004a..7812c387 100644 --- a/apps/conf_auth/CMakeLists.txt +++ b/apps/conf_auth/CMakeLists.txt @@ -2,4 +2,4 @@ SET(sems_module_name conf_auth) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/python.rules.txt) -PYTHON_SOURCES_COMPILE(conf_auth ivr) +PYTHON_SOURCES_COMPILE(conf_auth.py ivr) diff --git a/apps/ivr/CMakeLists.txt b/apps/ivr/CMakeLists.txt index 4cd1b708..6ddb586e 100644 --- a/apps/ivr/CMakeLists.txt +++ b/apps/ivr/CMakeLists.txt @@ -24,4 +24,4 @@ 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 ivr) +PYTHON_SOURCES_COMPILE(py/log.py ivr) diff --git a/apps/mailbox/CMakeLists.txt b/apps/mailbox/CMakeLists.txt index b8fa8b49..3d9acb74 100644 --- a/apps/mailbox/CMakeLists.txt +++ b/apps/mailbox/CMakeLists.txt @@ -19,8 +19,8 @@ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/python.rules.txt) -PYTHON_SOURCES_COMPILE(mailbox ivr) -PYTHON_SOURCES_COMPILE(mailbox_query ivr) -PYTHON_SOURCES_COMPILE(imap_mailbox/MailboxURL ivr/imap_mailbox) -PYTHON_SOURCES_COMPILE(imap_mailbox/__init__ ivr/imap_mailbox) -PYTHON_SOURCES_COMPILE(imap_mailbox/imap4ext ivr/imap_mailbox) +PYTHON_SOURCES_COMPILE(mailbox.py ivr) +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) diff --git a/apps/pin_collect/CMakeLists.txt b/apps/pin_collect/CMakeLists.txt index 6ec6aa5c..ff2535d0 100644 --- a/apps/pin_collect/CMakeLists.txt +++ b/apps/pin_collect/CMakeLists.txt @@ -8,4 +8,4 @@ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/python.rules.txt) -PYTHON_SOURCES_COMPILE(pin_collect ivr) +PYTHON_SOURCES_COMPILE(pin_collect.py ivr) diff --git a/apps/py_sems/CMakeLists.txt b/apps/py_sems/CMakeLists.txt index ca80ef10..91bc2468 100644 --- a/apps/py_sems/CMakeLists.txt +++ b/apps/py_sems/CMakeLists.txt @@ -29,4 +29,4 @@ 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 plug-in) +PYTHON_SOURCES_COMPILE(py/py_sems_log.py plug-in) diff --git a/apps/twit/CMakeLists.txt b/apps/twit/CMakeLists.txt index d25cd62b..adf3ddba 100644 --- a/apps/twit/CMakeLists.txt +++ b/apps/twit/CMakeLists.txt @@ -11,4 +11,4 @@ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/python.rules.txt) -PYTHON_SOURCES_COMPILE(twit ivr) +PYTHON_SOURCES_COMPILE(twit.py ivr) diff --git a/cmake/python.rules.txt b/cmake/python.rules.txt index 3b118050..5cce24b8 100644 --- a/cmake/python.rules.txt +++ b/cmake/python.rules.txt @@ -1,7 +1,7 @@ FUNCTION(PYTHON_SOURCES_COMPILE python_files sems_python_dir) FOREACH (python_file ${python_files}) - EXECUTE_PROCESS(COMMAND python -c "import py_compile; py_compile.compile('${CMAKE_CURRENT_SOURCE_DIR}/${python_file}.py')") - EXECUTE_PROCESS(COMMAND python -O -c "import py_compile; py_compile.compile('${CMAKE_CURRENT_SOURCE_DIR}/${python_file}.py')") - INSTALL (FILES ${python_file}.py ${python_file}.pyc ${python_file}.pyo DESTINATION ${SEMS_EXEC_PREFIX}/${SEMS_LIBDIR}/sems/${sems_python_dir}) + EXECUTE_PROCESS(COMMAND python -c "import py_compile; py_compile.compile('${CMAKE_CURRENT_SOURCE_DIR}/${python_file}')") + EXECUTE_PROCESS(COMMAND python -O -c "import py_compile; py_compile.compile('${CMAKE_CURRENT_SOURCE_DIR}/${python_file}')") + INSTALL (FILES ${python_file} ${python_file}c ${python_file}o DESTINATION ${SEMS_EXEC_PREFIX}/${SEMS_LIBDIR}/sems/${sems_python_dir}) ENDFOREACH() ENDFUNCTION()