diff --git a/contrib/mobile/Android/AndroidManifest.xml b/contrib/mobile/Android/AndroidManifest.xml index 3e5ec6e958d3bd1ba6a8b167824954aa3fd89c5e..707c13d327a3c5c7b924837f090683d95f4784a0 100644 --- a/contrib/mobile/Android/AndroidManifest.xml +++ b/contrib/mobile/Android/AndroidManifest.xml @@ -1,6 +1,6 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geuz.onelab" - android:versionCode="13" + android:versionCode="14" android:versionName="1.2.0" android:installLocation="auto" > diff --git a/contrib/mobile/utils/android_build.sh b/contrib/mobile/utils/android_build.sh index 57f6360dbd3accd4dc951b4319cebce7de0344ea..ded400061e6d9c68b52c8873c2409f098f91bbc8 100755 --- a/contrib/mobile/utils/android_build.sh +++ b/contrib/mobile/utils/android_build.sh @@ -80,12 +80,16 @@ if [ $# -eq 1 ] ; then # change package name rm -rf src/org/geuz/$appname mv src/org/geuz/onelab/ src/org/geuz/$appname + # Gmsh.java and StringTexture.java are accessed from C++ as onelab packages mkdir src/org/geuz/onelab mv src/org/geuz/$appname/Gmsh.java src/org/geuz/onelab + mv src/org/geuz/$appname/StringTexture.java src/org/geuz/onelab sed -e "s/org\.geuz\.onelab/org\.geuz\.$appname/g" -i "" AndroidManifest.xml - find . -type f -name '*.java' -not -name 'Gmsh.java' -exec sed -e "s/package org\.geuz\.onelab/package org\.geuz\.$appname/g" -i "" {} \; + find src/org/geuz/$appname -type f -name '*.java' -exec sed -e "s/package org\.geuz\.onelab/package org\.geuz\.$appname/g" -i "" {} \; + find res -type f -name '*.xml' -exec sed -e "s/org\.geuz\.onelab/org\.geuz\.$appname/g" -i "" {} \; # change app name and icons sed -e "s/Onelab/$appname/" -i "" res/values/strings.xml + sed -e "s/Onelab\/Mobile/$appname/" -i "" src/org/geuz/$appname/AboutActivity.java cp $HOME/tex/proposals/bbemg/icons/bbemg-logo-128x128.png res/drawable-hdpi/ic_launcher.png cp $HOME/tex/proposals/bbemg/icons/bbemg-logo-64x64.png res/drawable-mdpi/ic_launcher.png cp $HOME/tex/proposals/bbemg/icons/bbemg-logo-48x48.png res/drawable-ldpi/ic_launcher.png