Mailing-List: contact celix-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: celix-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1352872 - in /incubator/celix/trunk: ./ build/
 deployment_admin/ log_service/ remote_services/ remote_services/discovery/
 remote_services/example_endpoint/ remote_services/example_proxy/
 remote_services/remote_service_admin/
Date: Fri, 22 Jun 2012 13:07:18 -0000
To: celix-commits@incubator.apache.org
From: abroekhuis@apache.org
Message-Id: <20120622130719.0AED523888CD@eris.apache.org>

Author: abroekhuis
Date: Fri Jun 22 13:07:15 2012
New Revision: 1352872

URL: http://svn.apache.org/viewvc?rev=1352872&view=rev
Log:
Fixed building on Linux 64bit systems

Applied patches from Ferry Huberts, fixed some small CMake related issues.

Added:
    incubator/celix/trunk/BUILDING
    incubator/celix/trunk/build/.gitignore
Modified:
    incubator/celix/trunk/.gitignore
    incubator/celix/trunk/deployment_admin/CMakeLists.txt
    incubator/celix/trunk/log_service/CMakeLists.txt
    incubator/celix/trunk/remote_services/CMakeLists.txt
    incubator/celix/trunk/remote_services/discovery/CMakeLists.txt
    incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt
    incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt
    incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt

Modified: incubator/celix/trunk/.gitignore
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/.gitignore?rev=1352872&r1=1352871&r2=1352872&view=diff
==============================================================================
--- incubator/celix/trunk/.gitignore (original)
+++ incubator/celix/trunk/.gitignore Fri Jun 22 13:07:15 2012
@@ -1,3 +1 @@
-/build
-
-hessian/build/
\ No newline at end of file
+hessian/build/

Added: incubator/celix/trunk/BUILDING
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/BUILDING?rev=1352872&view=auto
==============================================================================
--- incubator/celix/trunk/BUILDING (added)
+++ incubator/celix/trunk/BUILDING Fri Jun 22 13:07:15 2012
@@ -0,0 +1,17 @@
+To build:
+
+cd build
+## Run cmake and select the subprojects to be build
+## For commandline use "ccmake ..", for a GUI use "cmake-gui"
+## After running a first configure the subproject can be found by looking for "BUILD_{NAME}" options.
+## After selection a new configure and generation is needed
+##
+## Note: Running a simple "cmake .." will only generate build files for the framework and utils. 
+ccmake .. 
+
+## Make builds all bundles, but deploys nothing
+make
+
+## Deploying takes care of copying bundles to a target for testing
+make deploy
+

Added: incubator/celix/trunk/build/.gitignore
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/build/.gitignore?rev=1352872&view=auto
==============================================================================
--- incubator/celix/trunk/build/.gitignore (added)
+++ incubator/celix/trunk/build/.gitignore Fri Jun 22 13:07:15 2012
@@ -0,0 +1,2 @@
+/*
+!/.gitignore

Modified: incubator/celix/trunk/deployment_admin/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/deployment_admin/CMakeLists.txt?rev=1352872&r1=1352871&r2=1352872&view=diff
==============================================================================
--- incubator/celix/trunk/deployment_admin/CMakeLists.txt (original)
+++ incubator/celix/trunk/deployment_admin/CMakeLists.txt Fri Jun 22 13:07:15 2012
@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-dep_opt(DEPLOYMENT_ADMIN "Option to enable building the Deployment Admin Service bundles" OFF DEPS shell_tui)
+dep_opt(DEPLOYMENT_ADMIN "Option to enable building the Deployment Admin Service bundles" OFF DEPS shell_tui log_writer)
 if (BUILD_DEPLOYMENT_ADMIN)
     add_definitions(-DUSE_FILE32API)
     

Modified: incubator/celix/trunk/log_service/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/log_service/CMakeLists.txt?rev=1352872&r1=1352871&r2=1352872&view=diff
==============================================================================
--- incubator/celix/trunk/log_service/CMakeLists.txt (original)
+++ incubator/celix/trunk/log_service/CMakeLists.txt Fri Jun 22 13:07:15 2012
@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-option(LOG_SERVICE "Option to enable building the Log Service bundles" "OFF")
+dep_opt(LOG_SERVICE "Option to enable building the Log Service bundles" "OFF")
 if(BUILD_LOG_SERVICE)
     bundle(log_service SOURCES
     	private/src/log

Modified: incubator/celix/trunk/remote_services/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/CMakeLists.txt?rev=1352872&r1=1352871&r2=1352872&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/CMakeLists.txt Fri Jun 22 13:07:15 2012
@@ -14,8 +14,21 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-dep_opt(REMOTE_SERVICE_ADMIN "Option to enable building the Remote Service Admin Service bundles" OFF DEPS shell_tui)
+dep_opt(REMOTE_SERVICE_ADMIN "Option to enable building the Remote Service Admin Service bundles" OFF DEPS shell_tui log_writer)
 if (BUILD_REMOTE_SERVICE_ADMIN)
+
+    # Add -fPIC for x86_64 Unix platforms; this lib will be linked to a shared lib
+    if(UNIX AND NOT WIN32)
+      find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
+      if(CMAKE_UNAME)
+        exec_program(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR)
+        set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR} CACHE INTERNAL "processor type (i386 and x86_64)")
+         if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+          add_definitions(-fPIC)
+        endif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+      endif(CMAKE_UNAME)
+    endif(UNIX AND NOT WIN32)
+
     add_subdirectory(utils)
     
     add_subdirectory(topology_manager)

Modified: incubator/celix/trunk/remote_services/discovery/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/discovery/CMakeLists.txt?rev=1352872&r1=1352871&r2=1352872&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/discovery/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/discovery/CMakeLists.txt Fri Jun 22 13:07:15 2012
@@ -27,5 +27,5 @@ bundle(discovery SOURCES 
 	private/src/discovery 
 	private/src/discovery_activator
 )
-target_link_libraries(discovery framework ${APRUTIL_LIBRARY} slp.a)
+target_link_libraries(discovery framework ${APRUTIL_LIBRARY} slp)
 

Modified: incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt?rev=1352872&r1=1352871&r2=1352872&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/example_endpoint/CMakeLists.txt Fri Jun 22 13:07:15 2012
@@ -26,4 +26,4 @@ bundle(example_endpoint SOURCES 
 	private/src/example_endpoint_activator
 	private/src/example_endpoint_impl.c
 )
-target_link_libraries(example_endpoint framework jansson.a)
+target_link_libraries(example_endpoint framework jansson)

Modified: incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt?rev=1352872&r1=1352871&r2=1352872&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/example_proxy/CMakeLists.txt Fri Jun 22 13:07:15 2012
@@ -28,4 +28,4 @@ bundle(example_proxy SOURCES 
 	private/src/example_proxy_activator
 	private/src/example_proxy_impl.c
 )
-target_link_libraries(example_proxy framework jansson.a curl.a)
+target_link_libraries(example_proxy framework jansson curl)

Modified: incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt?rev=1352872&r1=1352871&r2=1352872&view=diff
==============================================================================
--- incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt (original)
+++ incubator/celix/trunk/remote_services/remote_service_admin/CMakeLists.txt Fri Jun 22 13:07:15 2012
@@ -30,4 +30,4 @@ bundle(remote_service_admin SOURCES 
 	private/src/remote_service_admin_activator
 	private/src/mongoose.c  
 )
-target_link_libraries(remote_service_admin framework ${APRUTIL_LIBRARY} jansson.a)
+target_link_libraries(remote_service_admin framework ${APRUTIL_LIBRARY} jansson)