diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2020-02-11 12:02:40 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2020-02-11 20:25:32 +0100 |
| commit | b412daf79f2df41f88c6eacd09f3924e376ddec2 (patch) | |
| tree | b0b94adb01cebf6ff13c0b7655a952423a48dbc4 | |
| parent | 38ef425f04ec518cbe7785f88267e25d94b803dc (diff) | |
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@collabora.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit 8dd75f47d9d571ed557fd360b8f9ff7aaca335af)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88400
Tested-by: Jenkins
| -rwxr-xr-x | autogen.sh | 7 | ||||
| -rw-r--r-- | distro-configs/CPAndroid.conf | 4 | ||||
| -rw-r--r-- | distro-configs/CPAndroidAarch64.conf | 4 | ||||
| -rw-r--r-- | distro-configs/CPAndroidBranding.conf | 12 |
4 files changed, 27 insertions, 0 deletions
diff --git a/autogen.sh b/autogen.sh index 10bdffe610e2..49835ff27e25 100755 --- a/autogen.sh +++ b/autogen.sh @@ -84,6 +84,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 |