From 01241113947fc7bd7f7b765dd897bb023c8ca99c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 3 Dec 2020 08:12:23 +0100 Subject: Replace unowinreg.dll with execution of `reg QUERY` The SDK's on all platforms included the Windows- specific unowinreg.dll in generated jars (so that those jars, when distributed to a Windows environment, would find a LO installation by inspecting the Windows registry). That unowinreg.dll was originally built as a 32-bit DLL (though when building a 64-bit Windows LO, it happened to be built as a 64-bit DLL). For non-Windows LO builds, it could either be built locally with a MinGW toolchain (--enable-build-unowinreg) or downloaded from dev-www.libreoffice.org. However, that had various issues: For one, unowinreg.dll was not necessarily available in a distributed jar as a 64-bit DLL for use with a 64-bit JRE on Windows. (Theoretically, running such a jar with a 32-bit JRE to access a 64-bit LO installation's URE jars could have worked. But practically, those URE jars in turn require native DLLs, which would then not have been available as 32-bit DLLs for use in the 32-bit JRE.) For another, at least the unowinreg.dll resulting from --enable-build-unowinreg on Fedora 33 would have had a dependency on libgcc_s_dw2-1.dll that would generally not have been available in a target Windows environment. There appears to be no pure Java way to read the Windows registry, but instead of using a native code DLL for that, it appears to work just as well to call out to reg.exe and parse its output. This removes the --enable-build-unowinreg and --with-mingw-cross-compiler configuration options. (The sole use of the MinGW toolchain in LO was for building unowinreg.dll.) Change-Id: I3283ea38c884d3221a205e5ab6ec99a2691ef474 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107140 Reviewed-by: Noel Grandin Reviewed-by: Stephan Bergmann Tested-by: Jenkins --- Repository.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'Repository.mk') diff --git a/Repository.mk b/Repository.mk index c887d9b4297d..fce601fc0e79 100644 --- a/Repository.mk +++ b/Repository.mk @@ -535,7 +535,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ vclbootstrapprotector \ scqahelper \ swqahelper \ - unowinreg \ wpftqahelper \ precompiled_system \ $(if $(filter MSC,$(COM)),cli_cppuhelper) \ @@ -854,7 +853,6 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\ $(if $(ENABLE_JAVA), \ odk_javadoc \ odk_uno_loader_classes \ - odk_unowinreg \ ) \ )) -- cgit