mirror of
https://github.com/eclipse-threadx/filex.git
synced 2026-09-14 04:05:59 +08:00
Frédéric DesbiensandCopilot
7cbe022bab
- New port: ports/win64/vs_2022/inc/fx_port.h
- Based on the Win32 port; updated ALIGN_TYPE to ULONG64 for 64-bit
pointers, added FX_REGRESSION_TEST hooks from the Linux port, and
bumped the port name string to Win64/Visual.
- New CMake infrastructure: ports/win64/vs_2022/CMakeLists.txt
- Exposes only the inc/ directory (port is header-only).
- Updated test/cmake/CMakeLists.txt
- Added MSVC guards: skip -m32 / GCC coverage flags; locate VS 2022
toolchain; build ThreadX from source alongside FileX via
THREADX_SOURCE_DIR.
- Updated test/cmake/regression/CMakeLists.txt
- Added MSVC-compatible compile options (/W3 /Zi instead of -Wall
-fprofile-arcs); added win64_compat include path for standalone +
MSVC builds; added per-test TIMEOUT overrides for the two inherently
long-running fault-tolerant tests on Windows.
- Updated test/cmake/samples/CMakeLists.txt
- Added MSVC-compatible flag handling.
- New PowerShell scripts: scripts/build_fx.ps1, scripts/test_fx.ps1,
scripts/fx_windows_common.ps1
- Support all 9 build configurations; -Clean, -Config, -Verbose flags;
modelled on the ThreadX Win64 build/test scripts.
- New Windows compatibility shims for standalone builds:
test/regression_test/win64_compat/pthread.h
test/regression_test/win64_compat/unistd.h
- Minimal pthreads (CreateThread / WaitForSingleObject / TerminateThread)
and usleep (Sleep) shims so standalone test files compile on MSVC.
- Fixed test/regression_test/fx_ram_driver_test.c and .h
- RAM driver: added bounds check so out-of-range sector READs use a
safe scratch buffer instead of segfaulting.
- MSVC: large test buffers (ram_disk_memory_large, large_data_buffer,
and standalone-mode ram_disk_memory / ram_disk_memory1) moved from
BSS to calloc() via a .CRT\ constructor. This avoids the MSVC
PE image 2 GB hard limit (LNK1248) and eliminates demand-zero page-
fault overhead that would otherwise slow the test suite.
- Bulk-fixed 93 fault-tolerant test files
- [FAULT_TOLERANT_SIZE] -> [FAULT_TOLERANT_SIZE > 0 ? FAULT_TOLERANT_SIZE : 1]
so that MSVC C2466 (zero-length array) is not triggered when
FX_ENABLE_FAULT_TOLERANT is not defined.
- Fixed filextestcontrol.c: standalone test runner thread exit
- The Win64 pthread shim makes pthread_exit() a no-op so that
test_control_thread_entry() proceeds to exit(failed_tests),
giving ctest the correct process exit code.
- Fixed common/src/fx_utility_logical_sector_write.c
- Added missing bounds guard to prevent sector-write past end of
RAM disk during fault-tolerant interrupt simulation tests.
All 9 build configurations pass 136/136 regression tests on Win64/VS 2022.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
78 lines
2.0 KiB
CMake
Executable File
78 lines
2.0 KiB
CMake
Executable File
cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
|
|
|
|
# Set up the project
|
|
project(filex
|
|
LANGUAGES C
|
|
)
|
|
|
|
|
|
option(FX_STANDALONE_ENABLE "Enable Filex in standalone mode" OFF)
|
|
|
|
if(NOT DEFINED THREADX_ARCH)
|
|
message(FATAL_ERROR "Error: THREADX_ARCH not defined")
|
|
endif()
|
|
if(NOT DEFINED THREADX_TOOLCHAIN)
|
|
message(FATAL_ERROR "Error: THREADX_TOOLCHAIN not defined")
|
|
endif()
|
|
|
|
# Define our target library and an alias for consumers
|
|
add_library(${PROJECT_NAME})
|
|
add_library("azrtos::${PROJECT_NAME}" ALIAS ${PROJECT_NAME})
|
|
|
|
# Define any required dependencies between this library and others
|
|
if(NOT FX_STANDALONE_ENABLE)
|
|
target_link_libraries(${PROJECT_NAME} PUBLIC
|
|
"azrtos::threadx"
|
|
)
|
|
endif()
|
|
|
|
# A place for generated/copied include files (no need to change)
|
|
set(CUSTOM_INC_DIR ${CMAKE_CURRENT_BINARY_DIR}/custom_inc)
|
|
|
|
# Pick up the port specific stuff first
|
|
if(DEFINED FILEX_CUSTOM_PORT)
|
|
add_subdirectory(${FILEX_CUSTOM_PORT} filex_port)
|
|
else()
|
|
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/ports/${THREADX_ARCH}/${THREADX_TOOLCHAIN})
|
|
endif()
|
|
|
|
# Then the common files
|
|
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/common)
|
|
|
|
|
|
|
|
|
|
# Include the user's override file if required
|
|
if (NOT FX_USER_FILE)
|
|
message(STATUS "Using default fx_user.h file")
|
|
set(FX_USER_FILE ${CMAKE_CURRENT_LIST_DIR}/common/inc/fx_user_sample.h)
|
|
else()
|
|
message(STATUS "Using custom fx_user.h file from ${FX_USER_FILE}")
|
|
endif()
|
|
configure_file(${FX_USER_FILE} ${CUSTOM_INC_DIR}/fx_user.h COPYONLY)
|
|
target_include_directories(${PROJECT_NAME}
|
|
PUBLIC
|
|
${CUSTOM_INC_DIR}
|
|
)
|
|
|
|
if(NOT FX_STANDALONE_ENABLE)
|
|
target_compile_definitions(${PROJECT_NAME} PUBLIC "FX_INCLUDE_USER_DEFINE_FILE" )
|
|
else()
|
|
target_compile_definitions(${PROJECT_NAME} PUBLIC "FX_INCLUDE_USER_DEFINE_FILE" -DFX_STANDALONE_ENABLE)
|
|
endif()
|
|
|
|
# Enable a build target that produces a ZIP file of all sources
|
|
set(CPACK_SOURCE_GENERATOR "ZIP")
|
|
set(CPACK_SOURCE_IGNORE_FILES
|
|
\\.git/
|
|
\\.github/
|
|
_build/
|
|
\\.git
|
|
\\.gitattributes
|
|
\\.gitignore
|
|
".*~$"
|
|
)
|
|
set(CPACK_VERBATIM_VARIABLES YES)
|
|
include(CPack)
|
|
|