[Libreoffice-commits] core.git: distro-configs/LibreOfficeWASM32.conf README.wasm

[Thorsten Behrens (via logerrit)]

 README.wasm                           |   46 ++++++++--------------------------
 distro-configs/LibreOfficeWASM32.conf |   31 ++++++++++++++++++++++
 2 files changed, 43 insertions(+), 34 deletions(-)

New commits:
commit d7e5d19e4617e41765db758778503501bfa8fdcf
Author:     Thorsten Behrens <thorsten.behrens at allotropia.de>
AuthorDate: Sun Apr 25 16:02:10 2021 +0200
Commit:     Thorsten Behrens <thorsten.behrens at allotropia.de>
CommitDate: Wed May 5 21:16:02 2021 +0200

    WASM: add distro config, amend readme
    
    Let's move common configury to distro config, so people get
    necessary changes across updates w/o manual intervention.
    
    Change-Id: Ic27db86e7681bcef0632ed6b5fdd2fe8df0fdba3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114629
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <thorsten.behrens at allotropia.de>

diff --git a/README.wasm b/README.wasm
index 53774549a46c..a09d4d61762c 100644
--- a/README.wasm
+++ b/README.wasm
@@ -74,43 +74,21 @@ autogen.sh is patched to use emconfigure. That basically sets various environmen
 especially EMMAKEN_JUST_CONFIGURE, which will create the correct output file names, checked by
 configure (a.out).
 
+There's a distro config for WASM (work in progress), that gets your
+defaults right (and currently disables a ton of 3rd party stuff which
+is not essential).
+
+Recommended configure setup is thusly:
+
+# grab defaults
+--with-distro=LibreOfficeWASM32
+
+# local config
 QT5DIR=/dir/of/git_qt5/qtbase
 
---host=wasm64-local-emscripten
---disable-coinmp
---disable-cups
---disable-dbus
---disable-dconf
---disable-dynamic-loading
---disable-extension-integration
---disable-extensions
---disable-extension-update
---disable-firebird-sdbc
---disable-gio
---disable-gstreamer-1-0
---disable-ldap
---disable-lpsolve
---disable-mariadb-sdbc
---disable-nss
---disable-odk
---disable-online-update
---disable-opencl
---disable-pdfimport
---disable-postgresql-sdbc
---disable-python
---disable-randr
---disable-report-builder
---disable-scripting
---disable-sdremote-bluetooth
+# if you want to use ccache on both sides of the build
+--with-build-platform-configure-options=--enable-ccache
 --enable-ccache
---without-helppack-integration
---without-java
---without-junit
---without-system-dicts
---with-fonts
---with-theme=no
-
-Many will also be encoded in configure.ac at some point, some already is.
 
 
 == Using Docker to cross-build with emscripten ==
diff --git a/distro-configs/LibreOfficeWASM32.conf b/distro-configs/LibreOfficeWASM32.conf
new file mode 100644
index 000000000000..b07419ba2e21
--- /dev/null
+++ b/distro-configs/LibreOfficeWASM32.conf
@@ -0,0 +1,31 @@
+--host=wasm32-local-emscripten
+--disable-coinmp
+--disable-cups
+--disable-dbus
+--disable-dconf
+--disable-dynamic-loading
+--disable-extension-integration
+--disable-extensions
+--disable-extension-update
+--disable-firebird-sdbc
+--disable-gio
+--disable-gstreamer-1-0
+--disable-ldap
+--disable-lpsolve
+--disable-mariadb-sdbc
+--disable-nss
+--disable-odk
+--disable-online-update
+--disable-opencl
+--disable-pdfimport
+--disable-postgresql-sdbc
+--disable-python
+--disable-randr
+--disable-report-builder
+--disable-scripting
+--disable-sdremote-bluetooth
+--without-helppack-integration
+--without-java
+--without-junit
+--without-system-dicts
+--with-theme=no