lion/android-app
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: lion:f83bf386cddb981e4bcdc43d06acb436b784f58b
Branches Tags
lion:master
...
compare: lion:81f421b9c0798aafe149ae1ee1b9196bf55baaf6
Branches Tags
lion:master

2 commits
f83bf386cd ... 81f421b9c0

Author SHA1 Message Date
Alexander Mahr
81f421b9c0 add requirements to rules 2025-01-01 17:10:43 +01:00
Alexander Mahr
2787aee01a fix issue with wrapper discarding recipe failures 2025-01-01 17:04:25 +01:00
2 changed files with 9 additions and 3 deletions
Show stats Expand all files Collapse all files

5
app/Makefile
View file

@ -61,13 +61,14 @@ include Makefile.app-config
mkdir -p $@ mkdir -p $@
# install the necessary android sdks # install the necessary android sdks
./android-sdk/installed: app-config.sh ./android-sdk/installed: app-config.sh ./.Makefile.scripts/make--android-sdk.sh
./.Makefile.scripts/make--android-sdk.sh ./.Makefile.scripts/make--android-sdk.sh
# generate the AndroidManifest.xml # generate the AndroidManifest.xml
./AndroidManifest.xml: app-config.sh ./AndroidManifest.xml: app-config.sh ./.Makefile.scripts/make--AndroidManifest.xml
./.Makefile.scripts/make--AndroidManifest.xml ./.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 Makefile.app-config: app-config.sh Makefile
source app-config.sh; \ source app-config.sh; \
tee $@ << MAKEFILE_APP_CONFIG tee $@ << MAKEFILE_APP_CONFIG

7
build-android-app.sh
View file

@ -36,7 +36,11 @@ RUN <<EOF
cat > /bin/makefile-bash-wrapper.sh << 'WRAPPER' cat > /bin/makefile-bash-wrapper.sh << 'WRAPPER'
#!/bin/bash #!/bin/bash
printf $'\033[0;32m''#----------------------------------------\n'$'\033[0m' >&2 printf $'\033[0;32m''#----------------------------------------\n'$'\033[0m' >&2
bash "$@" bash -e "$@" || {
EXITCODE=$?
printf $'\033[0;31m''ERROR EXITCODE='"$EXITCODE"'\n'$'\033[0m' >&2
exit $EXITCODE
}
printf '\n\n\n\n' >&2 printf '\n\n\n\n' >&2
WRAPPER WRAPPER
chmod u+x /bin/makefile-bash-wrapper.sh chmod u+x /bin/makefile-bash-wrapper.sh
@ -44,6 +48,7 @@ EOF
DOCKERFILEEOF DOCKERFILEEOF
} }
printf $'\033[0;33m'"$(date -Iseconds) starting build"'$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n'$'\033[0m'
diff Dockerfile <(DockerfileContent) 2>/dev/null > /dev/null || { diff Dockerfile <(DockerfileContent) 2>/dev/null > /dev/null || {
test -f Dockerfile && { test -f Dockerfile && {
read -p 'reset/start Dockerfile[Y/n]' YES read -p 'reset/start Dockerfile[Y/n]' YES