CMake: remove AddToFileServer()

With the new interface of DefineCAmkESVMFileServer() there is not need to have AddToFileServer(). CMake lists with files can be built instead and then passed to DefineCAmkESVMFileServer(). Signed-off-by: Axel Heider <[email protected]>
seL4 · May 20, 2023 · fd22105 · fd22105
1 parent 3af1d76
commit fd22105
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 103 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,6 @@ To build an application with this project we use CMake. This repo provides a ser
 
 - `DeclareCAmkESVM(init_component [SOURCES INCLUDES LIBS LD_FLAGS C_FLAGS])`: Function for declaring a CAmkESVM. This is called for each Init component in the defined in the applications `.camkes` file. The user can also pass in extra compilation sources, includes, libs and flags to be compiled with the component through additional arguments (`SOURCES`, `INCLUDES`, `LIBS`, `LD_FLAGS` and `C_FLAGS`)
 - `DeclareCAmkESVMRootServer(camkes_config)`: Declares the CAmkESVM root server. This function takes the applications `.camkes` file as an argument (`camkes_config`).
-- `AddToFileServer(filename_pref file_dest [DEPENDS])`: Function for adding a file/image to the vm file server. The caller specifies the name of they wish to refer to the image in the FileServer through the `filename_pref` parameter. `file_dest` is the file system location of the image the caller is adding. Additional dependencies to the image can be passed through the optional `DEPENDS` parameter.
 - `DefineCAmkESVMFileServer([TYPE <type>] [INSTANCE <name>] [FILES <item>[ <item>[...]] [DEPENDS <dep>[ <dep>[...]])`: Function for explicitly creating a file server with the given files. This takes into account any files that have been added before via calls to `AddToFileServer()`. This is called internally from `DeclareCAmkESVMRootServer()`.
 - `DecompressLinuxKernel(decompress_target decompressed_kernel_image compressed_kernel_image [DEPENDS])`: Function for decompressing/extracting a vmlinux file from a given kernel image. The caller specifies a target name (`decompress_target`) for decompressing the kernel, the kernel image to decompress (`compressed_kernel_image`) and additional dependencies to the compressed image through the optional `DEPENDS` parameter. The location of the decompressed image is populated in the `decompressed_kernel_image` parameter passed by the caller.
 

diff --git a/camkes_vm_helpers.cmake b/camkes_vm_helpers.cmake
@@ -114,25 +114,21 @@ function(DefineCAmkESVMFileServer)
         set(PARAM_INSTANCE "fserv")
     endif()
 
-    # The target might exist already when AddToFileServer() was called.
-    set(FSRV_TARGET "vm_fileserver_config_${PARAM_INSTANCE}")
-    if(NOT TARGET ${FSRV_TARGET})
-        add_custom_target(${FSRV_TARGET})
-    endif()
-
     # For dependencies and files, both lists and lists of list are supported for
     # convenience reasons. Furthermore, empty entries are also allowed. This
     # can happen when the caller uses variables for the lists, when in some
     # configurations the lists remain empty.
 
+    set(DEPS "")
     foreach(element IN LISTS PARAM_DEPENDS)
         foreach(item IN LISTS element)
             if(item)
-                set_property(TARGET ${FSRV_TARGET} APPEND PROPERTY DEPS ${item})
+                list(APPEND DEPS "${item}")
             endif()
         endforeach()
     endforeach()
 
+    set(CPIO_FILES "")
     foreach(element IN LISTS PARAM_FILES)
         foreach(item IN LISTS element) # [<CPIO_NAME>:]<FILENAME>
             if(item)
@@ -153,54 +149,24 @@ function(DefineCAmkESVMFileServer)
                     set(FILE_NAME "${CMAKE_MATCH_1}")
                     get_filename_component(CPIO_NAME "${FILE_NAME}" NAME)
                 endif()
-                set_property(
-                    TARGET ${FSRV_TARGET}
-                    APPEND
-                    PROPERTY FILES "${CPIO_NAME}:${FILE_NAME}"
+                set(CPIO_FILE "${PARAM_INSTANCE}/files/${CPIO_NAME}")
+                add_custom_command(
+                    OUTPUT "${CPIO_FILE}"
+                    COMMENT "copy: ${FILE_NAME} -> ${CPIO_FILE}"
+                    COMMAND
+                        ${CMAKE_COMMAND} -E copy "${FILE_NAME}" "${CPIO_FILE}"
+                    VERBATIM
+                    DEPENDS ${FILE_NAME} ${DEPS}
                 )
+                # There is no need to create an explicit target for the command
+                # above, because the archive creation depends on all files
+                # listed in CPIO_FILES. The command above is the creation rule
+                # for each one.
+                list(APPEND CPIO_FILES "${CPIO_FILE}")
             endif()
         endforeach()
     endforeach()
 
-    # now process the file/deps list
-    get_target_property(files ${FSRV_TARGET} FILES)
-    if(NOT files) # this also catches "files-NOTFOUND" if property is not set
-        set(files "")
-    endif()
-    get_target_property(deps ${FSRV_TARGET} DEPS)
-    if(NOT deps) # this also catches "deps-NOTFOUND" if property is not set
-        set(deps "")
-    endif()
-
-    set(CPIO_FILES "")
-    foreach(item IN LISTS files) # <CPIO_NAME>:<FILENAME>
-        string(
-            REGEX
-                MATCH
-                "^([^:]+):([^:]+)$"
-                cpio_item
-                "${item}"
-        )
-        if(NOT cpio_item)
-            message(FATAL_ERROR "invalid CPIO file format: '${item}'")
-        endif()
-        set(CPIO_NAME "${CMAKE_MATCH_1}")
-        set(FILE_NAME "${CMAKE_MATCH_2}")
-        set(CPIO_FILE "${PARAM_INSTANCE}/files/${CPIO_NAME}")
-        add_custom_command(
-            OUTPUT "${CPIO_FILE}"
-            COMMENT "copy: ${FILE_NAME} -> ${CPIO_FILE}"
-            COMMAND
-                ${CMAKE_COMMAND} -E copy "${FILE_NAME}" "${CPIO_FILE}"
-            VERBATIM
-            DEPENDS ${FILE_NAME} ${deps}
-        )
-        # There is no need to create an explicit target for the command above,
-        # the archive creation depends on all files in CPIO_FILES, where the
-        # command above is the creation rule for each one.
-        list(APPEND CPIO_FILES "${CPIO_FILE}")
-    endforeach()
-
     # Build CPIO archive. It implicitly depends on all files in CPIO_FILES,
     # which have their own dependencies each from above. So we don't have any
     # additional explicit dependencies here.
@@ -252,58 +218,6 @@ function(DeclareCAmkESVMRootServer camkes_config)
     )
 endfunction(DeclareCAmkESVMRootServer)
 
-# Function for adding a file/image to the vm file server.
-#
-# Parameters:
-#
-# <filename_pref>
-#   The name the caller wishes to use to reference the file in the CPIO archive.
-#   This corresponds with the name set in the 'kernel_image' camkes variable for
-#   a given instance vm.
-#
-# <file_dest>
-#   The location of the file/image the caller is adding to the file server
-#
-# INSTANCE <name>
-#   File server instance to add the file(s) to. Optional parameter, the default
-#   instance is "fserv"
-#
-# DEPENDS <dep>[ <dep>[...]]
-#   Any additional dependencies for the file/image the caller is adding to the
-#   file server
-#
-function(AddToFileServer filename_pref file_dest)
-
-    cmake_parse_arguments(
-        PARSE_ARGV
-        2
-        PARAM # variable prefix
-        "" # option arguments
-        "INSTANCE" # optional single value arguments
-        "DEPENDS" # optional multi value arguments
-    )
-
-    if(PARAM_UNPARSED_ARGUMENTS)
-        message(FATAL_ERROR "Unknown arguments: ${PARAM_UNPARSED_ARGUMENTS}")
-    endif()
-
-    if(NOT PARAM_INSTANCE)
-        set(PARAM_INSTANCE "fserv")
-    endif()
-
-    set(FSRV_TARGET "vm_fileserver_config_${PARAM_INSTANCE}")
-    if(NOT TARGET ${FSRV_TARGET})
-        add_custom_target(${FSRV_TARGET})
-    endif()
-
-    set_property(TARGET ${FSRV_TARGET} APPEND PROPERTY FILES "${filename_pref}:${file_dest}")
-
-    if(PARAM_DEPENDS)
-        set_property(TARGET ${FSRV_TARGET} APPEND PROPERTY DEPS ${PARAM_DEPENDS})
-    endif()
-
-endfunction(AddToFileServer)
-
 # Function for decompressing/extracting a vmlinux file from a given kernel image
 # decompress_target: The target name the caller wishes to use to generate the decompressed kernel
 # image