svn commit: r1650396 - in /qpid/dispatch/trunk: python/CMakeLists.txt python/install_python.cmake router/src/main.c

[aconway]

Author: aconway
Date: Thu Jan  8 22:13:07 2015
New Revision: 1650396

URL: http://svn.apache.org/r1650396
Log:
NO-JIRA: Fix build and install problems

- Compile problem on Fedora 21.
- Put python install back inline (problem with DESTDIR passed to install script)

Modified:
    qpid/dispatch/trunk/python/CMakeLists.txt
    qpid/dispatch/trunk/python/install_python.cmake
    qpid/dispatch/trunk/router/src/main.c

Modified: qpid/dispatch/trunk/python/CMakeLists.txt
URL: 
http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/CMakeLists.txt?rev=1650396&r1=1650395&r2=1650396&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/python/CMakeLists.txt Thu Jan  8 22:13:07 2015
@@ -27,9 +27,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DI
                ${CMAKE_CURRENT_BINARY_DIR}/qpid_dispatch_site.py)
 
 # Install script for public python modules
-install(SCRIPT install_python.cmake)
-install(
-  FILES
+install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py -v install 
--prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY 
${CMAKE_CURRENT_BINARY_DIR})")
+
+install(FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/qpid_dispatch/management/qdrouter.json
   ${CMAKE_CURRENT_SOURCE_DIR}/qpid_dispatch/management/qdrouter.json.readme.txt
   DESTINATION ${QPID_DISPATCH_CONFDIR}

Modified: qpid/dispatch/trunk/python/install_python.cmake
URL: 
http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/install_python.cmake?rev=1650396&r1=1650395&r2=1650396&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/install_python.cmake (original)
+++ qpid/dispatch/trunk/python/install_python.cmake Thu Jan  8 22:13:07 2015
@@ -22,11 +22,9 @@
 
 include(FindPythonInterp)
 
-set(PYTHON_MANIFEST ${CMAKE_CURRENT_BINARY_DIR}/python/python_manifest.txt)
+set(PYTHON_MANIFEST ${CMAKE_BINARY_DIR}/python_manifest.txt)
+
 
-execute_process(COMMAND ${PYTHON_EXECUTABLE}
-  setup.py -v install --prefix=${CMAKE_INSTALL_PREFIX} 
--record=${PYTHON_MANIFEST}
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/python)
 
 file(READ ${PYTHON_MANIFEST} PYTHON_MANIFEST_FILES)
 list(APPEND CMAKE_INSTALL_MANIFEST_FILES ${PYTHON_MANIFEST_FILES})

Modified: qpid/dispatch/trunk/router/src/main.c
URL: 
http://svn.apache.org/viewvc/qpid/dispatch/trunk/router/src/main.c?rev=1650396&r1=1650395&r2=1650396&view=diff
==============================================================================
--- qpid/dispatch/trunk/router/src/main.c (original)
+++ qpid/dispatch/trunk/router/src/main.c Thu Jan  8 22:13:07 2015
@@ -84,9 +84,9 @@ static void server_signal_handler(void*
 static void check(int fd) {
     if (qd_error_code()) {
         qd_log(log_source, QD_LOG_CRITICAL, "Router start-up failed: %s", 
qd_error_message());
-        write(fd, qd_error_message(), strlen(qd_error_message()));
+        if(write(fd, qd_error_message(), strlen(qd_error_message())));
         char eos = '\0';
-        write(fd, &eos, 1);
+        if(write(fd, &eos, 1));
         close(fd);
         exit(1);
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org