From ae4e375c8ef6d0ec9d12baa971f4025537d42323 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Tue, 31 Dec 2019 19:52:28 +0200 Subject: [PATCH] Debian: updated postinstall script --- project/java/Settings.java | 7 ++++ .../xserver-debian/AndroidAppSettings.cfg | 4 +- .../AndroidData/overlay-x86_64.tar.xz | Bin 0 -> 12528 bytes .../xserver-debian/AndroidData/postinstall.sh | 39 +++--------------- .../application/xserver-debian/debian-image | 2 +- project/jni/application/xserver/.gitignore | 4 +- project/jni/application/xserver/gfx.c | 2 +- 7 files changed, 20 insertions(+), 38 deletions(-) create mode 100644 project/jni/application/xserver-debian/AndroidData/overlay-x86_64.tar.xz diff --git a/project/java/Settings.java b/project/java/Settings.java index 7fc8c4b4f..fb0be675f 100644 --- a/project/java/Settings.java +++ b/project/java/Settings.java @@ -75,6 +75,7 @@ import android.widget.Toast; import android.content.pm.PackageManager; import android.os.Build; import android.content.Intent; +import android.content.pm.PackageInfo; // TODO: too much code here, split into multiple files, possibly auto-generated menus? @@ -667,6 +668,12 @@ public class Settings try { nativeSetEnv( "ANDROID_APP_NAME", p.getString(p.getApplicationInfo().labelRes) ); } catch (Exception eeeeee) {} + try { + PackageInfo pInfo = p.getPackageManager().getPackageInfo(p.getPackageName(), 0); + nativeSetEnv( "ANDROID_PACKAGE_VERSION_NAME", pInfo.versionName ); + nativeSetEnv( "ANDROID_PACKAGE_VERSION_CODE", String.valueOf(pInfo.versionCode) ); + } catch (PackageManager.NameNotFoundException eeeeeeee) { + } Log.d("SDL", "libSDL: Is running on OUYA: " + p.isRunningOnOUYA()); if( p.isRunningOnOUYA() ) { diff --git a/project/jni/application/xserver-debian/AndroidAppSettings.cfg b/project/jni/application/xserver-debian/AndroidAppSettings.cfg index ff4b9f321..388d283c4 100644 --- a/project/jni/application/xserver-debian/AndroidAppSettings.cfg +++ b/project/jni/application/xserver-debian/AndroidAppSettings.cfg @@ -20,13 +20,13 @@ AppVersionName="19.12.24" # You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version for obb file # You can use .zip.xz archives for better compression, but you need to add 'lzma' to CompiledLibraries # Generate .zip.xz files like this: zip -0 -r data.zip your-data/* ; xz -8 data.zip -AppDataDownloadUrl="!!Library mapping|bin-map.zip^!!Data files|:data.tar.gz:data-2.tgz^!!Data files|:DroidSansMono.ttf:DroidSansMono.ttf^!!Postinstall script|:postinstall.sh:postinstall.sh^!!Loading image|:loading.gif:loading.gif" +AppDataDownloadUrl="!!Library mapping|bin-map.zip^!!Data files|:data.tar.gz:data-2.tgz^!!Data files|:DroidSansMono.ttf:DroidSansMono.ttf^!!Postinstall script|:postinstall.sh:postinstall.sh^!!Loading image|:loading.gif:loading.gif^!!System overlay|:overlay.tar.xz:overlay-.tar.xz" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y # Delete application data files when upgrading (specify file/dir paths separated by spaces) -DeleteFilesOnUpgrade="%" +DeleteFilesOnUpgrade="busybox usr tmp pulseaudio.conf libsdl-DownloadFinished-0.flag libsdl-DownloadFinished-1.flag libsdl-DownloadFinished-2.flag libsdl-DownloadFinished-3.flag libsdl-DownloadFinished-4.flag libsdl-DownloadFinished-5.flag" # Here you may type readme text, which will be shown during startup. Format is: # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/ diff --git a/project/jni/application/xserver-debian/AndroidData/overlay-x86_64.tar.xz b/project/jni/application/xserver-debian/AndroidData/overlay-x86_64.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..9190a1c2c07ac1a9e0fc6011e6fff7429424bf7c GIT binary patch literal 12528 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 MF)%PNutY`y0LW!K{Qv*} literal 0 HcmV?d00001 diff --git a/project/jni/application/xserver-debian/AndroidData/postinstall.sh b/project/jni/application/xserver-debian/AndroidData/postinstall.sh index 8903ef354..51b218672 100755 --- a/project/jni/application/xserver-debian/AndroidData/postinstall.sh +++ b/project/jni/application/xserver-debian/AndroidData/postinstall.sh @@ -1,40 +1,13 @@ #!/system/bin/sh +#OBB_VERSION=191224 +OBB_VERSION=$ANDROID_PACKAGE_VERSION_CODE + echo "Extracting data files" cd $SECURE_STORAGE_DIR -./busybox tar xzf $UNSECURE_STORAGE_DIR/data-1.tar.gz -rm -f $UNSECURE_STORAGE_DIR/data-1.tar.gz -ARCH=`getprop ro.product.cpu.abi` -echo "Detected architecture $ARCH" -# We only support armeabi-v7a and x86 -case $ARCH in - armeabi-v7a) - ;; - x86) - ;; - arm64-v8a) - ARCH=armeabi-v7a - ;; - arm64_v8a) - ARCH=armeabi-v7a - ;; - x86_64) - ARCH=x86 - ;; - x86-64) - ARCH=x86 - ;; - *) - echo "=== ERROR ERROR ERROR ===" - echo "Unsupported architecture: $ARCH" - sleep 10000 - exit 1 - ;; -esac -echo "Copying files for architecture $ARCH" -./busybox cp -af img-$ARCH/. img/ -echo "Removing files for other architectures" -./busybox rm -rf img-armeabi-v7a img-x86 +./busybox tar xvJf $ANDROID_OBB_DIR/main.$OBB_VERSION.$ANDROID_PACKAGE_NAME.obb +echo "Extracting overlay data files" +./busybox tar xvJf $DATADIR/overlay.tar.xz cd $SECURE_STORAGE_DIR/img echo "Installation path: $SECURE_STORAGE_DIR/img" ./postinstall.sh diff --git a/project/jni/application/xserver-debian/debian-image b/project/jni/application/xserver-debian/debian-image index 7adcd0b94..542f8256a 160000 --- a/project/jni/application/xserver-debian/debian-image +++ b/project/jni/application/xserver-debian/debian-image @@ -1 +1 @@ -Subproject commit 7adcd0b949a91b56d90062975f684d38463e39a8 +Subproject commit 542f8256ae540b058cf31e20a1875447f604c38b diff --git a/project/jni/application/xserver/.gitignore b/project/jni/application/xserver/.gitignore index 8b4cf3c1c..8faaf6159 100644 --- a/project/jni/application/xserver/.gitignore +++ b/project/jni/application/xserver/.gitignore @@ -1,3 +1,5 @@ *.o -AndroidData/binaries-* tmp-* +/AndroidData/binaries-* +/AndroidData/bin-map.zip +/AndroidData/lib diff --git a/project/jni/application/xserver/gfx.c b/project/jni/application/xserver/gfx.c index 360ddb305..e7fe2e6f5 100644 --- a/project/jni/application/xserver/gfx.c +++ b/project/jni/application/xserver/gfx.c @@ -237,7 +237,7 @@ static int unpackFiles(const char *archive, const char *script, const char *dele break; if( strchr(buf, '\n') != NULL ) strchr(buf, '\n')[0] = 0; - __android_log_print(ANDROID_LOG_INFO, "XSDL", "> %s", buf); + __android_log_print(ANDROID_LOG_VERBOSE, "XSDL", "> %s", buf); strncpy(unpackLog[3], unpackLog[2], sizeof(unpackLog[0]) - 4); strncpy(unpackLog[2], unpackLog[1], sizeof(unpackLog[0]) - 4); strncpy(unpackLog[1], unpackLog[0], sizeof(unpackLog[0]) - 4);