examples/elf: replace Python fixture generators

Author: aviralgarg05

examples/elf/main/CMakeLists.txt

@@ -22,8 +22,6 @@ if(CONFIG_EXAMPLES_ELF)
   set(ELF_SYMTAB ${CMAKE_CURRENT_BINARY_DIR}/test_symtab.c)
   set(ELF_ROMFS_IMG ${CMAKE_CURRENT_BINARY_DIR}/elf_romfs.img)
   set(ELF_ROMFS_SRC ${CMAKE_CURRENT_BINARY_DIR}/elf_romfs.c)
-  set(ELF_GEN_SYMTAB ${CMAKE_CURRENT_SOURCE_DIR}/gen_symtab.py)
-  set(ELF_GEN_ROMFS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/gen_romfs_source.py)
 
   set(ELFNAME_BASE hello)
 
@@ -41,10 +39,9 @@ if(CONFIG_EXAMPLES_ELF)
 
   add_custom_command(
     OUTPUT ${ELF_SYMTAB}
-    COMMAND ${Python3_EXECUTABLE} ${ELF_GEN_SYMTAB} ${ELF_BINARY_FILES} g_elf
+    COMMAND ${NUTTX_APPS_DIR}/tools/mksymtab.sh ${ELF_BINARY_FILES} g_elf >
             ${ELF_SYMTAB}
-    DEPENDS ${ELF_BINARY_TARGETS} ${ELF_GEN_SYMTAB}
-    VERBATIM)
+    DEPENDS ${ELF_BINARY_TARGETS})
 
   set_source_files_properties(${ELF_SYMTAB} PROPERTIES GENERATED TRUE)
 
@@ -60,21 +57,33 @@ if(CONFIG_EXAMPLES_ELF)
       set(ELF_PKGTEST ${CMAKE_BINARY_DIR}/bin/pkgtest.nsh)
       set(ELF_PKGFAIL ${CMAKE_BINARY_DIR}/bin/pkgfail.nsh)
       set(ELF_HELLO_BIN ${CMAKE_BINARY_DIR}/bin/hello)
+      set(ELF_FIXTURE_HOST_DIR ${CMAKE_CURRENT_BINARY_DIR}/host)
+      set(ELF_FIXTURE_HOST_SRC ${CMAKE_CURRENT_SOURCE_DIR}/host/CMakeLists.txt)
+      set(ELF_FIXTURE_TOOL
+          ${ELF_FIXTURE_HOST_DIR}/mk_pkg_fixture${CMAKE_EXECUTABLE_SUFFIX})
       set(ELF_HELLO_TARGET hello)
 
       if(NOT CMAKE_C_ELF_COMPILER)
         set(ELF_HELLO_TARGET ELF_hello)
       endif()
 
+      add_custom_command(
+        OUTPUT ${ELF_FIXTURE_TOOL}
+        COMMAND ${CMAKE_COMMAND} -S ${CMAKE_CURRENT_SOURCE_DIR}/host -B
+                ${ELF_FIXTURE_HOST_DIR}
+        COMMAND ${CMAKE_COMMAND} --build ${ELF_FIXTURE_HOST_DIR} --target
+                mk_pkg_fixture
+        DEPENDS ${ELF_FIXTURE_HOST_SRC}
+                ${CMAKE_CURRENT_SOURCE_DIR}/mk_pkg_fixture.c
+        VERBATIM)
+
       add_custom_command(
         OUTPUT ${ELF_INDEX_JSON} ${ELF_BAD_INDEX_JSON} ${ELF_PKGTEST}
                ${ELF_PKGFAIL}
-        COMMAND
-          ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/mk_pkg_fixture.py
-          ${ELF_HELLO_BIN} ${ELF_INDEX_JSON} ${ELF_BAD_INDEX_JSON}
-          ${ELF_PKGTEST} ${ELF_PKGFAIL} ${CONFIG_ARCH} ${CONFIG_ARCH_BOARD}
-        DEPENDS ${ELF_HELLO_TARGET}
-                ${CMAKE_CURRENT_SOURCE_DIR}/mk_pkg_fixture.py
+        COMMAND ${ELF_FIXTURE_TOOL} ${ELF_HELLO_BIN} ${ELF_INDEX_JSON}
+                ${ELF_BAD_INDEX_JSON} ${ELF_PKGTEST} ${ELF_PKGFAIL}
+                ${CONFIG_ARCH} ${CONFIG_ARCH_BOARD}
+        DEPENDS ${ELF_HELLO_TARGET} ${ELF_FIXTURE_TOOL}
         VERBATIM)
 
       list(APPEND ELF_ROMFS_DEPS ${ELF_INDEX_JSON} ${ELF_BAD_INDEX_JSON}
@@ -89,10 +98,8 @@ if(CONFIG_EXAMPLES_ELF)
 
     add_custom_command(
       OUTPUT ${ELF_ROMFS_SRC}
-      COMMAND ${Python3_EXECUTABLE} ${ELF_GEN_ROMFS_SRC} ${ELF_ROMFS_IMG}
-              ${ELF_ROMFS_SRC}
-      DEPENDS ${ELF_ROMFS_IMG} ${ELF_GEN_ROMFS_SRC}
-      VERBATIM)
+      COMMAND xxd -i ${ELF_ROMFS_IMG} > ${ELF_ROMFS_SRC}
+      DEPENDS ${ELF_ROMFS_IMG})
 
     set_source_files_properties(${ELF_ROMFS_SRC} PROPERTIES GENERATED TRUE)
 

examples/elf/main/Makefile

@@ -70,19 +70,29 @@ ROMFSIMG = elf_romfs.img
 ROMFSSRC = elf_romfs.c
 ROMFSOBJ = $(ROMFSSRC:.c=$(OBJEXT))
 ifdef CONFIG_SYSTEM_NXPKG
+HOSTOBJSEXT ?= hobj
 PKGINDEX = $(BINDIR)/index.json
 PKGBADINDEX = $(BINDIR)/bad-index.json
 PKGTEST  = $(BINDIR)/pkgtest.nsh
 PKGFAIL  = $(BINDIR)/pkgfail.nsh
-PKG_FIXTURE_GEN = $(APPDIR)/examples/elf/main/mk_pkg_fixture.py
+PKG_FIXTURE_GEN = mk_pkg_fixture$(HOSTEXEEXT)
+PKG_FIXTURE_SRCS = mk_pkg_fixture.c
+PKG_FIXTURE_OBJS = $(PKG_FIXTURE_SRCS:.c=.$(HOSTOBJSEXT))
 PKG_FIXTURE_OUTPUTS = $(PKGINDEX) $(PKGBADINDEX) $(PKGTEST) $(PKGFAIL)
 PKG_FIXTURE_INPUTS = $(BINDIR)/hello
 PKG_FIXTURE_ARGS = \
 	$(BINDIR)/hello $(PKGINDEX) $(PKGBADINDEX) $(PKGTEST) $(PKGFAIL) \
 	$(CONFIG_ARCH) $(CONFIG_ARCH_BOARD)
 
+$(PKG_FIXTURE_OBJS): %.$(HOSTOBJSEXT): %.c
+	@echo "CC:  $<"
+	$(Q) $(HOSTCC) -c $(HOSTCFLAGS) $< -o $@
+
+$(PKG_FIXTURE_GEN): $(PKG_FIXTURE_OBJS)
+	$(Q) $(HOSTCC) $(HOSTLDFLAGS) $(PKG_FIXTURE_OBJS) -o $@
+
 $(PKG_FIXTURE_OUTPUTS) &: $(PKG_FIXTURE_INPUTS) $(PKG_FIXTURE_GEN)
-	$(Q) python3 $(PKG_FIXTURE_GEN) \
+	$(Q) ./$(PKG_FIXTURE_GEN) \
 		$(PKG_FIXTURE_ARGS)
 endif
 
@@ -122,7 +132,7 @@ postinstall:: $(ROMFSOBJ) $(SYMTABOBJ) $(FSIMG_OBJ)
 	$(call ARLOCK, $(call CONVERT_PATH,$(BIN)), $^)
 
 distclean::
-	$(Q) $(call DELFILE, $(SYMTABSRC) $(SYMTABOBJ) $(ROMFSSRC) $(ROMFSIMG) $(ROMFSOBJ) $(MODLUE_NAME))
+	$(Q) $(call DELFILE, $(SYMTABSRC) $(SYMTABOBJ) $(ROMFSSRC) $(ROMFSIMG) $(ROMFSOBJ) $(MODLUE_NAME) $(PKG_FIXTURE_GEN) $(PKG_FIXTURE_OBJS))
 
 
 include $(APPDIR)/Application.mk

examples/elf/main/gen_romfs_source.py

@@ -0,0 +1,26 @@
+# ##############################################################################
+# apps/examples/elf/main/host/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+cmake_minimum_required(VERSION 3.16)
+project(elf_fixture_host LANGUAGES C)
+
+add_executable(mk_pkg_fixture ../mk_pkg_fixture.c)