configure.ac | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
New commits:
commit 814a0c49ef0d1a5b64b1dcda42578a479170a6d2
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Tue Dec 3 12:48:32 2019 +0100
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Tue Dec 3 14:52:00 2019 +0100
android: Allow full version specification.
Change-Id: I2da4a7d1fc63cfd0df10a7e32f123af82e8be461
Reviewed-on: https://gerrit.libreoffice.org/84329
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/configure.ac b/configure.ac
index 2aaf5c96f..04c2e1816 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,24 @@ m4_if(m4_esyscmd_s([uname
-s]),Linux,[],[m4_define([PKG_CHECK_MODULES],[])])
LOOLWSD_VERSION_MAJOR=`echo $VERSION | awk -F. '{print $1}'`
LOOLWSD_VERSION_MINOR=`echo $VERSION | awk -F. '{print $2}'`
LOOLWSD_VERSION_MICRO=`echo $VERSION | awk -F. '{print $3}'`
+
+ANDROID_PACKAGE_VERSIONCODE=
+if test "$enable_androidapp" = "yes"; then
+ AC_MSG_CHECKING([for Android package versionCode])
+ if test -z "$with_android_package_versioncode" -o
"$with_android_package_versioncode" = "no"; then
+ ANDROID_PACKAGE_VERSIONCODE="1"
+ AC_MSG_RESULT([not set, using $ANDROID_PACKAGE_VERSIONCODE])
+ else
+ LOOLWSD_VERSION_MAJOR=`echo $with_android_package_versioncode | awk
-F. '{print $1}'`
+ LOOLWSD_VERSION_MINOR=`echo $with_android_package_versioncode | awk
-F. '{print $2}'`
+ LOOLWSD_VERSION_MICRO=`echo $with_android_package_versioncode | awk
-F. '{print $3}' | awk -F- '{print $1}'`
+
+ ANDROID_PACKAGE_VERSIONCODE=`echo $with_android_package_versioncode |
awk -F- '{print $2}'`
+ AC_MSG_RESULT([$ANDROID_PACKAGE_VERSIONCODE])
+ fi
+fi
+AC_SUBST(ANDROID_PACKAGE_VERSIONCODE)
+
LOOLWSD_VERSION="$LOOLWSD_VERSION_MAJOR.$LOOLWSD_VERSION_MINOR.$LOOLWSD_VERSION_MICRO"
AC_SUBST([LOOLWSD_VERSION_MAJOR])
@@ -116,7 +134,7 @@ AC_ARG_WITH(android-package-name,
,)
AC_ARG_WITH(android-package-versioncode,
- AS_HELP_STRING([--with-android-package-versioncode=20],
+ AS_HELP_STRING([--with-android-package-versioncode=6.7.8-23],
[Set the versionCode for the Android package.]),
,)
@@ -357,7 +375,6 @@ AC_SUBST(LOKIT_PATH)
ENABLE_ANDROIDAPP=
ANDROID_PACKAGE_NAME=
-ANDROID_PACKAGE_VERSIONCODE=
if test "$enable_androidapp" = "yes"; then
ENABLE_ANDROIDAPP=true
@@ -369,20 +386,10 @@ if test "$enable_androidapp" = "yes"; then
ANDROID_PACKAGE_NAME="$with_android_package_name"
AC_MSG_RESULT([$ANDROID_PACKAGE_NAME])
fi
-
- AC_MSG_CHECKING([for Android package versionCode])
- if test -z "$with_android_package_versioncode" -o
"$with_android_package_versioncode" = "no"; then
- ANDROID_PACKAGE_VERSIONCODE="1"
- AC_MSG_RESULT([not set, using $ANDROID_PACKAGE_VERSIONCODE])
- else
- ANDROID_PACKAGE_VERSIONCODE="$with_android_package_versioncode"
- AC_MSG_RESULT([$ANDROID_PACKAGE_VERSIONCODE])
- fi
fi
AC_SUBST(ENABLE_ANDROIDAPP)
AM_CONDITIONAL([ENABLE_ANDROIDAPP], [test "$ENABLE_ANDROIDAPP" = "true"])
AC_SUBST(ANDROID_PACKAGE_NAME)
-AC_SUBST(ANDROID_PACKAGE_VERSIONCODE)
APP_NAME="LibreOffice Online"
if test -n "$with_app_name"; then
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
