[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - autogen.sh distro-configs/CPAndroidAarch64.conf distro-configs/CPAndroidBranding.conf distro-configs/CPAndroid.conf

[Jan Holesovsky (via logerrit)]

 autogen.sh                            |    7 +++++++
 distro-configs/CPAndroid.conf         |    4 ++++
 distro-configs/CPAndroidAarch64.conf  |    4 ++++
 distro-configs/CPAndroidBranding.conf |   12 ++++++++++++
 4 files changed, 27 insertions(+)

New commits:
commit 8dd75f47d9d571ed557fd360b8f9ff7aaca335af
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue Feb 11 12:02:40 2020 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Feb 11 13:49:30 2020 +0100

    Introduce INCLUDE: in the distro-configs...
    
    ...to be able to have a common base for things, and then apply some
    additional stuff on top - in this case the Android branding for the CP
    builds.
    
    Change-Id: I43118bba84fddb8508cc4688c83c2d81a103d781
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88440
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/autogen.sh b/autogen.sh
index 8c0bb0ade4ba..8a8f4c51b578 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -90,6 +90,13 @@ sub read_args($)
                     print STDERR "  $opt\n";
                 }
             }
+        } elsif ( /^INCLUDE:(.*)/ ) {
+            # include another .conf into this one
+            my $config = "$src_path/distro-configs/$1.conf";
+            if (! -f $config) {
+                invalid_distro ($config, $1);
+            }
+            push @lst, read_args ($config);
         } elsif ( substr($_, 0, 1) eq "#" ) {
             # comment
         } elsif ( length == 0 ) {
diff --git a/distro-configs/CPAndroid.conf b/distro-configs/CPAndroid.conf
new file mode 100644
index 000000000000..5aaeabedc03c
--- /dev/null
+++ b/distro-configs/CPAndroid.conf
@@ -0,0 +1,4 @@
+# Use LibreOfficeAndroid.conf as the base
+INCLUDE:LibreOfficeAndroid
+# Add the CP stuff
+INCLUDE:CPAndroidBranding
diff --git a/distro-configs/CPAndroidAarch64.conf b/distro-configs/CPAndroidAarch64.conf
new file mode 100644
index 000000000000..5cef2d518cd1
--- /dev/null
+++ b/distro-configs/CPAndroidAarch64.conf
@@ -0,0 +1,4 @@
+# Use LibreOfficeAndroidAarch64.conf as the base
+INCLUDE:LibreOfficeAndroidAarch64
+# Add the CP stuff
+INCLUDE:CPAndroidBranding
diff --git a/distro-configs/CPAndroidBranding.conf b/distro-configs/CPAndroidBranding.conf
new file mode 100644
index 000000000000..7c2f898b4105
--- /dev/null
+++ b/distro-configs/CPAndroidBranding.conf
@@ -0,0 +1,12 @@
+# CP specific stuff
+--build=x86_64-unknown-linux-gnu
+--disable-odk
+--enable-android-lok
+--with-android-api-level=21
+--with-android-package-name=com.collabora.libreoffice
+--with-vendor=Collabora
+--disable-scripting-beanshell
+--disable-scripting-javascript
+--with-lang=de en-US es pt-BR
+--with-myspell-dicts
+--enable-release-build