mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Docker Build Changes.

Browse source 
Signed-off-by: Michael Keller <github@ike.ch>
This commit is contained in:
Michael Keller 2024-01-05 16:19:28 +13:00
parent 6f260bdfaf
commit 1eed75c599
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/android/README.md
View file

@ -19,7 +19,7 @@ CONTAINER_ID=$(docker container ls -a -q -f name=${CONTAINER_NAME})
# Create the image if it does not exist
if [[ -z "${CONTAINER_ID}" ]]; then
docker create -v ${SUBSURFACE_ROOT}:/android/subsurface --name=${CONTAINER_NAME} subsurface/android-build:5.15.1 sleep infinity
docker create -v ${SUBSURFACE_ROOT}:/android/subsurface --name=${CONTAINER_NAME} subsurface/android-build:5.15.2 sleep infinity
fi
docker start ${CONTAINER_NAME}

34
packaging/android/qmake-build.sh
View file

@ -21,15 +21,6 @@ popd
# is this a release or debug build
BUILD_TYPE=Debug
# and now we need a monotonic build number...
if [ ! -f ./buildnr.dat ] ; then
BUILDNR=0
else
BUILDNR=$(cat ./buildnr.dat)
fi
BUILDNR=$((BUILDNR+1))
echo "${BUILDNR}" > ./buildnr.dat
# Read build variables
source $SUBSURFACE_SOURCE/packaging/android/variables.sh
@ -80,6 +71,17 @@ while [ "$#" -gt 0 ] ; do
esac
done
if [ -z "${BUILDNR+X}" ] ; then
# we need a monotonic build number...
if [ ! -f ./buildnr.dat ] ; then
BUILDNR=0
else
BUILDNR=$(cat ./buildnr.dat)
fi
BUILDNR=$((BUILDNR+1))
fi
echo "${BUILDNR}" > ./buildnr.dat
mkdir -p "$BUILDROOT"/subsurface-mobile-build
pushd "$BUILDROOT"/subsurface-mobile-build
@ -409,17 +411,15 @@ APK_DIR=$(dirname ${APK})
APK_FILE=$(basename ${APK})
pushd ${APK_DIR}
if [ -n "${KEYSTORE_STRING+X}" ] ; then
# Generate the string to be supplied to the script with 'openssl base64 < subsurface.keystore | tr -d '\n''
set +x
echo ${KEYSTORE_STRING} | base64 -di > /tmp/subsurface.keystore
set -x
if [ -n "${KEYSTORE_FILE+X}" -a -n "${KEYSTORE_PASSWORD+X}" ]; then
APKSIGNER_PARAMS=""
if [ -n "${KEYSTORE_ALIAS+X}" ]; then
APKSIGNER_PARAMS="${APKSIGNER_PARAMS} --ks-key-alias ${KEYSTORE_ALIAS}"
fi
zip -d ${APK_FILE} 'META-INF/*.SF' 'META-INF/*.RSA'
${BUILDROOT}/build-tools/29.0.3/zipalign -p 4 ${APK_FILE} $(basename ${APK_FILE} .apk)-aligned.apk
${BUILDROOT}/build-tools/29.0.3/apksigner sign -ks /tmp/subsurface.keystore -ks-pass pass:nopass -in $(basename ${APK_FILE} .apk)-aligned.apk -out Subsurface-mobile-"${CANONICALVERSION}".apk
rm /tmp/subsurface.keystore
${BUILDROOT}/build-tools/29.0.3/apksigner sign -ks ${KEYSTORE_FILE} -ks-pass ${KEYSTORE_PASSWORD} ${APKSIGNER_PARAMS} -in $(basename ${APK_FILE} .apk)-aligned.apk -out Subsurface-mobile-"${CANONICALVERSION}".apk
else
mv ${APK_FILE} Subsurface-mobile-"${CANONICALVERSION}".apk
fi