fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-01 07:51:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

ROMFS/CMakeLists.txt: change dependencies

Browse Source 
- moves process airframe deps to the tar generation, to ensure whenever
  airframes are processed, the tar is extracted first.
  This is required, because if the airframe processing is done on pruned
  ROMFS, it's missing the tags.
- avoid using init.d/rcS in dependencies, use a separate file instead.
  This is because pruning modifies the rcS, and the next rebuild was
  seeing a changed rcS, resulting in unnecessary regeneration.
This commit is contained in:
Beat Küng
2020-09-16 09:30:58 -04:00
committed by Daniel Agar
parent 2b18b05a8a
commit abf5c2b301
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ROMFS/CMakeLists.txt
+17 -14
View File
@@ -95,11 +95,24 @@ add_custom_command(
OUTPUT ${romfs_tar_file} OUTPUT ${romfs_tar_file}
COMMAND ${CMAKE_COMMAND} -E tar cf ${romfs_tar_file} ${romfs_copy_files_relative} COMMAND ${CMAKE_COMMAND} -E tar cf ${romfs_tar_file} ${romfs_copy_files_relative}
WORKING_DIRECTORY ${romfs_src_dir} WORKING_DIRECTORY ${romfs_src_dir}
DEPENDS ${romfs_copy_files} DEPENDS
${romfs_copy_files}
${jinja_templates}
${module_config_files}
${romfs_cmake_files}
${PX4_SOURCE_DIR}/Tools/px_process_airframes.py
${PX4_SOURCE_DIR}/Tools/px4airframes/markdownout.py
${PX4_SOURCE_DIR}/Tools/px4airframes/rcout.py
${PX4_SOURCE_DIR}/Tools/px4airframes/srcparser.py
${PX4_SOURCE_DIR}/Tools/px4airframes/srcscanner.py
${PX4_SOURCE_DIR}/Tools/px4airframes/xmlout.py
${PX4_SOURCE_DIR}/Tools/serial/generate_config.py
) )
set(romfs_extract_stamp ${CMAKE_CURRENT_BINARY_DIR}/romfs_extract.stamp)
add_custom_command( add_custom_command(
OUTPUT ${romfs_gen_root_dir}/init.d/rcS OUTPUT ${romfs_extract_stamp}
COMMAND ${CMAKE_COMMAND} -E tar xf ${romfs_tar_file} COMMAND ${CMAKE_COMMAND} -E tar xf ${romfs_tar_file}
COMMAND ${CMAKE_COMMAND} -E touch ${romfs_extract_stamp}
WORKING_DIRECTORY ${romfs_gen_root_dir} WORKING_DIRECTORY ${romfs_gen_root_dir}
DEPENDS ${romfs_tar_file} DEPENDS ${romfs_tar_file}
) )
@@ -120,17 +133,7 @@ add_custom_command(
--config-files ${module_config_files} #--verbose --config-files ${module_config_files} #--verbose
COMMAND ${CMAKE_COMMAND} -E touch romfs_copy.stamp COMMAND ${CMAKE_COMMAND} -E touch romfs_copy.stamp
DEPENDS DEPENDS
${romfs_gen_root_dir}/init.d/rcS ${romfs_extract_stamp}
${jinja_templates}
${module_config_files}
${romfs_cmake_files}
${PX4_SOURCE_DIR}/Tools/px_process_airframes.py
${PX4_SOURCE_DIR}/Tools/px4airframes/markdownout.py
${PX4_SOURCE_DIR}/Tools/px4airframes/rcout.py
${PX4_SOURCE_DIR}/Tools/px4airframes/srcparser.py
${PX4_SOURCE_DIR}/Tools/px4airframes/srcscanner.py
${PX4_SOURCE_DIR}/Tools/px4airframes/xmlout.py
${PX4_SOURCE_DIR}/Tools/serial/generate_config.py
COMMENT "ROMFS: copying, generating airframes" COMMENT "ROMFS: copying, generating airframes"
) )
@@ -208,7 +211,7 @@ add_custom_command(OUTPUT romfs_extras.stamp
add_custom_target(romfs_gen_files_target add_custom_target(romfs_gen_files_target
DEPENDS DEPENDS
${romfs_gen_root_dir}/init.d/rcS ${romfs_extract_stamp}
${romfs_gen_root_dir}/init.d/rc.serial ${romfs_gen_root_dir}/init.d/rc.serial
romfs_extras.stamp romfs_extras.stamp
) )