summaryrefslogtreecommitdiff
path: root/odk/Package_unowinreg.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-12-03 08:12:23 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-12-03 15:01:00 +0100
commit01241113947fc7bd7f7b765dd897bb023c8ca99c (patch)
treec224f9afa42e961d9b22fd66530276ed7b7ae410 /odk/Package_unowinreg.mk
parent8e3dc5b81d1a7486a6787afef918e9d2b74542ef (diff)
Replace unowinreg.dll with execution of `reg QUERY`
The SDK's <https://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Java/ Transparent_Use_of_Office_UNO_Components> 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 <noel.grandin@collabora.co.uk> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins
Diffstat (limited to 'odk/Package_unowinreg.mk')
-rw-r--r--odk/Package_unowinreg.mk28
1 files changed, 0 insertions, 28 deletions
diff --git a/odk/Package_unowinreg.mk b/odk/Package_unowinreg.mk
deleted file mode 100644
index 189967eac22b..000000000000
--- a/odk/Package_unowinreg.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-ifneq ($(BUILD_UNOWINREG),)
-ifeq ($(COM),MSC)
-odk_unowinreg_DIR := $(WORKDIR)/LinkTarget/Library
-else
-odk_unowinreg_DIR := $(call gb_CustomTarget_get_workdir,odk/unowinreg)
-endif
-odk_unowinreg_FILE := unowinreg.dll
-else # !BUILD_UNOWINREG
-odk_unowinreg_DIR := $(TARFILE_LOCATION)
-odk_unowinreg_FILE := $(UNOWINREG_DLL)
-endif
-
-$(eval $(call gb_Package_Package,odk_unowinreg,$(odk_unowinreg_DIR)))
-
-$(eval $(call gb_Package_set_outdir,odk_unowinreg,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_file,odk_unowinreg,$(SDKDIRNAME)/classes/win/unowinreg.dll,$(odk_unowinreg_FILE)))
-
-# vim: set noet sw=4 ts=4: