LOK runs on Windows and Linux; packaging stages engines (W-01, K-01)
The kernel is the merged library on every platform; Windows and Linux find it beside the app in libreoffice/program. All three run unipoll: macOS through GCD, Linux by answering one request per poll, Windows through a message-only window on the loop's thread (LOK's own main thread had deadlocked Calc loads). Patch 0043 flushes callbacks inline everywhere, so a request sees its result; 0042 stops MSVC's Boost auto-link. Linux paints with cairo, BGRA; the start-up check now paints red text and finds red in byte two on every platform, since getTileMode does not see Skia. ely-lok on Windows: 180 of 189 pass; on Linux 187. The rest are listed after 0.1.3 (spelling, Calc dark tiles, show layers and fields, a11y selection). Tests build file URLs portably and accept CRLF where Windows writes it. packaging/stage.sh lays out an app with its engines for Windows and Linux; licenses.sh finds each licence on all three. ElyMark finds its page beside the app. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
dc4c1ed0fe
commit
c96d39a342
34 files changed
+658
-214
No files matched your search
@@ -15,6 +15,8 @@ holds() {
|
||||
rm -rf "$base"
|
||||
mkdir -p "$base"
|
||||
git -C "$base" init -q
|
||||
# LF, as every tree here; Windows defaults convert.
|
||||
git -C "$base" config core.autocrlf false
|
||||
for f in $files; do
|
||||
if git -C "$src" cat-file -e "HEAD:$f" 2>/dev/null; then
|
||||
mkdir -p "$base/$(dirname "$f")"
|
||||
|
||||
@@ -49,7 +49,6 @@ case $(uname) in
|
||||
# Collabora's LOKit set: headless, bundled libraries.
|
||||
options+=(
|
||||
--disable-gui
|
||||
--enable-cairo-rgba
|
||||
--disable-dbus
|
||||
--disable-gio
|
||||
--disable-dconf
|
||||
@@ -73,6 +72,22 @@ case $(uname) in
|
||||
app=$src/instdir/share
|
||||
jobs=$(nproc)
|
||||
;;
|
||||
CYGWIN*)
|
||||
# Unix-only switches; configure refuses them here.
|
||||
kept=()
|
||||
for option in "${options[@]}"; do
|
||||
case $option in
|
||||
--enable-bogus-pkg-config | --disable-cups | --disable-evolution2 | --disable-python) ;;
|
||||
*) kept+=("$option") ;;
|
||||
esac
|
||||
done
|
||||
options=("${kept[@]}" --with-visual-studio=2022 --disable-ccache --disable-cli --without-dotnet)
|
||||
# Cygwin's own make, never Git Bash's; MSYSTEM misleads the build.
|
||||
unset MSYSTEM MSYSTEM_PREFIX MINGW_PREFIX MSYSTEM_CHOST MSYSTEM_CARCH
|
||||
PATH=/opt/lo/bin:$PATH
|
||||
app=$src/instdir/share
|
||||
jobs=$(nproc)
|
||||
;;
|
||||
*)
|
||||
echo "build-libreoffice.sh: no build for $(uname)" >&2
|
||||
exit 1
|
||||
|
||||
Reference in new issue
Block a user