strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

require wsl-lo-helper to be preinstalled, like 'make'

Browse source 
It is needed to even find MSVC, so configure cannot easily build it.

Change-Id: Ie4e950cf01b9d8778cdc3e9a53718954b0c3c166
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137344
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
This commit is contained in:
Luboš Luňák 2022-07-21 15:57:53 +02:00 committed by Luboš Luňák
parent 5a8a1c4a86
commit 4fbcededef
3 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
configure.ac
View file

@ -119,7 +119,7 @@ PathFormat()
formatted_path=$(wslpath -w "$formatted_path")
;;
esac
formatted_path=$($BUILDDIR/solenv/wsl/wsl-lo-helper.exe --8.3 "$formatted_path")
formatted_path=$($WSL_LO_HELPER --8.3 "$formatted_path")
elif test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
formatted_path=`cygpath -sm "$formatted_path"`
else
@ -355,7 +355,7 @@ if test -z "$host" -a -z "$build" -a "$(uname -r | grep -i Microsoft 2>/dev/null
;;
esac
if test -n "$opt_d" -o -n "$opt_s"; then
input=$($BUILDDIR/solenv/wsl/wsl-lo-helper.exe --8.3 "$input")
input=$($WSL_LO_HELPER --8.3 "$input")
fi
if test -n "$opt_m"; then
input="${input//\\//}"
@ -399,6 +399,17 @@ if test -z "$host" -a -z "$build" -a "$(uname -r | grep -i Microsoft 2>/dev/null
exit 0
fi
if test -z "$WSL_LO_HELPER"; then
if test -n "$LODE_HOME" -a -x "$LODE_HOME/opt/bin/wsl-lo-helper" ; then
WSL_LO_HELPER="$LODE_HOME/opt/bin/wsl-lo-helper"
elif test -x "/opt/lo/bin/wsl-lo-helper"; then
WSL_LO_HELPER="/opt/lo/bin/wsl-lo-helper"
fi
fi
if test -z "$WSL_LO_HELPER"; then
AC_MSG_ERROR([wsl-lo-helper not found. See solenv/wsl/README.])
fi
fi
AC_CANONICAL_HOST
@ -3811,7 +3822,7 @@ reg_get_value()
unset regvalue
if test "$build_os" = "wsl"; then
regvalue=$($BUILDDIR/solenv/wsl/wsl-lo-helper.exe --read-registry $1 "$2" 2>/dev/null)
regvalue=$($WSL_LO_HELPER --read-registry $1 "$2" 2>/dev/null)
return
fi

8
solenv/wsl/README Normal file
View file

@ -0,0 +1,8 @@
This is a tool that will be useful for various tasks when building LO on WSL.
It is a Win32 program, not a Linux (WSL) one.
Compile using the Developer Command Prompt from MSVC as:
cl wsl-lo-helper.cpp advapi32.lib
and the copy the executable to /opt/lo/bin (e.g. from shell as):
sudo mv wsl-lo-helper.exe /opt/lo/bin/wsl-lo-helper

8
solenv/wsl/wsl-lo-helper.cpp
View file

@ -7,14 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
/*
* This is a tool that will be useful for various tasks if/when we build LO on WSL
*
* It is a Win32 program, not a Linux (WSL) one.
*
* Compile as: cl -MD wsl-lo-helper.cpp advapi32.lib
*/
#include <cstdio>
#include <cstring>