incubator-celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1102851 - in /incubator/celix/trunk: ./ framework/ framework/private/include/ framework/private/src/ hello_world/ mongoose/
Date Fri, 13 May 2011 18:23:12 GMT
Author: abroekhuis
Date: Fri May 13 18:23:11 2011
New Revision: 1102851

URL: http://svn.apache.org/viewvc?rev=1102851&view=rev
Log:
Updated APR include path

Modified:
    incubator/celix/trunk/.cproject
    incubator/celix/trunk/framework/CMakeLists.txt
    incubator/celix/trunk/framework/private/include/bundle.h
    incubator/celix/trunk/framework/private/include/bundle_archive.h
    incubator/celix/trunk/framework/private/include/headers.h
    incubator/celix/trunk/framework/private/src/bundle_archive.c
    incubator/celix/trunk/framework/private/src/bundle_cache.c
    incubator/celix/trunk/framework/private/src/framework.c
    incubator/celix/trunk/hello_world/CMakeLists.txt
    incubator/celix/trunk/hello_world/activator.c
    incubator/celix/trunk/mongoose/CMakeLists.txt
    incubator/celix/trunk/mongoose/activator.c

Modified: incubator/celix/trunk/.cproject
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/.cproject?rev=1102851&r1=1102850&r2=1102851&view=diff
==============================================================================
--- incubator/celix/trunk/.cproject (original)
+++ incubator/celix/trunk/.cproject Fri May 13 18:23:11 2011
@@ -36,6 +36,7 @@
 							<tool id="cdt.managedbuild.tool.gnu.c.compiler.macosx.base.387685994" name="GCC
C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.base">
 								<option id="gnu.c.compiler.option.include.paths.544783026" name="Include paths
(-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="/opt/local/include"/>
+									<listOptionValue builtIn="false" value="/usr/include/apr-1"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1627566234" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>

Modified: incubator/celix/trunk/framework/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/CMakeLists.txt?rev=1102851&r1=1102850&r2=1102851&view=diff
==============================================================================
--- incubator/celix/trunk/framework/CMakeLists.txt (original)
+++ incubator/celix/trunk/framework/CMakeLists.txt Fri May 13 18:23:11 2011
@@ -33,6 +33,7 @@ ENDIF(APR_FOUND)
 
 add_definitions(-DUSE_FILE32API)
 aux_source_directory("private/src" SRC)
+include_directories(${APR_INCLUDE_DIR})
 include_directories("private/include")
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 add_library(framework SHARED ${SRC})

Modified: incubator/celix/trunk/framework/private/include/bundle.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/bundle.h?rev=1102851&r1=1102850&r2=1102851&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/bundle.h (original)
+++ incubator/celix/trunk/framework/private/include/bundle.h Fri May 13 18:23:11 2011
@@ -26,7 +26,7 @@
 #ifndef BUNDLE_H_
 #define BUNDLE_H_
 
-#include <apr-1/apr_general.h>
+#include <apr_general.h>
 
 #include "headers.h"
 #include "celix_errno.h"

Modified: incubator/celix/trunk/framework/private/include/bundle_archive.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/bundle_archive.h?rev=1102851&r1=1102850&r2=1102851&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/bundle_archive.h (original)
+++ incubator/celix/trunk/framework/private/include/bundle_archive.h Fri May 13 18:23:11 2011
@@ -26,7 +26,7 @@
 #ifndef BUNDLE_ARCHIVE_H_
 #define BUNDLE_ARCHIVE_H_
 
-#include <apr-1/apr_general.h>
+#include <apr_general.h>
 
 #include "bundle_revision.h"
 #include "bundle_state.h"

Modified: incubator/celix/trunk/framework/private/include/headers.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/headers.h?rev=1102851&r1=1102850&r2=1102851&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/headers.h (original)
+++ incubator/celix/trunk/framework/private/include/headers.h Fri May 13 18:23:11 2011
@@ -41,7 +41,7 @@
 #include "bundle_state.h"
 #include "bundle_cache.h"
 
-#include "apr-1/apr_general.h"
+#include "apr_general.h"
 
 #if defined(__GNUC__)
 #define ATTRIBUTE_UNUSED __attribute__ ((__unused__))

Modified: incubator/celix/trunk/framework/private/src/bundle_archive.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/bundle_archive.c?rev=1102851&r1=1102850&r2=1102851&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/bundle_archive.c (original)
+++ incubator/celix/trunk/framework/private/src/bundle_archive.c Fri May 13 18:23:11 2011
@@ -34,7 +34,7 @@
 #include "headers.h"
 #include "linked_list_iterator.h"
 
-#include <apr-1/apr_file_io.h>
+#include <apr_file_io.h>
 
 struct bundleArchive {
 	long id;

Modified: incubator/celix/trunk/framework/private/src/bundle_cache.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/bundle_cache.c?rev=1102851&r1=1102850&r2=1102851&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/bundle_cache.c (original)
+++ incubator/celix/trunk/framework/private/src/bundle_cache.c Fri May 13 18:23:11 2011
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 //#include <sys/stat.h>
 
-#include <apr-1/apr_file_io.h>
+#include <apr_file_io.h>
 
 #include "bundle_cache.h"
 #include "bundle_archive.h"

Modified: incubator/celix/trunk/framework/private/src/framework.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/framework.c?rev=1102851&r1=1102850&r2=1102851&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/framework.c (original)
+++ incubator/celix/trunk/framework/private/src/framework.c Fri May 13 18:23:11 2011
@@ -31,7 +31,7 @@
 #include <stdbool.h>
 #include <pthread.h>
 #include <math.h>
-#include <apr-1/apr_file_io.h>
+#include <apr_file_io.h>
 
 #include "framework.h"
 #include "filter.h"

Modified: incubator/celix/trunk/hello_world/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/hello_world/CMakeLists.txt?rev=1102851&r1=1102850&r2=1102851&view=diff
==============================================================================
--- incubator/celix/trunk/hello_world/CMakeLists.txt (original)
+++ incubator/celix/trunk/hello_world/CMakeLists.txt Fri May 13 18:23:11 2011
@@ -15,6 +15,16 @@
 # specific language governing permissions and limitations
 # under the License.
 
+include(FindAPR)
+
+IF(APR_FOUND)
+	MESSAGE(STATUS "Looking for APR - found")
+ELSE(APR_FOUND)
+	MESSAGE(FATAL_ERROR "Looking for APR - not found")
+ENDIF(APR_FOUND)
+
+include_directories(${APR_INCLUDE_DIR})
+
 add_library(hello_world SHARED activator)
 include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
 target_link_libraries(hello_world framework)

Modified: incubator/celix/trunk/hello_world/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/hello_world/activator.c?rev=1102851&r1=1102850&r2=1102851&view=diff
==============================================================================
--- incubator/celix/trunk/hello_world/activator.c (original)
+++ incubator/celix/trunk/hello_world/activator.c Fri May 13 18:23:11 2011
@@ -24,7 +24,7 @@
  */
 #include <stdlib.h>
 #include <stdio.h>
-#include <apr-1/apr_general.h>
+#include <apr_general.h>
 
 #include "bundle_activator.h"
 #include "bundle_context.h"

Modified: incubator/celix/trunk/mongoose/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/mongoose/CMakeLists.txt?rev=1102851&r1=1102850&r2=1102851&view=diff
==============================================================================
--- incubator/celix/trunk/mongoose/CMakeLists.txt (original)
+++ incubator/celix/trunk/mongoose/CMakeLists.txt Fri May 13 18:23:11 2011
@@ -15,6 +15,16 @@
 # specific language governing permissions and limitations
 # under the License.
 
+include(FindAPR)
+
+IF(APR_FOUND)
+	MESSAGE(STATUS "Looking for APR - found")
+ELSE(APR_FOUND)
+	MESSAGE(FATAL_ERROR "Looking for APR - not found")
+ENDIF(APR_FOUND)
+
+include_directories(${APR_INCLUDE_DIR})
+
 add_library(mongoose STATIC mongoose.c)
 
 add_library(celix.mongoose SHARED activator)

Modified: incubator/celix/trunk/mongoose/activator.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/mongoose/activator.c?rev=1102851&r1=1102850&r2=1102851&view=diff
==============================================================================
--- incubator/celix/trunk/mongoose/activator.c (original)
+++ incubator/celix/trunk/mongoose/activator.c Fri May 13 18:23:11 2011
@@ -24,7 +24,7 @@
  */
 #include <stdlib.h>
 #include <stdio.h>
-#include <apr-1/apr_general.h>
+#include <apr_general.h>
 
 #include "bundle_activator.h"
 #include "bundle_context.h"



Mime
View raw message