Compare commits
No commits in common. "81f421b9c0798aafe149ae1ee1b9196bf55baaf6" and "f83bf386cddb981e4bcdc43d06acb436b784f58b" have entirely different histories.
81f421b9c0
...
f83bf386cd
2 changed files with 3 additions and 9 deletions
|
@ -61,14 +61,13 @@ include Makefile.app-config
|
|||
mkdir -p $@
|
||||
|
||||
# install the necessary android sdks
|
||||
./android-sdk/installed: app-config.sh ./.Makefile.scripts/make--android-sdk.sh
|
||||
./android-sdk/installed: app-config.sh
|
||||
./.Makefile.scripts/make--android-sdk.sh
|
||||
|
||||
# generate the AndroidManifest.xml
|
||||
./AndroidManifest.xml: app-config.sh ./.Makefile.scripts/make--AndroidManifest.xml
|
||||
./AndroidManifest.xml: app-config.sh
|
||||
./.Makefile.scripts/make--AndroidManifest.xml
|
||||
|
||||
# !!this step (when/if) run will trigger a restart of the "make" as the rules tartget is included
|
||||
Makefile.app-config: app-config.sh Makefile
|
||||
source app-config.sh; \
|
||||
tee $@ << MAKEFILE_APP_CONFIG
|
||||
|
|
|
@ -36,11 +36,7 @@ RUN <<EOF
|
|||
cat > /bin/makefile-bash-wrapper.sh << 'WRAPPER'
|
||||
#!/bin/bash
|
||||
printf $'\033[0;32m''#----------------------------------------\n'$'\033[0m' >&2
|
||||
bash -e "$@" || {
|
||||
EXITCODE=$?
|
||||
printf $'\033[0;31m''ERROR EXITCODE='"$EXITCODE"'\n'$'\033[0m' >&2
|
||||
exit $EXITCODE
|
||||
}
|
||||
bash "$@"
|
||||
printf '\n\n\n\n' >&2
|
||||
WRAPPER
|
||||
chmod u+x /bin/makefile-bash-wrapper.sh
|
||||
|
@ -48,7 +44,6 @@ EOF
|
|||
DOCKERFILEEOF
|
||||
}
|
||||
|
||||
printf $'\033[0;33m'"$(date -Iseconds) starting build"'$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n'$'\033[0m'
|
||||
diff Dockerfile <(DockerfileContent) 2>/dev/null > /dev/null || {
|
||||
test -f Dockerfile && {
|
||||
read -p 'reset/start Dockerfile[Y/n]' YES
|
||||
|
|
Loading…
Add table
Reference in a new issue