Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-test-rhel8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
Framework:
runs-on: ubuntu-latest
container:
image: redhat/ubi8:8.10

Check notice on line 27 in .github/workflows/build-test-rhel8.yml

View workflow job for this annotation

GitHub Actions / Check Spelling

`Line` matches candidate pattern `image: [-\w./:@]+` (candidate-pattern)
steps:
- name: "Install dependencies"
run: |
Expand All @@ -38,7 +38,7 @@
- uses: ./.github/actions/setup
- name: Build Framework
run: |
fprime-util generate
fprime-util generate -DFPRIME_ENABLE_JSON_MODEL_GENERATION=ON
fprime-util build --all -j4

Ref:
Expand All @@ -59,7 +59,7 @@
- name: Build Ref
run: |
cd Ref
fprime-util generate
fprime-util generate -DFPRIME_ENABLE_JSON_MODEL_GENERATION=ON
fprime-util build -j4

UTs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fpp-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: "Generate UT build cache"
working-directory: ./FppTestProject
run: |
fprime-util generate --ut
fprime-util generate --ut -DFPRIME_ENABLE_JSON_MODEL_GENERATION=ON
shell: bash
- name: "Build UTs"
working-directory: ./FppTestProject/FppTest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fpp-to-json.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: "Generate Ref Deployment"
working-directory: ./Ref
run: |
fprime-util generate
fprime-util generate -DFPRIME_ENABLE_JSON_MODEL_GENERATION=ON
shell: bash
- name: "Run fpp-to-json on Ref topology"
working-directory: ./Ref/Top
Expand Down
7 changes: 6 additions & 1 deletion cmake/FPrime.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,12 @@ macro(fprime_initialize_build_system)

# Perform necessary sub-builds
if (NOT FPRIME_IS_SUB_BUILD)
run_sub_build(info-cache target/sub-build/fpp_locs target/sub-build/fpp_depend target/sub-build/fpp_to_json target/sub-build/module_info)
set(SUB_BUILD_TARGETS target/sub-build/fpp_locs target/sub-build/fpp_depend)
if (FPRIME_ENABLE_JSON_MODEL_GENERATION)
list(APPEND SUB_BUILD_TARGETS target/sub-build/fpp_to_json)
endif()
list(APPEND SUB_BUILD_TARGETS target/sub-build/module_info)
run_sub_build(info-cache ${SUB_BUILD_TARGETS})
# Import the pre-computed properties!
include("${CMAKE_BINARY_DIR}/fprime_module_info.cmake")
endif()
Expand Down
16 changes: 15 additions & 1 deletion cmake/options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ option(FPRIME_ENABLE_AUTOCODER_UTS "Enable autocoder UT generation" OFF)
option(FPRIME_ENABLE_UT_COVERAGE "Calculate unit test coverage" ON)

####
# `FPRIME_ENABLE_TEXT_LOGGERS:`
# `FPRIME_ENABLE_TEXT_LOGGERS`:
#
# When FPRIME_ENABLE_TEXT_LOGGERS is set, the ActiveTextLogger and PassiveConsoleTextLogger
# svc components are included in the build. When unset, those components are excluded,
Expand All @@ -163,6 +163,20 @@ option(FPRIME_ENABLE_UT_COVERAGE "Calculate unit test coverage" ON)
####
option(FPRIME_ENABLE_TEXT_LOGGERS "Enable text loggers in build" ON)

####
# `FPRIME_ENABLE_JSON_MODEL_GENERATION`:
#
# Turns on the generation of JSON models for all modules in the build system. This will run `fpp-to-json` and may
# require the user to install `java` and the .jar variants of FPP.
#
# **Values:**
# - ON: enable JSON model generation
# - OFF: (default) disable JSON model generation
#
# e.g. `-DFPRIME_ENABLE_JSON_MODEL_GENERATION=ON`
####
option(FPRIME_ENABLE_JSON_MODEL_GENERATION "Enable JSON model generation" OFF)

####
# `FPRIME_SKIP_TOOLS_VERSION_CHECK`:
#
Expand Down
Loading