You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by ab...@apache.org on 2011/08/30 14:05:41 UTC
svn commit: r1163179 - in /incubator/celix/trunk: ./ cmake/ framework/
framework/private/include/ utils/
Author: abroekhuis
Date: Tue Aug 30 12:05:41 2011
New Revision: 1163179
URL: http://svn.apache.org/viewvc?rev=1163179&view=rev
Log:
Updated install scripts
Added:
incubator/celix/trunk/cmake/CPackConfigFW.in
Modified:
incubator/celix/trunk/CMakeLists.txt
incubator/celix/trunk/framework/CMakeLists.txt
incubator/celix/trunk/framework/private/include/celixbool.h
incubator/celix/trunk/framework/private/include/module.h
incubator/celix/trunk/framework/private/include/service_reference.h
incubator/celix/trunk/framework/private/include/service_registration.h
incubator/celix/trunk/utils/CMakeLists.txt
Modified: incubator/celix/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/CMakeLists.txt?rev=1163179&r1=1163178&r2=1163179&view=diff
==============================================================================
--- incubator/celix/trunk/CMakeLists.txt (original)
+++ incubator/celix/trunk/CMakeLists.txt Tue Aug 30 12:05:41 2011
@@ -18,18 +18,26 @@
cmake_minimum_required (VERSION 2.6)
project (Celix C)
+#SET(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
SET(CMAKE_BUILD_TYPE "Debug")
-SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -std=gnu99 ${CMAKE_C_FLAGS}")
+SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -std=gnu99 ${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs")
+SET(LDFLAGS "-fprofile-arcs -ftest-coverage")
SET(CMAKE_INSTALL_COMPONENT "framework")
+GET_FILENAME_COMPONENT(__cmake_path ${CMAKE_COMMAND} PATH)
+FIND_PROGRAM(CPACK_COMMAND cpack ${__cmake_path})
+MESSAGE(STATUS "Found CPack at: ${CPACK_COMMAND}")
+IF(NOT CPACK_COMMAND)
+ MESSAGE(FATAL_ERROR "Need CPack!")
+ENDIF(NOT CPACK_COMMAND)
+
+SET(INSTALL_FW "${PROJECT_BINARY_DIR};Celix Framework;framework;/")
+CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/CPackConfigFW.in CPackConfigFW.cmake @ONLY)
ADD_CUSTOM_TARGET(install-fw
- ${CMAKE_COMMAND}
- -D "CMAKE_INSTALL_COMPONENT=framework"
- -D "CMAKE_INSTALL_PREFIX=test"
- -P "cmake_install.cmake"
+ ${CPACK_COMMAND} --config "CPackConfigFW.cmake"
)
include(cmake/Includes.cmake)
Added: incubator/celix/trunk/cmake/CPackConfigFW.in
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/CPackConfigFW.in?rev=1163179&view=auto
==============================================================================
--- incubator/celix/trunk/cmake/CPackConfigFW.in (added)
+++ incubator/celix/trunk/cmake/CPackConfigFW.in Tue Aug 30 12:05:41 2011
@@ -0,0 +1,12 @@
+SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
+SET(CPACK_GENERATOR "ZIP")
+SET(CPACK_INSTALL_CMAKE_PROJECTS "@INSTALL_FW@")
+set(CPACK_PACKAGE_NAME "Framework")
+SET(CPACK_PACKAGE_DESCRIPTION "Package description")
+SET(CPACK_PACKAGE_FILE_NAME "framework")
+set(CPACK_PACKAGE_VENDOR "incubator.apache.org/celix")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Framework")
+set(CPACK_PACKAGE_VERSION "0.0.1")
+set(CPACK_PACKAGE_VERSION_MAJOR "0")
+set(CPACK_PACKAGE_VERSION_MINOR "0")
+set(CPACK_PACKAGE_VERSION_PATCH "1")
\ No newline at end of file
Modified: incubator/celix/trunk/framework/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/CMakeLists.txt?rev=1163179&r1=1163178&r2=1163179&view=diff
==============================================================================
--- incubator/celix/trunk/framework/CMakeLists.txt (original)
+++ incubator/celix/trunk/framework/CMakeLists.txt Tue Aug 30 12:05:41 2011
@@ -43,3 +43,5 @@ add_library(framework SHARED ${SRC})
target_link_libraries(framework utils ${ZLIB_LIBRARY} ${APR_LIBRARY} ${CURL_LIBRARY})
install(TARGETS framework DESTINATION lib COMPONENT framework)
+FILE(GLOB files "private/include/*.h")
+INSTALL(FILES ${files} DESTINATION include COMPONENT framework)
Modified: incubator/celix/trunk/framework/private/include/celixbool.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/celixbool.h?rev=1163179&r1=1163178&r2=1163179&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/celixbool.h (original)
+++ incubator/celix/trunk/framework/private/include/celixbool.h Tue Aug 30 12:05:41 2011
@@ -15,7 +15,9 @@
# endif
#endif
-#ifndef C99
+
+#if __STDC_VERSION__ < 199901L && __GNUC__ < 3
+// #ifndef C99
typedef int _Bool;
Modified: incubator/celix/trunk/framework/private/include/module.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/module.h?rev=1163179&r1=1163178&r2=1163179&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/module.h (original)
+++ incubator/celix/trunk/framework/private/include/module.h Tue Aug 30 12:05:41 2011
@@ -26,8 +26,7 @@
#ifndef MODULE_H_
#define MODULE_H_
-#include <stdbool.h>
-
+#include "celixbool.h"
#include "linkedlist.h"
#include "headers.h"
#include "manifest.h"
Modified: incubator/celix/trunk/framework/private/include/service_reference.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/service_reference.h?rev=1163179&r1=1163178&r2=1163179&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/service_reference.h (original)
+++ incubator/celix/trunk/framework/private/include/service_reference.h Tue Aug 30 12:05:41 2011
@@ -26,8 +26,7 @@
#ifndef SERVICE_REFERENCE_H_
#define SERVICE_REFERENCE_H_
-#include <stdbool.h>
-
+#include "celixbool.h"
#include "headers.h"
bool serviceReference_isAssignableTo(SERVICE_REFERENCE reference, BUNDLE requester, char * serviceName);
Modified: incubator/celix/trunk/framework/private/include/service_registration.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/service_registration.h?rev=1163179&r1=1163178&r2=1163179&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/service_registration.h (original)
+++ incubator/celix/trunk/framework/private/include/service_registration.h Tue Aug 30 12:05:41 2011
@@ -26,7 +26,7 @@
#ifndef SERVICE_REGISTRATION_H_
#define SERVICE_REGISTRATION_H_
-#include <stdbool.h>
+#include "celixbool.h"
#include "headers.h"
#include "service_registry.h"
Modified: incubator/celix/trunk/utils/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/utils/CMakeLists.txt?rev=1163179&r1=1163178&r2=1163179&view=diff
==============================================================================
--- incubator/celix/trunk/utils/CMakeLists.txt (original)
+++ incubator/celix/trunk/utils/CMakeLists.txt Tue Aug 30 12:05:41 2011
@@ -28,6 +28,8 @@ ENDIF(UNIX)
target_link_libraries(utils ${APR_LIBRARY})
install(TARGETS utils DESTINATION lib COMPONENT framework)
+FILE(GLOB files "public/include/*.h")
+INSTALL(FILES ${files} DESTINATION include COMPONENT framework)
include_directories(${CUNIT_INCLUDE_DIRS})
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")