GT-3157 - Move generated files into 'build' directory

14 files changed, 70 insertions, 98 deletions

diff --git a/enhanced-position-service/CMakeLists.txt b/enhanced-position-service/CMakeLists.txt
index f9a6a98..2f47d8b 100644
--- a/enhanced-position-service/CMakeLists.txt
+++ b/enhanced-position-service/CMakeLists.txt
@@ -62,10 +62,9 @@ else()
     message(STATUS "Invalid cmake options!")
 endif()
 
-set(enhanced-position-service_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/api/include")
-
-include_directories(${enhanced-position-service_INCLUDE_DIRS} src test ${gnss-service_INCLUDE_DIRS} ${sensors-service_INCLUDE_DIRS})
+include_directories(src test ${gnss-service_INCLUDE_DIRS} ${sensors-service_INCLUDE_DIRS})
 
+add_subdirectory(api)
 add_subdirectory(src)
 
 message(STATUS "---------------------------------------------------------")
diff --git a/enhanced-position-service/api/CMakeLists.txt b/enhanced-position-service/api/CMakeLists.txt
index 3f2ab24..2ce4a43 100644
--- a/enhanced-position-service/api/CMakeLists.txt
+++ b/enhanced-position-service/api/CMakeLists.txt
@@ -2,11 +2,11 @@
 # @licence app begin@
 # SPDX-License-Identifier: MPL-2.0
 #
-# Component Name: enhanced-position-service
+# Component Name: EnhancedPositionService
 #
-# Author: Philippe Colliot
+# Author: Marco Residori
 #
-# Copyright (C) 2014, PCA Peugeot Citroën
+# Copyright (C) 2015, XS Embedded GmbH
 # 
 # License:
 # This Source Code Form is subject to the terms of the
@@ -15,81 +15,56 @@
 #
 # @licence end@
 ###########################################################################
-project(enhanced-position-service)
-cmake_minimum_required(VERSION 2.8)
 
-message(STATUS "generation of DBus files for enhanced-position-service")
+cmake_minimum_required(VERSION 2.6)
+message(STATUS "Generate stubs and proxies of enhanced-position-service")
 
 find_program(XSLTPROC xsltproc REQUIRED)
 find_program(DBUSXML2CPP dbusxx-xml2cpp REQUIRED)
 
-set(cmake_create_dir cmake -E make_directory)
+set(GEN_DIR "${CMAKE_BINARY_DIR}/api")
 
-set(API_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+execute_process(
+	WORKING_DIRECTORY ${GEN_DIR}
+    COMMAND dbusxx-xml2cpp ${CMAKE_CURRENT_SOURCE_DIR}/../api/genivi-positioning-enhancedposition.xml --adaptor=enhanced-position-adaptor.h
+)
 
 execute_process(
-	WORKING_DIRECTORY ${API_DIR}
-        COMMAND ${cmake_create_dir} include
+	WORKING_DIRECTORY ${GEN_DIR}
+    COMMAND dbusxx-xml2cpp ${CMAKE_CURRENT_SOURCE_DIR}/../api/genivi-positioning-enhancedposition.xml --proxy=enhanced-position-proxy.h
 )
 
-set(TARGET_GENERATED_API_DIR ${API_DIR}/include)
+execute_process(
+	WORKING_DIRECTORY ${GEN_DIR}
+    COMMAND dbusxx-xml2cpp ${CMAKE_CURRENT_SOURCE_DIR}/../api/genivi-positioning-positionfeedback.xml --adaptor=position-feedback-adaptor.h
+)
 
-file (GLOB XML_TO_DBUS_PROXY 
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-positioning-configuration.xml
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-positioning-enhancedposition.xml
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-positioning-positionfeedback.xml
+execute_process(
+	WORKING_DIRECTORY ${GEN_DIR}
+    COMMAND dbusxx-xml2cpp ${CMAKE_CURRENT_SOURCE_DIR}/../api/genivi-positioning-positionfeedback.xml --proxy=position-feedback-proxy.h
 )
-foreach (RAW_FILE ${XML_TO_DBUS_PROXY})
-	get_filename_component(FILE ${RAW_FILE} NAME_WE)
-	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h)
-		execute_process(
-			COMMAND ${DBUSXML2CPP} ${RAW_FILE} --proxy=${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h  
-		)
-	else()
-		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h)
-			execute_process(
-				COMMAND ${DBUSXML2CPP} ${RAW_FILE} --proxy=${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h  
-			)
-		endif()
-	endif()
-endforeach()
-
-file (GLOB XML_TO_DBUS_ADAPTOR
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-positioning-configuration.xml
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-positioning-enhancedposition.xml
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-positioning-positionfeedback.xml
+
+execute_process(
+	WORKING_DIRECTORY ${GEN_DIR}
+    COMMAND dbusxx-xml2cpp ${CMAKE_CURRENT_SOURCE_DIR}/../api/genivi-positioning-configuration.xml --adaptor=configuration-adaptor.h
 )
-foreach (RAW_FILE ${XML_TO_DBUS_ADAPTOR})
-	get_filename_component(FILE ${RAW_FILE} NAME_WE)
-	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h)
-		execute_process(
-			COMMAND ${DBUSXML2CPP} ${RAW_FILE} --adaptor=${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h  
-		)
-	else()
-		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h)
-			execute_process(
-				COMMAND ${DBUSXML2CPP} ${RAW_FILE} --adaptor=${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h  
-			)
-		endif()
-	endif()
-endforeach()
-
-file (GLOB XML_TO_DBUS_CONSTANT
-	${CMAKE_CURRENT_SOURCE_DIR}/genivi-positioning-constants.xml
+
+execute_process(
+	WORKING_DIRECTORY ${GEN_DIR}
+    COMMAND dbusxx-xml2cpp ${CMAKE_CURRENT_SOURCE_DIR}/../api/genivi-positioning-configuration.xml --proxy=configuration-proxy.h
 )
-foreach (RAW_FILE ${XML_TO_DBUS_CONSTANT})
-	get_filename_component(FILE ${RAW_FILE} NAME_WE)
-	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}.h)
-		execute_process(
-			OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
-			COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/enum.xsl ${RAW_FILE}        
-		)
-	else()
-		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}.h)
-			execute_process(
-				OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
-				COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/enum.xsl ${RAW_FILE}        
-			)
-		endif()
-	endif()
-endforeach()
+
+execute_process(
+	WORKING_DIRECTORY ${GEN_DIR}
+    COMMAND xsltproc ${CMAKE_CURRENT_SOURCE_DIR}/../api/enum.xsl ${CMAKE_CURRENT_SOURCE_DIR}/../api/genivi-positioning-constants.xml
+    OUTPUT_FILE positioning-constants.h
+)
+
+
+
+
+
+
+
+
+
diff --git a/enhanced-position-service/src/CMakeLists.txt b/enhanced-position-service/src/CMakeLists.txt
index ddc507a..8f18022 100644
--- a/enhanced-position-service/src/CMakeLists.txt
+++ b/enhanced-position-service/src/CMakeLists.txt
@@ -30,14 +30,15 @@ message(STATUS "WITH_TESTS = ${WITH_TESTS}")
 message(STATUS "WITH_DEBUG = ${WITH_DEBUG}")
 
 find_package(PkgConfig REQUIRED)
-
 pkg_check_modules(DBUS_CPP dbus-c++-1)
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${DBUS_CPP_INCLUDE_DIRS})
-include_directories(${gnss-service_INCLUDE_DIRS})
-include_directories(${sensors-service_INCLUDE_DIRS})
-include_directories(${enhanced-position-service_INCLUDE_DIRS})
+set(GEN_DIR "${CMAKE_BINARY_DIR}/api")
+
+include_directories( 
+    ${GEN_DIR} 
+    ${DBUS_CPP_INCLUDE_DIRS}
+    ${gnss-service_INCLUDE_DIRS}
+    ${sensors-service_INCLUDE_DIRS})
 
 link_directories(
     ${DBUS_CPP_LIBRARY_DIRS}
@@ -48,13 +49,10 @@ add_executable(enhanced-position-service
     main.cpp
     enhanced-position.cpp
     enhanced-position.h
-    ${enhanced-position-service_INCLUDE_DIRS}/genivi-positioning-enhancedposition_adaptor.h
     position-feedback.cpp
     position-feedback.h
-    ${enhanced-position-service_INCLUDE_DIRS}/genivi-positioning-positionfeedback_adaptor.h
     configuration.cpp
     configuration.h
-    ${enhanced-position-service_INCLUDE_DIRS}/genivi-positioning-configuration_adaptor.h
 )
 
 set(LIBRARIES 
@@ -82,3 +80,4 @@ message(STATUS "GNSS_SERVICE_LIBRARIES: " ${gnss-service_LIBRARIES})
 message(STATUS "SENSORS_SERVICE_LIBRARIES: " ${sensors-service_LIBRARIES})
 
 
+
diff --git a/enhanced-position-service/src/configuration.cpp b/enhanced-position-service/src/configuration.cpp
index 29ea664..e047819 100644
--- a/enhanced-position-service/src/configuration.cpp
+++ b/enhanced-position-service/src/configuration.cpp
@@ -17,7 +17,7 @@
 **************************************************************************/
 
 #include "configuration.h"
-#include "genivi-positioning-constants.h"
+#include "positioning-constants.h"
 #include "log.h"
 
 DLT_IMPORT_CONTEXT(gCtx);
diff --git a/enhanced-position-service/src/configuration.h b/enhanced-position-service/src/configuration.h
index 85ac9d1..78c319a 100644
--- a/enhanced-position-service/src/configuration.h
+++ b/enhanced-position-service/src/configuration.h
@@ -19,7 +19,7 @@
 #define ___CONFIGURATION_H
 
 #include <dbus-c++/dbus.h>
-#include "genivi-positioning-configuration_adaptor.h"
+#include "configuration-adaptor.h"
 
 class Configuration
   : public org::genivi::positioning::Configuration_adaptor
diff --git a/enhanced-position-service/src/enhanced-position.cpp b/enhanced-position-service/src/enhanced-position.cpp
index 26e7dea..3258222 100644
--- a/enhanced-position-service/src/enhanced-position.cpp
+++ b/enhanced-position-service/src/enhanced-position.cpp
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "enhanced-position.h"
-#include "genivi-positioning-constants.h"
+#include "positioning-constants.h"
 #include "log.h"
 
 DLT_IMPORT_CONTEXT(gCtx);
diff --git a/enhanced-position-service/src/enhanced-position.h b/enhanced-position-service/src/enhanced-position.h
index 7b35a5d..2561c53 100644
--- a/enhanced-position-service/src/enhanced-position.h
+++ b/enhanced-position-service/src/enhanced-position.h
@@ -20,7 +20,7 @@
 
 #include <dbus-c++/dbus.h>
 
-#include "genivi-positioning-enhancedposition_adaptor.h"
+#include "enhanced-position-adaptor.h"
 #include "gnss-init.h"
 #include "gnss.h"
 
diff --git a/enhanced-position-service/src/position-feedback.h b/enhanced-position-service/src/position-feedback.h
index 37db3ba..59c0490 100644
--- a/enhanced-position-service/src/position-feedback.h
+++ b/enhanced-position-service/src/position-feedback.h
@@ -20,7 +20,7 @@
 #define ___POSITION_FEEDBACK_H
 
 #include <dbus-c++/dbus.h>
-#include "genivi-positioning-positionfeedback_adaptor.h"
+#include "position-feedback-adaptor.h"
 
 class PositionFeedback
   : public org::genivi::positioning::PositionFeedback_adaptor
diff --git a/enhanced-position-service/test/CMakeLists.txt b/enhanced-position-service/test/CMakeLists.txt
index 5da50ce..0ccc280 100644
--- a/enhanced-position-service/test/CMakeLists.txt
+++ b/enhanced-position-service/test/CMakeLists.txt
@@ -27,22 +27,18 @@ message(STATUS "WITH_DLT = ${WITH_DLT}")
 message(STATUS "WITH_DEBUG = ${WITH_DEBUG}")
 
 find_package(PkgConfig REQUIRED)
-
 pkg_check_modules(DBUS_CPP dbus-c++-1)
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+set(GEN_DIR "${CMAKE_BINARY_DIR}/api")
+
+include_directories(${GEN_DIR})  
 include_directories(${DBUS_CPP_INCLUDE_DIRS})
-include_directories(${enhanced-position-service_INCLUDE_DIRS})
 
 link_directories(${DBUS_CPP_LIBRARY_DIRS})
 
 add_executable(enhanced-position-client
-    ${enhanced-position-service_INCLUDE_DIRS}/genivi-positioning-enhancedposition_proxy.h
     enhanced-position-client.h
     enhanced-position-client.cpp
-    ${enhanced-position-service_INCLUDE_DIRS}/genivi-positioning-positionfeedback_proxy.h
-    ${enhanced-position-service_INCLUDE_DIRS}/genivi-positioning-configuration_proxy.h
-    ${enhanced-position-service_INCLUDE_DIRS}/genivi-positioning-constants.h
 )
 
 set(LIBRARIES 
@@ -67,3 +63,4 @@ message(STATUS "DBUS_CPP_LIBRARIES: " ${DBUS_CPP_LIBRARIES})
 
 
 
+
diff --git a/enhanced-position-service/test/compliance-test/CMakeLists.txt b/enhanced-position-service/test/compliance-test/CMakeLists.txt
index 9386074..698faa7 100644
--- a/enhanced-position-service/test/compliance-test/CMakeLists.txt
+++ b/enhanced-position-service/test/compliance-test/CMakeLists.txt
@@ -19,17 +19,17 @@
 # @licence end@
 ###########################################################################
 
+cmake_minimum_required(VERSION 2.6.0)
 message(STATUS "ENHANCED-POSITION-SERVICE-COMPLIANCE-TEST")
 
-INCLUDE(UsePkgConfig)
-
-include_directories("${PROJECT_SOURCE_DIR}/../common")
+message(STATUS "GEN_DIR" ${CMAKE_BINARY_DIR}/api)
 
 find_package(PkgConfig)
 pkg_check_modules(DBUS REQUIRED dbus-1)
 
+include_directories( ${DBUS_INCLUDEDIR} ${DBUS_INCLUDE_DIRS} )
+
 link_directories ( ${DBUS_LIBDIR} ${DBUS_LIBRARY_DIRS}  )
-include_directories ( ${DBUS_INCLUDEDIR} ${DBUS_INCLUDE_DIRS} )
 
 set(SRCS ${CMAKE_SOURCE_DIR}/test/compliance-test/enhanced-position-service-compliance-test.c)
 
diff --git a/enhanced-position-service/test/enhanced-position-client.cpp b/enhanced-position-service/test/enhanced-position-client.cpp
index 2a00ab2..bba79ca 100644
--- a/enhanced-position-service/test/enhanced-position-client.cpp
+++ b/enhanced-position-service/test/enhanced-position-client.cpp
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include "enhanced-position-client.h"
-#include "genivi-positioning-constants.h"
+#include "positioning-constants.h"
 #include "log.h"
 
 using namespace std;
diff --git a/enhanced-position-service/test/enhanced-position-client.h b/enhanced-position-service/test/enhanced-position-client.h
index 02817e1..5bbe0f1 100644
--- a/enhanced-position-service/test/enhanced-position-client.h
+++ b/enhanced-position-service/test/enhanced-position-client.h
@@ -19,7 +19,7 @@
 #define __ENHANCED_POSITION_CLIENT_H
 
 #include <dbus-c++/dbus.h>
-#include "genivi-positioning-enhancedposition_proxy.h"
+#include "enhanced-position-proxy.h"
 
 class EnhancedPositionClient
   : public org::genivi::positioning::EnhancedPosition_proxy,
diff --git a/gnss-service/CMakeLists.txt b/gnss-service/CMakeLists.txt
index ddf8fab..112194a 100644
--- a/gnss-service/CMakeLists.txt
+++ b/gnss-service/CMakeLists.txt
@@ -40,6 +40,8 @@ option(WITH_DEBUG
 SET(CMAKE_INSTALL_RPATH "")
 #SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
 
+message(STATUS "CMAKE_BINARY_DIR =" ${CMAKE_BINARY_DIR})
+
 message(STATUS)
 message(STATUS "---------------------------------------------------------")
 
diff --git a/log-replayer/CMakeLists.txt b/log-replayer/CMakeLists.txt
index 3d21b2b..67621d6 100644
--- a/log-replayer/CMakeLists.txt
+++ b/log-replayer/CMakeLists.txt
@@ -29,7 +29,7 @@ option(WITH_TESTS
     "Compile test applications" OFF)
     
 option(WITH_DEBUG 
-	"Enable the debug messages" OFF)
+    "Enable the debug messages" OFF)
 
 message(STATUS)
 message(STATUS "---------------------------------------------------------")