Use variables to allow overriding build tools #108
Conversation
dylanmccall
force-pushed
the
add-tool-variables
branch
from
0a951e3 to
150ea59
Compare
|
|
||
| # Run the docker image. | ||
| # TODO Would be better to just specify the file here? | ||
| run_docker: build_docker | ||
| ./scripts/rundocker.sh | ||
| env DOCKER="$(DOCKER)" ./scripts/rundocker.sh |
There was a problem hiding this comment.
Equivalently, you can export DOCKER where it's set above like you would in a shell script. Otherwise this is basically the same as what I have locally to allow DOCKER=podman. I kind of like the export approach so you don't have to think about the places you want to pass it down, but there aren't many places it happens here so probably not a big deal.
| @@ -21,6 +21,11 @@ ANDROIDNDKVER := 21.4.7075529 | |||
|
|
|||
| SDK := ${ANDROID_HOME}/android-sdk-$(PLATFORM) | |||
|
|
|||
| ADB := adb | |||
| DOCKER := docker | |||
There was a problem hiding this comment.
Since we're handling DOCKER as an environment variable and not just a make variable, I think it might be nice to change this to DOCKER ?= docker. Then you could do export DOCKER=podman in your shell and not have to pass it in every time.
| @@ -68,7 +73,7 @@ src/kolibri: clean | |||
|
|
|||
| .PHONY: p4a_android_distro | |||
| p4a_android_distro: needs-android-dirs | |||
| p4a create --arch=$(P4A_ARCH) | |||
| $(P4A) create --arch=$(P4A_ARCH) | |||
There was a problem hiding this comment.
You missed a couple of instances of p4a below.
In particular, this is useful for a situation where we want to use podman instead of docker, or where adb is not in $PATH.
dbnicholson
force-pushed
the
add-tool-variables
branch
from
150ea59 to
ad389de
Compare
In particular, this is useful for a situation where we want to use
podmaninstead ofdocker, or whereadbis not in$PATH.