acassis commented on code in PR #18396:
URL: https://github.com/apache/nuttx/pull/18396#discussion_r2809214035
##########
cmake/nuttx_add_romfs.cmake:
##########
@@ -122,7 +121,7 @@ function(nuttx_add_romfs)
foreach(rcsrc ${RCSRCS})
if(IS_ABSOLUTE ${rcsrc})
string(REGEX REPLACE "^(.*)/etc(/.*)?$" "\\1" SOURCE_ETC_PREFIX
- "${rcsrc}")
+ "${rcsrc}")
Review Comment:
I suggest keeping the previous alignment, it seems correct. Otherwise I
think you can move "${rcsrc}") to end of the previous line, even if it reach
column 80
##########
cmake/nuttx_add_romfs.cmake:
##########
@@ -185,11 +185,11 @@ function(nuttx_add_romfs)
OUTPUT romfs_${NAME}.${EXTENSION}
COMMAND ${CMAKE_COMMAND} -E make_directory romfs_${NAME}
COMMAND if \[ \"${PATH}\" != \"\" \]; then ${CMAKE_COMMAND} -E
- copy_directory ${PATH} romfs_${NAME} \; fi
+ copy_directory ${PATH} romfs_${NAME} \; fi
Review Comment:
ditto
##########
cmake/nuttx_add_romfs.cmake:
##########
@@ -320,7 +346,7 @@ function(process_all_directory_romfs)
foreach(rcraw ${RCRAWS})
if(IS_ABSOLUTE ${rcraw})
string(REGEX REPLACE "^(.*)/etc(/.*)?$" "\\1" SOURCE_ETC_PREFIX
- "${rcraw}")
+ "${rcraw}")
Review Comment:
ditto
##########
cmake/nuttx_add_romfs.cmake:
##########
@@ -185,11 +185,11 @@ function(nuttx_add_romfs)
OUTPUT romfs_${NAME}.${EXTENSION}
COMMAND ${CMAKE_COMMAND} -E make_directory romfs_${NAME}
COMMAND if \[ \"${PATH}\" != \"\" \]; then ${CMAKE_COMMAND} -E
- copy_directory ${PATH} romfs_${NAME} \; fi
+ copy_directory ${PATH} romfs_${NAME} \; fi
COMMAND genromfs -f ${IMGNAME} -d romfs_${NAME} -V ${NAME}
COMMAND xxd -i ${IMGNAME} romfs_${NAME}.${EXTENSION}
COMMAND if ! [ -z "${NONCONST}" ]\; then sed -E -i'' -e
- "s/^unsigned/const unsigned/g" romfs_${NAME}.${EXTENSION} \; fi
+ "s/^unsigned/const unsigned/g" romfs_${NAME}.${EXTENSION} \; fi
Review Comment:
ditto
##########
cmake/nuttx_add_romfs.cmake:
##########
@@ -156,16 +156,16 @@ function(nuttx_add_romfs)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}
COMMAND ${CMAKE_COMMAND} -E make_directory
- ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}
+ ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}
COMMAND
- ${CMAKE_COMMAND} -E copy_directory
- ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX}
- ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX})
+ ${CMAKE_COMMAND} -E copy_directory
+ ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX}
+ ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX})
Review Comment:
Please keep the original alignment, it was correct
##########
cmake/nuttx_add_romfs.cmake:
##########
@@ -131,20 +130,21 @@ function(nuttx_add_romfs)
endif()
get_filename_component(rcpath ${SOURCE_ETC_SUFFIX} DIRECTORY)
+
if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${rcpath})
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${rcpath})
endif()
+
nuttx_generate_preprocess_target(
SOURCE_FILE ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX} TARGET_FILE
${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX} DEPENDS nuttx_context)
list(APPEND DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX})
endforeach()
foreach(rcraw ${RCRAWS})
-
if(IS_ABSOLUTE ${rcraw})
string(REGEX REPLACE "^(.*)/etc(/.*)?$" "\\1" SOURCE_ETC_PREFIX
- "${rcraw}")
+ "${rcraw}")
Review Comment:
same here
##########
cmake/nuttx_add_romfs.cmake:
##########
@@ -293,7 +317,7 @@ function(process_all_directory_romfs)
foreach(rcsrc ${RCSRCS})
if(IS_ABSOLUTE ${rcsrc})
string(REGEX REPLACE "^(.*)/etc(/.*)?$" "\\1" SOURCE_ETC_PREFIX
- "${rcsrc}")
+ "${rcsrc}")
Review Comment:
ditto
##########
cmake/nuttx_add_romfs.cmake:
##########
@@ -333,26 +359,28 @@ function(process_all_directory_romfs)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}
COMMAND ${CMAKE_COMMAND} -E make_directory
- ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}
+ ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}
COMMAND
- ${CMAKE_COMMAND} -E copy_directory
- ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX}
- ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}
+ ${CMAKE_COMMAND} -E copy_directory
+ ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX}
+ ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}
DEPENDS ${dyn_deps})
list(APPEND DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX})
else()
list(FIND DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX} index)
+
if(index GREATER -1)
set(APPEND_OPTION APPEND)
else()
set(APPEND_OPTION)
endif()
+
list(APPEND DEPENDS ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX})
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}
COMMAND
- ${CMAKE_COMMAND} -E copy ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX}
- ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX} ${APPEND_OPTION}
+ ${CMAKE_COMMAND} -E copy ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX}
+ ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX} ${APPEND_OPTION}
Review Comment:
ditto
##########
cmake/nuttx_add_romfs.cmake:
##########
@@ -232,11 +231,11 @@ function(nuttx_add_cromfs)
OUTPUT cromfs_${NAME}.c
COMMAND ${CMAKE_COMMAND} -E make_directory cromfs_${NAME}
COMMAND if \[ \"${PATH}\" != \"\" \]; then ${CMAKE_COMMAND} -E
- copy_directory ${PATH} cromfs_${NAME} \; fi
+ copy_directory ${PATH} cromfs_${NAME} \; fi
COMMAND if \[ \"${FILES}\" != \"\" \]; then ${CMAKE_COMMAND} -E copy
- ${FILES} cromfs_${NAME} \; fi
+ ${FILES} cromfs_${NAME} \; fi
COMMAND ${CMAKE_BINARY_DIR}/bin_host/gencromfs cromfs_${NAME}
- cromfs_${NAME}.c
+ cromfs_${NAME}.c
Review Comment:
Same, don't remove the alignment, otherwise it could seems like a new command
##########
cmake/nuttx_add_romfs.cmake:
##########
@@ -333,26 +359,28 @@ function(process_all_directory_romfs)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}
COMMAND ${CMAKE_COMMAND} -E make_directory
- ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}
+ ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}
COMMAND
- ${CMAKE_COMMAND} -E copy_directory
- ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX}
- ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}
+ ${CMAKE_COMMAND} -E copy_directory
+ ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX}
+ ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}
Review Comment:
same here
##########
cmake/nuttx_add_romfs.cmake:
##########
@@ -362,7 +390,7 @@ function(process_all_directory_romfs)
OUTPUT romfs_etc.c
COMMAND ${CMAKE_COMMAND} -E make_directory romfs_etc
COMMAND if \[ \"etc\" != \"\" \]; then ${CMAKE_COMMAND} -E copy_directory
- etc romfs_etc \; fi
+ etc romfs_etc \; fi
Review Comment:
ditto
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
