examples/sotest: replace Python fixture generators

Author: aviralgarg05

examples/sotest/main/CMakeLists.txt

@@ -26,8 +26,6 @@ if(CONFIG_EXAMPLES_SOTEST)
   set(SOTEST_ROMFS_SRC ${CMAKE_CURRENT_BINARY_DIR}/sotest_romfs.c)
   set(SOTEST_MODPRINT_ELF ${CMAKE_BINARY_DIR}/bin/modprint)
   set(SOTEST_SHARED_ELF ${CMAKE_BINARY_DIR}/bin/sotest)
-  set(SOTEST_GEN_SYMTAB ${CMAKE_CURRENT_SOURCE_DIR}/gen_symtab.py)
-  set(SOTEST_GEN_ROMFS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/gen_romfs_source.py)
 
   # Dynamic applications are wrapped in ELF_* helper targets when the build uses
   # the non-ELF-capable compiler path.
@@ -41,11 +39,9 @@ if(CONFIG_EXAMPLES_SOTEST)
 
   add_custom_command(
     OUTPUT ${SOTEST_SYMTAB}
-    COMMAND ${Python3_EXECUTABLE} ${SOTEST_GEN_SYMTAB} ${SOTEST_MODPRINT_ELF}
-            ${SOTEST_SHARED_ELF} g_sot ${SOTEST_SYMTAB}
-    DEPENDS ${SOTEST_MODPRINT_TARGET} ${SOTEST_SHARED_TARGET}
-            ${SOTEST_GEN_SYMTAB}
-    VERBATIM)
+    COMMAND ${NUTTX_APPS_DIR}/tools/mksymtab.sh ${SOTEST_MODPRINT_ELF}
+            ${SOTEST_SHARED_ELF} g_sot > ${SOTEST_SYMTAB}
+    DEPENDS ${SOTEST_MODPRINT_TARGET} ${SOTEST_SHARED_TARGET})
 
   set_source_files_properties(${SOTEST_SYMTAB} PROPERTIES GENERATED TRUE)
 
@@ -58,16 +54,28 @@ if(CONFIG_EXAMPLES_SOTEST)
     if(CONFIG_SYSTEM_NXPKG)
       set(SOTEST_SHARED_INDEX ${CMAKE_BINARY_DIR}/bin/shared-index.json)
       set(SOTEST_SHARED_SCRIPT ${CMAKE_BINARY_DIR}/bin/pkgsotest.nsh)
+      set(SOTEST_FIXTURE_HOST_DIR ${CMAKE_CURRENT_BINARY_DIR}/host)
+      set(SOTEST_FIXTURE_HOST_SRC ${CMAKE_CURRENT_SOURCE_DIR}/host/CMakeLists.txt)
+      set(SOTEST_FIXTURE_TOOL
+          ${SOTEST_FIXTURE_HOST_DIR}/mk_pkg_fixture_shared${CMAKE_EXECUTABLE_SUFFIX})
+
+      add_custom_command(
+        OUTPUT ${SOTEST_FIXTURE_TOOL}
+        COMMAND ${CMAKE_COMMAND} -S ${CMAKE_CURRENT_SOURCE_DIR}/host -B
+                ${SOTEST_FIXTURE_HOST_DIR}
+        COMMAND ${CMAKE_COMMAND} --build ${SOTEST_FIXTURE_HOST_DIR} --target
+                mk_pkg_fixture_shared
+        DEPENDS ${SOTEST_FIXTURE_HOST_SRC}
+                ${CMAKE_CURRENT_SOURCE_DIR}/mk_pkg_fixture_shared.c
+        VERBATIM)
 
       add_custom_command(
         OUTPUT ${SOTEST_SHARED_INDEX} ${SOTEST_SHARED_SCRIPT}
-        COMMAND
-          ${Python3_EXECUTABLE}
-          ${CMAKE_CURRENT_SOURCE_DIR}/mk_pkg_fixture_shared.py
-          ${SOTEST_MODPRINT_ELF} ${SOTEST_SHARED_ELF} ${SOTEST_SHARED_INDEX}
-          ${SOTEST_SHARED_SCRIPT} ${CONFIG_ARCH} ${CONFIG_ARCH_BOARD}
+        COMMAND ${SOTEST_FIXTURE_TOOL} ${SOTEST_MODPRINT_ELF}
+                ${SOTEST_SHARED_ELF} ${SOTEST_SHARED_INDEX}
+                ${SOTEST_SHARED_SCRIPT} ${CONFIG_ARCH} ${CONFIG_ARCH_BOARD}
         DEPENDS ${SOTEST_MODPRINT_TARGET} ${SOTEST_SHARED_TARGET}
-                ${CMAKE_CURRENT_SOURCE_DIR}/mk_pkg_fixture_shared.py
+                ${SOTEST_FIXTURE_TOOL}
         VERBATIM)
 
       list(APPEND SOTEST_ROMFS_DEPS ${SOTEST_SHARED_INDEX}
@@ -82,10 +90,8 @@ if(CONFIG_EXAMPLES_SOTEST)
 
     add_custom_command(
       OUTPUT ${SOTEST_ROMFS_SRC}
-      COMMAND ${Python3_EXECUTABLE} ${SOTEST_GEN_ROMFS_SRC} ${SOTEST_ROMFS_IMG}
-              ${SOTEST_ROMFS_SRC}
-      DEPENDS ${SOTEST_ROMFS_IMG} ${SOTEST_GEN_ROMFS_SRC}
-      VERBATIM)
+      COMMAND xxd -i ${SOTEST_ROMFS_IMG} > ${SOTEST_ROMFS_SRC}
+      DEPENDS ${SOTEST_ROMFS_IMG})
 
     set_source_files_properties(${SOTEST_ROMFS_SRC} PROPERTIES GENERATED TRUE)
 

examples/sotest/main/Makefile

@@ -51,14 +51,23 @@ ROMFSIMG = sotest_romfs.img
 ROMFSSRC = sotest_romfs.c
 ROMFSOBJ = $(ROMFSSRC:.c=$(OBJEXT))
 ifdef CONFIG_SYSTEM_NXPKG
+HOSTOBJSEXT ?= hobj
 PKGSHAREDINDEX = $(BINDIR)/shared-index.json
 PKGSHAREDTEST = $(BINDIR)/pkgsotest.nsh
-PKG_FIXTURE_GEN = $(APPDIR)/examples/sotest/main/mk_pkg_fixture_shared.py
+PKG_FIXTURE_GEN = mk_pkg_fixture_shared$(HOSTEXEEXT)
+PKG_FIXTURE_SRCS = mk_pkg_fixture_shared.c
+PKG_FIXTURE_OBJS = $(PKG_FIXTURE_SRCS:.c=.$(HOSTOBJSEXT))
 PKG_FIXTURE_OUTPUTS = $(PKGSHAREDINDEX) $(PKGSHAREDTEST)
 
+$(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) &: $(BINDIR)/modprint $(BINDIR)/sotest $(PKG_FIXTURE_GEN)
-	$(Q) sh -c 'python3 "$$1" "$$2" "$$3" "$$4" "$$5" "$$6" "$$7"' sh \
-		$(PKG_FIXTURE_GEN) $(BINDIR)/modprint $(BINDIR)/sotest \
+	$(Q) ./$(PKG_FIXTURE_GEN) $(BINDIR)/modprint $(BINDIR)/sotest \
 		$(PKGSHAREDINDEX) $(PKGSHAREDTEST) $(CONFIG_ARCH) \
 		$(CONFIG_ARCH_BOARD)
 endif
@@ -79,6 +88,6 @@ postinstall:: $(ROMFSOBJ) $(SYMTABOBJ) $(FSIMG_OBJ)
 	$(call ARLOCK, $(call CONVERT_PATH,$(BIN)), $^)
 
 distclean::
-	$(Q) $(call DELFILE, $(SYMTABSRC) $(SYMTABOBJ) $(ROMFSSRC) $(ROMFSIMG) $(ROMFSOBJ))
+	$(Q) $(call DELFILE, $(SYMTABSRC) $(SYMTABOBJ) $(ROMFSSRC) $(ROMFSIMG) $(ROMFSOBJ) $(PKG_FIXTURE_GEN) $(PKG_FIXTURE_OBJS))
 
 include $(APPDIR)/Application.mk

examples/sotest/main/gen_romfs_source.py

@@ -0,0 +1,26 @@
+# ##############################################################################
+# apps/examples/sotest/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(sotest_fixture_host LANGUAGES C)
+
+add_executable(mk_pkg_fixture_shared ../mk_pkg_fixture_shared.c)