Skip to content
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.

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

remove gen_default_config.sh / gen_default_everything.sh #546

Open
wants to merge 11 commits into
base: master
Choose a base branch
from

Conversation

nmschulte
Copy link
Contributor

This just nukes the top-most layer of things; removes dependencies on these files, clarifies a few things, and beginnings of fixes #538

#
# default config should be generated after normal custom boards so that it would be default
# firmware/controllers/generated/rusefi_generated.h file which would be pushed into VCS
./gen_config_default.sh
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can't find an existing flow that relies on this invocation here; gen-configs.yaml already has this explicitly after the call to this gen_config.sh and is the only flow I could find, unless somehow the GH build containers are re-used on purpose in some scenario/way I'm unaware of.

@nmschulte nmschulte force-pushed the nms/remove-gen-default branch from 070b9f7 to 7429422 Compare January 25, 2025 19:37
@@ -8,13 +8,7 @@ echo "The storage section of fome.ini is updated as well"
rm -f gen_config.log
rm -f gen_config_board.log

# todo: who is the consumer of this folder? shall we move that 'mkdir' command closer to usage?
mkdir build
Copy link
Contributor Author

Choose a reason for hiding this comment

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

the Make build, ChibiOS's BUILDDIR, is this -- it's unnecessary

@@ -18,7 +18,8 @@ FW_DIR=$(readlink -f $FW_DIR)
echo "FW dir is $FW_DIR"
cd $FW_DIR

mkdir -p .dep
mkdir -p .dep # ChibiOS build's DEPDIR
mkdir -p build # ChibiOS build's BUILDDIR
Copy link
Contributor Author

@nmschulte nmschulte Jan 25, 2025

Choose a reason for hiding this comment

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

this is actually configurable via BUILDDIR, as is I think DEPDIR, but these features are hardcoded in a few places, mainly around the compile.sh layer atop Make.

Invocations like BUILDDIR=shiny/ .../compile.sh / BUILDDIR=shiny/ make indeed land in shiny/, but bits here won't work quite right (see e.g. rm build/fome.bin later in this file).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

remove gen_config_default.sh/gen_default_everything.sh
1 participant