Skip to content

Add stubbed version of new Integrity Bounds/Flags [OTA-134] #1130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 17, 2022
Merged

Add stubbed version of new Integrity Bounds/Flags [OTA-134] #1130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
769ccd4
message stubs [OTA-134]
fpezzinosn May 4, 2022
24859a2
append staging to version conditionally
fpezzinosn May 13, 2022
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
11 changes: 8 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,17 @@ deps-quicktype-elm: verify-prereq-quicktype
gen: gen-c gen-python gen-javascript gen-java gen-haskell gen-rust gen-protobuf gen-jsonschema gen-quicktype
gen-quicktype: gen-quicktype-typescript gen-quicktype-elm

gen-c_args = -i $(SBP_SPEC_DIR) \
-o $(SWIFTNAV_ROOT)/c \
-r $(SBP_VERSION)
ifeq ($(SBP_STAGING), 1)
gen-c_args += -s
endif

Comment on lines +183 to +189
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not the sure if it is the best approach to append a flag conditionally.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine, this makes the behavior more explicit

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As an alternative I could see moving this behavior inside the generator an implicitly deciding if we're in a "staging" mode based on some environmental condition, but again, passing the switch makes the behavior more explicit

gen-c:
$(call announce-begin,"Generating C headers and sources")
cd $(SWIFTNAV_ROOT)/generator; \
$(SBP_GEN_BIN) -i $(SBP_SPEC_DIR) \
-o $(SWIFTNAV_ROOT)/c \
-r $(SBP_VERSION) \
$(SBP_GEN_BIN) $(gen-c_args) \
--c

$(call announce-begin,"Generating C tests")
Expand Down
Loading