miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix indentation

Browse Source 
Add .editorconfig to easily enforce indentation rules
This commit is contained in:
Miguel Horta
2022-04-17 14:43:04 +01:00
committed by pelya
parent b8337a5253
commit 2e44deacdf
2 changed files with 47 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.editorconfig Normal file
View File

@@ -0,0 +1,7 @@
root = true
[*]
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = tab
charset = utf-8

78
build.sh
View File

@@ -13,18 +13,18 @@ build_release=true
# Check environment before continuing # Check environment before continuing
if ! $(which adb zipalign apksigner jarsigner ndk-build java cmake > /dev/null); then if ! $(which adb zipalign apksigner jarsigner ndk-build java cmake > /dev/null); then
echo "One of the follow binaries is missing. Check your environment"; echo "One of the follow binaries is missing. Check your environment";
echo "adb arch zipalign apksigner jarsigner ndk-build java cmake"; echo "adb arch zipalign apksigner jarsigner ndk-build java cmake";
exit 1; exit 1;
fi fi
JAVA_MVERSION=$(java --version 2>&1 | awk 'NR == 1{print $2}' | awk -F . '{print $1}') JAVA_MVERSION=$(java --version 2>&1 | awk 'NR == 1{print $2}' | awk -F . '{print $1}')
if [ $JAVA_MVERSION -lt 11 ]; then if [ $JAVA_MVERSION -lt 11 ]; then
echo "Java version equal or above to 11 necessary."; echo "Java version equal or above to 11 necessary.";
exit 2; exit 2;
if [ $JAVA_MVERSION -gt 11 ]; then if [ $JAVA_MVERSION -gt 11 ]; then
echo "Java 11 version is strongly recomended."; echo "Java 11 version is strongly recomended.";
fi fi
fi fi
while getopts "sirqbh" OPT while getopts "sirqbh" OPT
@@ -75,23 +75,23 @@ if [ "$#" -gt 0 ]; then
echo "$f" echo "$f"
fi fi
done done
popd popd
exit 1 exit 1
fi fi
shift shift
fi fi
if ! [ -e project/local.properties ] && \ if ! [ -e project/local.properties ] && \
grep "package $(grep -Po 'AppFullName\=\K[.[:alnum:]]+' AndroidAppSettings.cfg);" project/src/Globals.java > /dev/null 2>&1 && \ grep "package $(grep -Po 'AppFullName\=\K[.[:alnum:]]+' AndroidAppSettings.cfg);" project/src/Globals.java > /dev/null 2>&1 && \
[ "$(readlink AndroidAppSettings.cfg)" -ot "project/src/Globals.java" ] && \ [ "$(readlink AndroidAppSettings.cfg)" -ot "project/src/Globals.java" ] && \
[ -z "$(find project/java/* \ [ -z "$(find project/java/* \
project/javaSDL2/* \ project/javaSDL2/* \
project/jni/sdl2/android-project/app/src/main/java/org/libsdl/app/* \ project/jni/sdl2/android-project/app/src/main/java/org/libsdl/app/* \
project/AndroidManifestTemplate.xml \ project/AndroidManifestTemplate.xml \
-cnewer \ -cnewer \
project/src/Globals.java \ project/src/Globals.java \
)" )"
]; ];
then then
./changeAppSettings.sh -a ./changeAppSettings.sh -a
sleep 1 sleep 1
@@ -103,7 +103,7 @@ if [ -z "$NCPU" ]; then
NCPU=8 NCPU=8
if uname -s | grep -i "linux" > /dev/null ; then if uname -s | grep -i "linux" > /dev/null ; then
MYARCH=linux-x86_64 MYARCH=linux-x86_64
NCPU=$(cat /proc/cpuinfo | grep -c -i processor) NCPU=$(cat /proc/cpuinfo | grep -c -i processor)
fi fi
if uname -s | grep -i "darwin" > /dev/null ; then if uname -s | grep -i "darwin" > /dev/null ; then
MYARCH=darwin-x86_64 MYARCH=darwin-x86_64
@@ -115,7 +115,9 @@ fi
export BUILD_NUM_CPUS=$NCPU export BUILD_NUM_CPUS=$NCPU
# Fix Gradle compilation error # Fix Gradle compilation error
[ -z "$ANDROID_NDK_HOME" ] && export ANDROID_NDK_HOME="$(which ndk-build | sed 's@/ndk-build@@')" if [ -z "$ANDROID_NDK_HOME" ]; then
export ANDROID_NDK_HOME="$(which ndk-build | sed 's@/ndk-build@@')"
fi
if [ -x project/jni/application/src/AndroidPreBuild.sh ]; then if [ -x project/jni/application/src/AndroidPreBuild.sh ]; then
pushd project/jni/application/src pushd project/jni/application/src
@@ -132,12 +134,12 @@ ndk-build -C project -j$NCPU V=1 NDK_APP_STRIP_MODE=none
./copyAssets.sh ./copyAssets.sh
pushd project pushd project
if $build_release ; then if $build_release ; then
./gradlew assembleRelease ./gradlew assembleRelease
if [ ! -x jni/application/src/AndroidPostBuild.sh ]; then if [ ! -x jni/application/src/AndroidPostBuild.sh ]; then
pushd jni/application/src pushd jni/application/src
./AndroidPostBuild.sh ${THIS_BUILD_DIR}/project/app/build/outputs/apk/release/app-release-unsigned.apk ./AndroidPostBuild.sh ${THIS_BUILD_DIR}/project/app/build/outputs/apk/release/app-release-unsigned.apk
popd popd
fi fi
../copyAssets.sh pack-binaries app/build/outputs/apk/release/app-release-unsigned.apk ../copyAssets.sh pack-binaries app/build/outputs/apk/release/app-release-unsigned.apk
rm -f app/build/outputs/apk/release/app-release.apk rm -f app/build/outputs/apk/release/app-release.apk
zipalign -p 4 app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/app-release.apk zipalign -p 4 app/build/outputs/apk/release/app-release-unsigned.apk app/build/outputs/apk/release/app-release.apk
@@ -145,10 +147,10 @@ if $build_release ; then
else else
./gradlew assembleDebug ./gradlew assembleDebug
if [ ! -x jni/application/src/AndroidPostBuild.sh ]; then if [ ! -x jni/application/src/AndroidPostBuild.sh ]; then
pushd jni/application/src pushd jni/application/src
./AndroidPostBuild.sh ${THIS_BUILD_DIR}/project/app/build/outputs/apk/debug/app-debug.apk ./AndroidPostBuild.sh ${THIS_BUILD_DIR}/project/app/build/outputs/apk/debug/app-debug.apk
popd popd
fi fi
mkdir -p app/build/outputs/apk/release mkdir -p app/build/outputs/apk/release
../copyAssets.sh pack-binaries app/build/outputs/apk/debug/app-debug.apk ../copyAssets.sh pack-binaries app/build/outputs/apk/debug/app-debug.apk
rm -f app/build/outputs/apk/release/app-release.apk rm -f app/build/outputs/apk/release/app-release.apk
@@ -157,28 +159,28 @@ else
fi fi
if $sign_apk; then if $sign_apk; then
pushd .. pushd ..
./sign.sh ./sign.sh
popd popd
fi fi
if $sign_bundle; then if $sign_bundle; then
pushd .. pushd ..
./signBundle.sh ./signBundle.sh
popd popd
fi fi
if $install_apk && [ -n "$(adb devices | tail -n +2)" ]; then if $install_apk && [ -n "$(adb devices | tail -n +2)" ]; then
if $sign_apk; then if $sign_apk; then
APPNAME=$(grep AppName ../AndroidAppSettings.cfg | sed 's/.*=//' | tr -d '"' | tr " '/" '---') APPNAME=$(grep AppName ../AndroidAppSettings.cfg | sed 's/.*=//' | tr -d '"' | tr " '/" '---')
APPVER=$(grep AppVersionName ../AndroidAppSettings.cfg | sed 's/.*=//' | tr -d '"' | tr " '/" '---') APPVER=$(grep AppVersionName ../AndroidAppSettings.cfg | sed 's/.*=//' | tr -d '"' | tr " '/" '---')
adb install -r ../$APPNAME-$APPVER.apk ; adb install -r ../$APPNAME-$APPVER.apk ;
else else
adb install -r app/build/outputs/apk/release/app-release.apk adb install -r app/build/outputs/apk/release/app-release.apk
fi fi
fi fi
if $run_apk; then if $run_apk; then
ActivityName="$(grep AppFullName ../AndroidAppSettings.cfg | sed 's/.*=//')/.MainActivity" ActivityName="$(grep AppFullName ../AndroidAppSettings.cfg | sed 's/.*=//')/.MainActivity"
RUN_APK="adb shell am start -n $ActivityName" RUN_APK="adb shell am start -n $ActivityName"
echo "Running $ActivityName on the USB-connected device:" echo "Running $ActivityName on the USB-connected device:"
echo "$RUN_APK" echo "$RUN_APK"