-
-
Notifications
You must be signed in to change notification settings - Fork 722
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
Root directory content refactoring #1725
Merged
Merged
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
96d69cd
Root directory refactoring: - move info about Bootup Logo from a sepa…
ia 121a282
Scripts => scripts
ia 49366e4
Scripts -> scripts: re-add missing renamed files
ia f12a5f2
Merge branch 'dev' into root-dir
discip 7eb0380
Directories refactoring: add top-level Makefile, add scripts/deploy.s…
ia f022a15
Merge remote branch 'root-dir' into local branch 'root-dir' before push
ia d4f3e34
Merge branch 'dev' into 'root-dir' to sync changes before push for co…
ia 379be8b
Update scripts/deploy.sh accroding to codestyle syntax shellcheck
ia 96f5d89
Makefile: add docs-deploy target for mkdocs gh-deploy
ia d8dfb5e
Rename IronOS.yml > Env.yml, update related files
ia 0737e7c
Docs configs: remove empty characters
ia 43ab0d7
docs/devel: update usage of new script
ia File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
#!/usr/bin/env make | ||
# Root Makefile for IronOS - Soldering Iron Open Source Firmware Project | ||
|
||
|
||
### global adjustable variables | ||
|
||
# command for docker-compose tool | ||
ifndef DOCKER_COMPOSE | ||
DOCKER_COMPOSE:=docker-compose | ||
endif | ||
|
||
# command for python-based mkdocs tool | ||
ifndef MKDOCS | ||
MKDOCS:=mkdocs | ||
endif | ||
|
||
|
||
### global static variables | ||
|
||
# docker-related files | ||
DOCKER_YML=$(CURDIR)/IronOS.yml | ||
DOCKER_FILE=$(CURDIR)/scripts/IronOS.Dockerfile | ||
|
||
# docker dependencies | ||
DOCKER_DEPS=$(DOCKER_YML) $(DOCKER_FILE) | ||
|
||
# compose docker-compose command | ||
DOCKER_CMD=$(DOCKER_COMPOSE) -f $(DOCKER_YML) run --rm builder | ||
|
||
# MkDocs config | ||
MKDOCS_YML=$(CURDIR)/scripts/IronOS-mkdocs.yml | ||
|
||
|
||
### helper targets | ||
|
||
# former start_dev.sh | ||
docker-shell: $(DOCKER_DEPS) | ||
@$(DOCKER_CMD) | ||
|
||
# former build.sh | ||
docker-build: $(DOCKER_DEPS) | ||
@$(DOCKER_CMD) /bin/bash /build/ci/buildAll.sh | ||
|
||
# delete container | ||
docker-clean: | ||
-@docker rmi ironos-builder:latest | ||
|
||
# generate docs in site/ directory (DIR for -d is relative to mkdocs.yml file location, hence use default name/location site by setting up ../site) | ||
docs: $(MKDOCS_YML) Documentation/* Documentation/Flashing/* Documentation/images/* | ||
@$(MKDOCS) build -f $(MKDOCS_YML) -d ../site | ||
|
||
# pass-through target for Makefile inside source/ dir | ||
%: | ||
make -C source/ $@ | ||
|
||
# global clean-up target | ||
clean-full: docker-clean | ||
make -C source/ clean-all | ||
rm -Rf site | ||
rm -Rf scripts/ci/artefacts | ||
|
||
.PHONY: docker-shell docker-build docker-clean docs clean-full |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file was deleted.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While we are here, can we test for
docker-compose
and if its not here fall back todocker compose
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thoughtful suggestion. No problem, I will test & check how to make it in a more or less reliable way.