From 16891012aadef1839f460ddae51d7ee71c2d6ff0 Mon Sep 17 00:00:00 2001 From: Alexander Kutsan Date: Fri, 18 Nov 2016 18:12:45 +0200 Subject: Fix usages of policy in code --- CMakeLists.txt | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index deddd75cd1..c34c86e646 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,12 +48,16 @@ option(ENABLE_GCOV "gcov code coverage feature" OFF) option(ENABLE_SANITIZE "Sanitize tool" OFF) option(ENABLE_SECURITY "Security Ford protocol protection" ON) option(ENABLE_HMI_PTU_DECRYPTION "Policy table update parsed by hmi" ON) -option(ENABLE_EXTENDED_POLICY "Turns extended flow which requires embedded system interaction" ON) option(USE_COTIRE "Use Cotire to speed up build (currently only for commands tests)" ON) option(USE_GOLD_LD "Use gold linker intead of GNU linker" ON) option(USE_CCACHE "Turn on ccache usage" ON) option(USE_DISTCC "Turn on distributed build_usage" ON) +set (EXTENDED_POLICY "${EXTENDED_POLICY}" CACHE STRING "Policy mode (PROPRIETARY, HTTP or EXTENDED_PROPRIETARY)") +if(EXTENDED_POLICY STREQUAL "") + set(EXTENDED_POLICY "PROPRIETARY") +endif() + set(OS_TYPE_OPTION "$ENV{OS_TYPE}") set(DEBUG_OPTION "$ENV{DEBUG}") set(HMI_TYPE_OPTION "$ENV{HMI_TYPE}") @@ -277,8 +281,22 @@ if (TELEMETRY_MONITOR) add_definitions(-DTELEMETRY_MONITOR) endif() -if (ENABLE_EXTENDED_POLICY) - add_definitions(-DEXTENDED_POLICY) +if (${EXTENDED_POLICY} STREQUAL "EXTENDED_PROPRIETARY") + add_definitions(-DEXTENDED_PROPRIETARY) + set(POLICY_PATH ${COMPONENTS_DIR}/policy/policy_premium/) + set(POLICY_GLOBAL_INCLUDE_PATH ${COMPONENTS_DIR}/include/policy/policy_premium/) + set(POLICY_MOCK_INCLUDE_PATH ${COMPONENTS_DIR}/include/test/policy/policy_premium/) + message(STATUS "DEFINED EXTENDED_PROPRIETARY") +else() + if (${EXTENDED_POLICY} STREQUAL "PROPRIETARY") + add_definitions(-DEXTENDED_POLICY) + message(STATUS "DEFINED PROPRIETARY") + else() + message(STATUS "DEFAULT HTTP") + endif() + set(POLICY_PATH ${COMPONENTS_DIR}/policy/policy_regular/) + set(POLICY_GLOBAL_INCLUDE_PATH ${COMPONENTS_DIR}/include/policy/policy_regular/) + set(POLICY_MOCK_INCLUDE_PATH ${COMPONENTS_DIR}/include/test/policy/policy_regular/) endif() # TODO(AK): check current OS here @@ -428,10 +446,13 @@ endif() include_directories( ${COMPONENTS_DIR}/include ${COMPONENTS_DIR}/protocol/include +) + if (BUILD_TESTS) - ${COMPONENTS_DIR}/include/test + include_directories( + ${COMPONENTS_DIR}/include/test + ) endif () -) # --- 3rd party libs INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/src/3rd_party/set_3rd_party_paths.cmake) -- cgit v1.2.1 From b55ab1586c2b88dff306d1f07dadb4b861a53e97 Mon Sep 17 00:00:00 2001 From: Andrey Oleynik Date: Thu, 24 Nov 2016 17:59:40 +0200 Subject: Changes EXTENDED_POLICY to EXTERNAL_POLICY Also renames folder from 'policy_premium' to 'policy_external' Closes-bug: APPLINK-30334 --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index c34c86e646..0f655332c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ option(USE_GOLD_LD "Use gold linker intead of GNU linker" ON) option(USE_CCACHE "Turn on ccache usage" ON) option(USE_DISTCC "Turn on distributed build_usage" ON) -set (EXTENDED_POLICY "${EXTENDED_POLICY}" CACHE STRING "Policy mode (PROPRIETARY, HTTP or EXTENDED_PROPRIETARY)") +set (EXTENDED_POLICY "${EXTENDED_POLICY}" CACHE STRING "Policy mode (PROPRIETARY, HTTP or EXTERNAL_PROPRIETARY)") if(EXTENDED_POLICY STREQUAL "") set(EXTENDED_POLICY "PROPRIETARY") endif() @@ -281,12 +281,12 @@ if (TELEMETRY_MONITOR) add_definitions(-DTELEMETRY_MONITOR) endif() -if (${EXTENDED_POLICY} STREQUAL "EXTENDED_PROPRIETARY") - add_definitions(-DEXTENDED_PROPRIETARY) +if (${EXTENDED_POLICY} STREQUAL "EXTERNAL_PROPRIETARY") + add_definitions(-DEXTERNAL_PROPRIETARY) set(POLICY_PATH ${COMPONENTS_DIR}/policy/policy_premium/) set(POLICY_GLOBAL_INCLUDE_PATH ${COMPONENTS_DIR}/include/policy/policy_premium/) set(POLICY_MOCK_INCLUDE_PATH ${COMPONENTS_DIR}/include/test/policy/policy_premium/) - message(STATUS "DEFINED EXTENDED_PROPRIETARY") + message(STATUS "DEFINED EXTERNAL_PROPRIETARY") else() if (${EXTENDED_POLICY} STREQUAL "PROPRIETARY") add_definitions(-DEXTENDED_POLICY) -- cgit v1.2.1 From d9ad3d3a7dd390732902c5d1f338658e0d4265bd Mon Sep 17 00:00:00 2001 From: Andrey Oleynik Date: Thu, 24 Nov 2016 18:51:18 +0200 Subject: Renames policy_premium folder to policy_external --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f655332c4..4abd83e302 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -283,9 +283,9 @@ endif() if (${EXTENDED_POLICY} STREQUAL "EXTERNAL_PROPRIETARY") add_definitions(-DEXTERNAL_PROPRIETARY) - set(POLICY_PATH ${COMPONENTS_DIR}/policy/policy_premium/) - set(POLICY_GLOBAL_INCLUDE_PATH ${COMPONENTS_DIR}/include/policy/policy_premium/) - set(POLICY_MOCK_INCLUDE_PATH ${COMPONENTS_DIR}/include/test/policy/policy_premium/) + set(POLICY_PATH ${COMPONENTS_DIR}/policy/policy_external/) + set(POLICY_GLOBAL_INCLUDE_PATH ${COMPONENTS_DIR}/include/policy/policy_external/) + set(POLICY_MOCK_INCLUDE_PATH ${COMPONENTS_DIR}/include/test/policy/policy_external/) message(STATUS "DEFINED EXTERNAL_PROPRIETARY") else() if (${EXTENDED_POLICY} STREQUAL "PROPRIETARY") -- cgit v1.2.1 From 6d4acf3557facb90d6c52584a5741f5502cf9d41 Mon Sep 17 00:00:00 2001 From: Andrey Oleynik Date: Thu, 24 Nov 2016 23:19:45 +0200 Subject: Adds combobox for CMake UI, fixes typo --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 4abd83e302..fe81b838dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,8 @@ option(USE_GOLD_LD "Use gold linker intead of GNU linker" ON) option(USE_CCACHE "Turn on ccache usage" ON) option(USE_DISTCC "Turn on distributed build_usage" ON) -set (EXTENDED_POLICY "${EXTENDED_POLICY}" CACHE STRING "Policy mode (PROPRIETARY, HTTP or EXTERNAL_PROPRIETARY)") +set (EXTENDED_POLICY "PROPRIETARY" CACHE STRING "Policy mode (PROPRIETARY, HTTP or EXTERNAL_PROPRIETARY)") +set_property(CACHE EXTENDED_POLICY PROPERTY STRINGS PROPRIETARY HTTP EXTERNAL_PROPRIETARY) if(EXTENDED_POLICY STREQUAL "") set(EXTENDED_POLICY "PROPRIETARY") endif() -- cgit v1.2.1 From c42f37f64fc2ad581d2621faa32799599c7a4181 Mon Sep 17 00:00:00 2001 From: Alexander Kutsan Date: Tue, 29 Nov 2016 09:32:46 +0000 Subject: Change message of HTTP policies --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index fe81b838dc..b6e778a075 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -287,13 +287,13 @@ if (${EXTENDED_POLICY} STREQUAL "EXTERNAL_PROPRIETARY") set(POLICY_PATH ${COMPONENTS_DIR}/policy/policy_external/) set(POLICY_GLOBAL_INCLUDE_PATH ${COMPONENTS_DIR}/include/policy/policy_external/) set(POLICY_MOCK_INCLUDE_PATH ${COMPONENTS_DIR}/include/test/policy/policy_external/) - message(STATUS "DEFINED EXTERNAL_PROPRIETARY") + message(STATUS "DEFINED EXTERNAL_PROPRIETARY POLICY") else() if (${EXTENDED_POLICY} STREQUAL "PROPRIETARY") add_definitions(-DEXTENDED_POLICY) - message(STATUS "DEFINED PROPRIETARY") + message(STATUS "DEFINED PROPRIETARY POLICY") else() - message(STATUS "DEFAULT HTTP") + message(STATUS "DEFINED HTTP POLICY") endif() set(POLICY_PATH ${COMPONENTS_DIR}/policy/policy_regular/) set(POLICY_GLOBAL_INCLUDE_PATH ${COMPONENTS_DIR}/include/policy/policy_regular/) -- cgit v1.2.1 From 751fee5c21355846aaf8a437b3516cb933b69f2e Mon Sep 17 00:00:00 2001 From: Andrey Oleynik Date: Tue, 13 Dec 2016 17:44:31 +0200 Subject: Renames EXTENDED_POLICY definition to PROPRIETARY_MODE to avoid confusion Currently there are three modes HTTP, PROPRIETARY, EXTERNAL_PROPRIETARY for option named like EXTENDED_POLICY, so in order to avoid confusion with option name definition has been renamed. Relates-to: APPLINK-25462 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index b6e778a075..429f793d01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -290,7 +290,7 @@ if (${EXTENDED_POLICY} STREQUAL "EXTERNAL_PROPRIETARY") message(STATUS "DEFINED EXTERNAL_PROPRIETARY POLICY") else() if (${EXTENDED_POLICY} STREQUAL "PROPRIETARY") - add_definitions(-DEXTENDED_POLICY) + add_definitions(-DPROPRIETARY_MODE) message(STATUS "DEFINED PROPRIETARY POLICY") else() message(STATUS "DEFINED HTTP POLICY") -- cgit v1.2.1 From 7f2e84bda1d5ff140827a5e8d224e9dc753c5238 Mon Sep 17 00:00:00 2001 From: Andrey Oleynik Date: Tue, 13 Dec 2016 17:49:50 +0200 Subject: Aligned naming of EXTENDED_POLICY modes Relates-to: APPLINK-25462 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 429f793d01..8740c77330 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -283,7 +283,7 @@ if (TELEMETRY_MONITOR) endif() if (${EXTENDED_POLICY} STREQUAL "EXTERNAL_PROPRIETARY") - add_definitions(-DEXTERNAL_PROPRIETARY) + add_definitions(-DEXTERNAL_PROPRIETARY_MODE) set(POLICY_PATH ${COMPONENTS_DIR}/policy/policy_external/) set(POLICY_GLOBAL_INCLUDE_PATH ${COMPONENTS_DIR}/include/policy/policy_external/) set(POLICY_MOCK_INCLUDE_PATH ${COMPONENTS_DIR}/include/test/policy/policy_external/) -- cgit v1.2.1