svn commit: r1339083 - in /incubator/celix/trunk: CMakeLists.txt cmake/Test.cmake framework/private/src/framework.c

[abroekhuis]

Author: abroekhuis
Date: Wed May 16 09:34:57 2012
New Revision: 1339083

URL: http://svn.apache.org/viewvc?rev=1339083&view=rev
Log:
Added hessian to toplevel cmake file. Updated test output generation.

Modified:
    incubator/celix/trunk/CMakeLists.txt
    incubator/celix/trunk/cmake/Test.cmake
    incubator/celix/trunk/framework/private/src/framework.c

Modified: incubator/celix/trunk/CMakeLists.txt
URL: 
http://svn.apache.org/viewvc/incubator/celix/trunk/CMakeLists.txt?rev=1339083&r1=1339082&r2=1339083&view=diff
==============================================================================
--- incubator/celix/trunk/CMakeLists.txt (original)
+++ incubator/celix/trunk/CMakeLists.txt Wed May 16 09:34:57 2012
@@ -63,3 +63,5 @@ add_subdirectory(deployment_admin)
 
 include(target.cmake)
 #enable_testing()
+
+add_subdirectory(hessian)

Modified: incubator/celix/trunk/cmake/Test.cmake
URL: 
http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/Test.cmake?rev=1339083&r1=1339082&r2=1339083&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/Test.cmake (original)
+++ incubator/celix/trunk/cmake/Test.cmake Wed May 16 09:34:57 2012
@@ -29,7 +29,8 @@ MACRO(run_test)
        add_custom_target(${__testTarget}
                ${EXEC} ${EXEC} 
                COMMAND xsltproc --path ${CUNIT_SHARE_DIR} 
${CUNIT_SHARE_DIR}/CUnit-Run.xsl 
${PROJECT_BINARY_DIR}/test_results/${EXEC}-Results.xml > ${EXEC}-Results.html
-               COMMAND xsltproc --path ${CUNIT_SHARE_DIR} 
${CUNIT_SHARE_DIR}/CUnit-List.xsl 
${PROJECT_BINARY_DIR}/test_results/${EXEC}-Listing.xml > ${EXEC}-Listing.html 
+               COMMAND xsltproc --path ${CUNIT_SHARE_DIR} 
${CUNIT_SHARE_DIR}/CUnit-List.xsl 
${PROJECT_BINARY_DIR}/test_results/${EXEC}-Listing.xml > ${EXEC}-Listing.html
+               
                WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test_results
        )
        ADD_DEPENDENCIES(test ${__testTarget})

Modified: incubator/celix/trunk/framework/private/src/framework.c
URL: 
http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/framework.c?rev=1339083&r1=1339082&r2=1339083&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/framework.c (original)
+++ incubator/celix/trunk/framework/private/src/framework.c Wed May 16 09:34:57 
2012
@@ -1797,7 +1797,6 @@ celix_status_t bundleActivator_stop(void
 
                printf("FRAMEWORK: Start shutdownthread\n");
            if (apr_thread_create(&shutdownThread, NULL, framework_shutdown, 
framework, framework->mp) == APR_SUCCESS) {
-            //int err = pthread_create(&shutdownThread, NULL, 
framework_shutdown, framework);
             apr_thread_detach(shutdownThread);
            } else {
             celix_log("Could not create shutdown thread, normal exit not 
possible.");