[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - configure.ac ios/Mobile

[Libreoffice Gerrit user]

 configure.ac             |    9 +++++++++
 ios/Mobile/Info.plist.in |    2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 17d2fb47fd19e6e45c6710b9a3546d51ef63268f
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Sun Feb 24 14:44:06 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 4 15:38:40 2019 +0100

    Keep the iOS app bundle version in a file in the build folder, not in git
    
    When you want to build a new version for distribution, bump the
    build number in the BUNDLE-VERSION file.
    
    Change-Id: I1e7e55528aef6d3526ce14d070ae96abc5931f38
    Reviewed-on: https://gerrit.libreoffice.org/68318
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/configure.ac b/configure.ac
index b932f8909..37186b182 100644
--- a/configure.ac
+++ b/configure.ac
@@ -226,6 +226,7 @@ fi
 
 ENABLE_IOSAPP=
 MOBILE_APP_NAME="Mobile"
+IOSAPP_BUNDLE_VERSION=
 
 if test "$enable_iosapp" = "yes"; then
    ENABLE_IOSAPP=true
@@ -233,6 +234,13 @@ if test "$enable_iosapp" = "yes"; then
       MOBILE_APP_NAME="$with_iosapp_name"
    fi
 
+   if test -f BUNDLE-VERSION; then
+       IOSAPP_BUNDLE_VERSION=$(cat BUNDLE-VERSION)
+   else
+       IOSAPP_BUNDLE_VERSION=1
+   fi
+   echo $IOSAPP_BUNDLE_VERSION >BUNDLE-VERSION
+
    # When configuring for building the app itself, on macOS, we need
    # these. But not when just configuring for building the JS on
    # Linux, for copying over to the Mac.
@@ -280,6 +288,7 @@ fi
 AC_SUBST(ENABLE_IOSAPP)
 AM_CONDITIONAL([ENABLE_IOSAPP], [test "$ENABLE_IOSAPP" = "true"])
 AC_SUBST(MOBILE_APP_NAME)
+AC_SUBST(IOSAPP_BUNDLE_VERSION)
 
 ENABLE_GTKAPP=
 if test "$enable_gtkapp" = "yes"; then
diff --git a/ios/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in
index 7af589605..5dd1931e1 100644
--- a/ios/Mobile/Info.plist.in
+++ b/ios/Mobile/Info.plist.in
@@ -197,7 +197,7 @@
     <key>CFBundleShortVersionString</key>
     <string>0.1</string>
     <key>CFBundleVersion</key>
-    <string>12</string>
+    <string>@IOSAPP_BUNDLE_VERSION@</string>
     <key>LSRequiresIPhoneOS</key>
     <true/>
     <key>UIFileSharingEnabled</key>