-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #230 from acrellin/makefile_patch
Update Makefile to use newly included `baselayer` targets
- Loading branch information
Showing
2 changed files
with
5 additions
and
35 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,15 @@ | ||
| .DEFAULT_GOAL := run | ||
|
|
||
| baselayer/README.md: | ||
| -include baselayer/Makefile # always clone baselayer if it doesn't exist | ||
|
|
||
| baselayer/Makefile: | ||
| git submodule update --init --remote | ||
| $(MAKE) baselayer-update | ||
|
|
||
| .PHONY: baselayer-update run log | ||
| .PHONY: baselayer-update | ||
| baselayer-update: | ||
| ./baselayer/tools/submodule_update.sh | ||
|
|
||
| log: | ||
| make -C baselayer log | ||
|
|
||
| run: | ||
| make -C baselayer run | ||
|
|
||
| run_testing: | ||
| make -C baselayer run_testing | ||
|
|
||
| run_production: | ||
| make -C baselayer run_production | ||
|
|
||
| test: | ||
| make -C baselayer test | ||
|
|
||
| test_headless: | ||
| make -C baselayer test_headless | ||
|
|
||
| db_init: | ||
| make -C baselayer db_init | ||
|
|
||
| db_clear: | ||
| make -C baselayer db_clear | ||
|
|
||
| attach: | ||
| make -C baselayer attach | ||
|
|
||
| clean: | ||
| make -C baselayer clean | ||
|
|
||
| docker-images: | ||
| # Add --no-cache flag to rebuild from scratch | ||
| docker build -t cesium/web . && docker push cesium/web | ||
|
|
||
| -include "baselayer/README.md" # always clone baselayer if it doesn't exist |
Submodule baselayer
updated
24 files
| +53 −0 | .eslintrc.yaml | |
| +25 −0 | .git-pre-commit | |
| +5 −0 | .travis.yml | |
| +13 −0 | .travis/deploy_docs.sh | |
| +6 −3 | .travis/travis_script.sh | |
| +68 −26 | Makefile | |
| +1 −33 | README.md | |
| +1 −2 | app/json_util.py | |
| +4 −5 | app/test_util.py | |
| +3 −5 | config.yaml.defaults | |
| +196 −0 | doc/Makefile | |
| +311 −0 | doc/conf.py | |
| +59 −0 | doc/dev.md | |
| +17 −0 | doc/index.rst | |
| +43 −0 | doc/setup.md | |
| +13 −0 | doc/usage.md | |
| +1 −0 | github_deploy_key.enc | |
| +5 −0 | requirements.docs.txt | |
| +1 −1 | services/app.py | |
| +85 −0 | static/js/API.js | |
| +68 −0 | tools/check_app_environment.py | |
| +1 −1 | tools/env_summary.py | |
| +21 −0 | tools/makefile_to_help.py | |
| +1 −1 | tools/test_frontend.py |