cleanup: include/: move cmsis_rtos_v1/cmsis_os.h to compat/cmsis_rtos…

…/cmsis_os.h move cmsis_rtos_v1/cmsis_os.h to compat/cmsis_rtos/cmsis_os.h and create a shim for backward-compatibility. No functional changes to the headers. A warning in the shim can be controlled with CONFIG_COMPAT_INCLUDES. Related to zephyrproject-rtos#16539 Signed-off-by: Anas Nashif <anas.nashif@intel.com>
nashif · Jul 4, 2019 · bc9975a · bc9975a
1 parent 528a2de
commit bc9975a
Show file tree

Hide file tree

Showing 7 changed files with 731 additions and 716 deletions.
diff --git a/doc/zephyr.doxyfile.in b/doc/zephyr.doxyfile.in
@@ -797,7 +797,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = @ZEPHYR_BASE@/include/cmsis_rtos_v1/cmsis_os.h \
+EXCLUDE                = @ZEPHYR_BASE@/include/compat/cmsis_rtos//cmsis_os.h \
                          @ZEPHYR_BASE@/include/cmsis_rtos_v2/cmsis_os2.h \
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or

diff --git a/include/cmsis_rtos_v1/cmsis_os.h b/include/cmsis_rtos_v1/cmsis_os.h
diff --git a/include/compat/cmsis_rtos/cmsis_os.h b/include/compat/cmsis_rtos/cmsis_os.h
diff --git a/lib/cmsis_rtos_v1/CMakeLists.txt b/lib/cmsis_rtos_v1/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 add_library(CMSIS INTERFACE)
 
-target_include_directories(CMSIS INTERFACE ${PROJECT_SOURCE_DIR}/include/cmsis_rtos_v1)
+target_include_directories(CMSIS INTERFACE ${PROJECT_SOURCE_DIR}/include/compat/cmsis_rtos/)
 
 zephyr_library()
 zephyr_library_sources_ifdef(

diff --git a/samples/portability/cmsis_rtos_v1/philosophers/CMakeLists.txt b/samples/portability/cmsis_rtos_v1/philosophers/CMakeLists.txt
@@ -4,5 +4,5 @@ cmake_minimum_required(VERSION 3.13.1)
 include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
 project(philosophers_cmsis_rtos_v1)
 
-target_include_directories(app PRIVATE $ENV{ZEPHYR_BASE}/include/cmsis_rtos_v1)
+target_include_directories(app PRIVATE $ENV{ZEPHYR_BASE}/include/compat/cmsis_rtos/)
 target_sources(app PRIVATE src/main.c)
diff --git a/samples/portability/cmsis_rtos_v1/timer_synchronization/CMakeLists.txt b/samples/portability/cmsis_rtos_v1/timer_synchronization/CMakeLists.txt
@@ -4,5 +4,5 @@ cmake_minimum_required(VERSION 3.13.1)
 include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
 project(cmsis_rtos_v1_synchronization)
 
-target_include_directories(app PRIVATE $ENV{ZEPHYR_BASE}/include/cmsis_rtos_v1)
+target_include_directories(app PRIVATE $ENV{ZEPHYR_BASE}/include/compat/cmsis_rtos/)
 target_sources(app PRIVATE src/main.c)
diff --git a/tests/cmsis_rtos_v1/CMakeLists.txt b/tests/cmsis_rtos_v1/CMakeLists.txt
@@ -4,6 +4,6 @@ cmake_minimum_required(VERSION 3.13.1)
 include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
 project(cmsis_rtos_v1)
 
-target_include_directories(app PRIVATE $ENV{ZEPHYR_BASE}/include/cmsis_rtos_v1)
+target_include_directories(app PRIVATE $ENV{ZEPHYR_BASE}/include/compat/cmsis_rtos/)
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})