diff --git a/.gitignore b/.gitignore index 5b96d73..e6051a4 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,5 @@ node_modules/ /platforms/ # Build output -/output/ \ No newline at end of file +/output/ +/www/ \ No newline at end of file diff --git a/build-apk.sh b/build-apk.sh index 00071cf..3acb657 100755 --- a/build-apk.sh +++ b/build-apk.sh @@ -51,15 +51,20 @@ ext.postBuildExtras = { sed -i '' -e 's/org.apache.cordova.*;/com.vladstirbu.cordova.CordovaActivity;/g' platforms/android/app/src/main/java/su/viende/omori/MainActivity.java -mkdir -p output -echo "* Building english version..." -mv www.eng www -cordova build android --prod --release -mv www www.eng -mv platforms/android/app/build/outputs/apk/release/app-release.apk output/app-release-en.apk +build_variant() { + echo "* Setting up $1 version..." + rm -rf www + cp -r www.eng www + if [[ "$1" != "eng" ]]; then + cp -rf www.$1/* www + fi + python3 create_listing.py + echo "* Building $1 version..." + cordova build android --prod --release + mv platforms/android/app/build/outputs/apk/release/app-release.apk output/app-release-$1.apk +} -echo "* Building russian version..." -mv www.rus www -cordova build android --prod --release -mv www www.rus -mv platforms/android/app/build/outputs/apk/release/app-release.apk output/app-release-ru.apk \ No newline at end of file +mkdir -p output +build_variant "eng" +build_variant "rus" +build_variant "br" \ No newline at end of file diff --git a/debug-run.sh b/debug-run.sh index e6da120..abde80e 100755 --- a/debug-run.sh +++ b/debug-run.sh @@ -52,11 +52,22 @@ ext.postBuildExtras = { sed -i '' -e 's/org.apache.cordova.*;/com.vladstirbu.cordova.CordovaActivity;/g' platforms/android/app/src/main/java/su/viende/omori/MainActivity.java -LANG="rus" +build_variant() { + echo "* Setting up $1 version..." + rm -rf www + cp -r www.eng www + if [[ "$1" != "eng" ]]; then + cp -rf www.$1/* www + fi + python3 create_listing.py + echo "* Building $1 version..." + cordova build android +} + +VARIANT="eng" # eng/rus/br + +build_variant $VARIANT -mv www.$LANG www -cordova build android -mv www www.$LANG adb shell am force-stop su.viende.omori adb install platforms/android/app/build/outputs/apk/debug/app-debug.apk adb shell am start -n "su.viende.omori/su.viende.omori.MainActivity" \ No newline at end of file