Repository.mk | 18 RepositoryExternal.mk | 15 config_host.mk.in | 8 configure.ac | 115 ----- extensions/CustomTarget_so_activex_x64.mk | 25 - extensions/Library_so_activex_x64.mk | 56 -- extensions/Module_extensions.mk | 8 external/expat/Module_expat.mk | 7 external/expat/StaticLibrary_expat_x64.mk | 33 - external/expat/UnpackedTarball_expat.mk | 14 external/twain_dsm/Module_twain_dsm.mk | 2 external/zlib/Module_zlib.mk | 6 external/zlib/StaticLibrary_zlib_x64.mk | 39 - postprocess/CustomTarget_signing.mk | 1 scp2/AutoInstall.mk | 4 scp2/InstallModule_activex.mk | 1 scp2/InstallModule_windows.mk | 4 scp2/InstallModule_winexplorerext.mk | 5 scp2/inc/macros.inc | 31 - scp2/source/activex/module_activex.scp | 4 scp2/source/winexplorerext/file_winexplorerext.scp | 7 scp2/source/winexplorerext/module_winexplorerext.scp | 16 scp2/source/winexplorerext/registryitem_winexplorerext.scp | 282 ------------- shell/CustomTarget_x64.mk | 69 --- shell/Library_ooofilt_x64.mk | 66 --- shell/Library_propertyhdl_x64.mk | 66 --- shell/Library_shlxthdl_x64.mk | 74 --- shell/Module_shell.mk | 10 shell/StaticLibrary_shlxthandler_common_x64.mk | 49 -- shell/StaticLibrary_xmlparser_x64.mk | 27 - solenv/gbuild/StaticLibrary.mk | 3 solenv/gbuild/gen-autoinstall.py | 2 32 files changed, 21 insertions(+), 1046 deletions(-)
New commits: commit d39842d01b63143a4832be0e01a8b3c216afa9e7 Author: Christian Lohmaier <[email protected]> AuthorDate: Tue May 20 15:54:27 2025 +0200 Commit: Christian Lohmaier <[email protected]> CommitDate: Sat May 24 23:40:47 2025 +0200 cleanup msvcdll stuff was needed for the 64bit shell extensions in a 32bit build of LibreOffice, but that was already broken by ec0a49ecc7ea8449d90c1e69857d62728af19829 since that not only removed the ucrt stuff, but also external/msc-externals/Package_msvc_dlls.mk that would have registered the files to be packaged into the installation set. So remove that bit for good and do some related cleanup. Change-Id: I0b963dcf48eb66cb37d3a6bf017c2ee9aa3fbdf8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185566 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/config_host.mk.in b/config_host.mk.in index d09ecc519ce3..9e94d2a40c28 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -57,8 +57,6 @@ export BSH_JAR=@BSH_JAR@ export BUILD_PLATFORM=@build@ export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@ export BUILD_TYPE=@BUILD_TYPE@ -export BUILD_X64=@BUILD_X64@ -export BUILD_X86=@BUILD_X86@ export BUILDING_PCH_WITH_OBJ=@BUILDING_PCH_WITH_OBJ@ export BZIP2_CFLAGS=$(gb_SPACE)@BZIP2_CFLAGS@ export BZIP2_LIBS=$(gb_SPACE)@BZIP2_LIBS@ @@ -109,8 +107,8 @@ export CUSTOM_BRAND_DIR=@CUSTOM_BRAND_DIR@ export CUSTOM_BRAND_IMAGES=@CUSTOM_BRAND_IMAGES@ export CXX=@CXX@ export CXX_FOR_BUILD=@CXX_FOR_BUILD@ -export CXX_X64_BINARY=@CXX_X64_BINARY@ -export CXX_X86_BINARY=@CXX_X86_BINARY@ +CXX_X64_BINARY=@CXX_X64_BINARY@ +CXX_X86_BINARY=@CXX_X86_BINARY@ @x_CXXFLAGS@ export CXXFLAGS=@CXXFLAGS@ export CXXFLAGS_CXX11=@CXXFLAGS_CXX11@ export CXXFLAGS_INTRINSICS_SSE2=@CXXFLAGS_INTRINSICS_SSE2@ @@ -515,8 +513,6 @@ export MSM_PATH=@MSM_PATH@ export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@ export MSPUB_LIBS=$(gb_SPACE)@MSPUB_LIBS@ export MSVC_CXX=@MSVC_CXX@ -export MSVC_DLLS=@MSVC_DLLS@ -export MSVC_DLL_PATH=@MSVC_DLL_PATH@ export MSVC_USE_DEBUG_RUNTIME=@MSVC_USE_DEBUG_RUNTIME@ export MWAW_CFLAGS=$(gb_SPACE)@MWAW_CFLAGS@ export MWAW_LIBS=$(gb_SPACE)@MWAW_LIBS@ diff --git a/configure.ac b/configure.ac index f8e10df3acb9..b7a1a49e8e1d 100644 --- a/configure.ac +++ b/configure.ac @@ -4684,47 +4684,21 @@ if test "$_os" = "WINNT"; then add_warning "You should have at least Visual Studio 2019 version 16.10 to avoid build problems. Otherwise, you may face problems with the build of some modules including dragonbox." fi - # Check for 64-bit (cross-)compiler to use to build the 64-bit - # version of the Explorer extension (and maybe other small - # bits, too) needed when installing a 32-bit LibreOffice on a - # 64-bit OS. The 64-bit Explorer extension is a feature that - # has been present since long in OOo. Don't confuse it with - # building LibreOffice itself as 64-bit code. - - BUILD_X64= - CXX_X64_BINARY= - - if test "$WIN_HOST_ARCH" = "x86" -a -n "$WIN_OTHER_ARCH"; then - AC_MSG_CHECKING([for the libraries to build the 64-bit Explorer extensions]) - if test -f "$COMPATH/atlmfc/lib/x64/atls.lib" -o \ - -f "$COMPATH/atlmfc/lib/spectre/x64/atls.lib" - then - BUILD_X64=TRUE - CXX_X64_BINARY=`win_short_path_for_make "$MSVC_MULTI_PATH/cl.exe"` - AC_MSG_RESULT([found]) - else - AC_MSG_RESULT([not found]) - AC_MSG_WARN([Installation set will not contain 64-bit Explorer extensions]) - fi - elif test "$WIN_HOST_ARCH" = "x64"; then - CXX_X64_BINARY=$CXX - fi - AC_SUBST(BUILD_X64) - - # These are passed to the environment and then used in gbuild/platform/com_MSC_class.mk - AC_SUBST(CXX_X64_BINARY) + # we used to build 64bit bits for 32bit windows (explorer shell extension, activex, similar) + # dating back when there was no 64bit version of LibreOffice yet (pre 5.0) + # now (since 25.8) we only care about the inverse, building the 32bit twain and activex spsupp + # lib when targeting/building the 64bit version for Windows # Check for 32-bit compiler to use to build the 32-bit TWAIN shim # needed to support TWAIN scan on both 32- and 64-bit systems case "$WIN_HOST_ARCH" in x64) + CXX_X64_BINARY=$CXX AC_MSG_CHECKING([for a x86 compiler and libraries for 32-bit binaries required for TWAIN support]) if test -n "$CXX_X86_BINARY"; then - BUILD_X86=TRUE - AC_MSG_RESULT([preset]) + AC_MSG_RESULT([provided via environment variable]) elif test -n "$WIN_MULTI_ARCH"; then - BUILD_X86=TRUE CXX_X86_BINARY=`win_short_path_for_make "$MSVC_MULTI_PATH/cl.exe"` AC_MSG_RESULT([found]) else @@ -4733,11 +4707,11 @@ if test "$_os" = "WINNT"; then fi ;; x86) - BUILD_X86=TRUE CXX_X86_BINARY=$MSVC_CXX ;; esac - AC_SUBST(BUILD_X86) + # These are passed to the environment and then used in gbuild/platform/com_MSC_class.mk + AC_SUBST(CXX_X64_BINARY) AC_SUBST(CXX_X86_BINARY) fi AC_SUBST(VCVER) @@ -7173,26 +7147,11 @@ find_msms() local version="$1" AC_MSG_CHECKING([for MSVC $version merge modules directory]) - local my_msm_file="Microsoft_VC${version}_CRT_x86.msm" - local my_msm_dir - - echo "$as_me:$LINENO: searching for $my_msm_file" >&5 - - msmdir= - case "$VCVER" in - 16.0 | 17.0 | 17.14) - for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do - my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/$l/MergeModules/" - echo "$as_me:$LINENO: looking for $my_msm_dir${my_msm_file}])" >&5 - if test -e "$my_msm_dir${my_msm_file}"; then - msmdir=$my_msm_dir - fi - done - ;; - esac - - if test -n "$msmdir"; then - PathFormat "$msmdir" + local my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/${version}/MergeModules" + local my_msm_file="$my_msm_dir/Microsoft_VC${version}_CRT_x86.msm" + echo "$as_me:$LINENO: looking for ${my_msm_file}" >&5 + if test -e "${my_msm_file}"; then + PathFormat "$my_msm_dir/" msmdir="$formatted_path" AC_MSG_RESULT([$msmdir]) else @@ -7205,40 +7164,6 @@ find_msms() fi } -find_msvc_x64_dlls() -{ - # Return value: $msvcdllpath, $msvcdlls - - AC_MSG_CHECKING([for MSVC x64 DLL path]) - - dnl Order crtver in increasing order. Then check the directories returned by - dnl ls in an inner loop; assuming they are also ordered in increasing order, - dnl the result will be the highest CRT version found in the highest directory. - - msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT" - case "$VCVER" in - 16.0 | 17.0 | 17.14) - for crtver in 141 142 143; do - for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do - echo "$as_me:$LINENO: testing $VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC$crtver.CRT" >&5 - if test -d "$VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC$crtver.CRT"; then - msvcdllpath="$VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC$crtver.CRT" - fi - done - done - ;; - esac - AC_MSG_RESULT([$msvcdllpath]) - AC_MSG_CHECKING([for MSVC x64 DLLs]) - msvcdlls="msvcp140.dll vcruntime140.dll" - for dll in $msvcdlls; do - if ! test -f "$msvcdllpath/$dll"; then - AC_MSG_FAILURE([missing $dll]) - fi - done - AC_MSG_RESULT([found all ($msvcdlls)]) -} - dnl ========================================= dnl Check for the Windows SDK. dnl ========================================= @@ -9046,18 +8971,10 @@ fi AC_SUBST([JITC_PROCESSOR_TYPE]) if test $_os = "WINNT"; then - find_msvc_x64_dlls - MSVC_DLL_PATH=`win_short_path_for_make "$msvcdllpath"` - MSVC_DLLS="$msvcdlls" - if echo "$msvcdllpath" | grep -q "VC143.CRT$"; then - with_redist=143 - elif echo "$msvcdllpath" | grep -q "VC142.CRT$"; then - with_redist=142 - elif echo "$msvcdllpath" | grep -q "VC141.CRT$"; then - with_redist=141 - fi for i in $PKGFORMAT; do if test "$i" = msi; then + dnl strip initial v from the version label found by find_msvc + with_vcredis=${VCTOOLSET:1} find_msms "$with_redist" if test -n "$msmdir"; then MSM_PATH=`win_short_path_for_make "$msmdir"`/ @@ -9068,8 +8985,6 @@ if test $_os = "WINNT"; then done fi -AC_SUBST(MSVC_DLL_PATH) -AC_SUBST(MSVC_DLLS) AC_SUBST(MSM_PATH) diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index d353db855cff..cfd7cda7d2c2 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Module_add_targets,extensions,\ Library_scn \ $(if $(filter WNT,$(OS)), \ Library_WinUserInfoBe \ - $(if $(filter TRUE,$(BUILD_X86)),Executable_twain32shim) \ + $(if $(CXX_X86_BINARY),Executable_twain32shim) \ ) \ UIConfig_sabpilot \ UIConfig_scanner \ diff --git a/external/twain_dsm/Module_twain_dsm.mk b/external/twain_dsm/Module_twain_dsm.mk index bbaedb77b5d0..be891ccb2a66 100644 --- a/external/twain_dsm/Module_twain_dsm.mk +++ b/external/twain_dsm/Module_twain_dsm.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Module_Module,twain_dsm)) ifeq ($(OS),WNT) -ifeq ($(BUILD_X86),TRUE) +ifneq ($(CXX_X86_BINARY),) $(eval $(call gb_Module_add_targets,twain_dsm,\ UnpackedTarball_twain_dsm \ )) diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index 0c700166134e..ed15f7c8ad9c 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -31,7 +31,6 @@ $(gb_CustomTarget_workdir)/postprocess/signing/signing.done: ifeq ($(COM),MSC) EXCLUDELIST=$(shell $(gb_MKTEMP)) && \ echo "$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library_get_filename,$(lib)))" | tr ' ' ' ' > $$EXCLUDELIST && \ - $(if $(BUILD_X64),chmod u+w $(foreach lib,$(MSVC_DLLS),$(INSTDIR)/program/shlxthdl/$(lib)) &&) \ $(PERL) $(SRCDIR)/postprocess/signing/signing.pl \ -e $$EXCLUDELIST \ -l $(subst .done,_log.txt,$@) \ diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index 31b6b1fc352e..efc02cd8e13c 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -76,9 +76,7 @@ gb_StaticLibrary_add_cxxclrobjects = $(call gb_StaticLibrary__forward_to_Linktar gb_StaticLibrary_add_asmobject = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_add_asmobjects = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_add_exception_objects = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) -gb_StaticLibrary_add_x64_generated_exception_objects = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_add_generated_cobjects = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) -gb_StaticLibrary_add_x64_generated_cobjects = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_add_generated_exception_objects = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_add_generated_objcobjects = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_add_generated_objcxxobjects = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) @@ -93,7 +91,6 @@ gb_StaticLibrary_add_defs = $(call gb_StaticLibrary__forward_to_Linktarget,$(0), gb_StaticLibrary_set_include = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_add_ldflags = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_set_ldflags = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) -gb_StaticLibrary_set_x64 = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_add_libs = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_set_library_path_flags = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) gb_StaticLibrary_use_api = $(call gb_StaticLibrary__forward_to_Linktarget,$(0),$(1),$(2),$(3)) commit 9e348f9c5b42445e45f9f4303e0c44832a3cfdc9 Author: Christian Lohmaier <[email protected]> AuthorDate: Tue May 20 14:53:05 2025 +0200 Commit: Christian Lohmaier <[email protected]> CommitDate: Sat May 24 23:40:41 2025 +0200 no longer add the 64bit windows explorer extensions to the 32bit build those were from a time where there was 64bit Windows, but no 64bit builds of LibreOffice/OpenOffice.org - now the only usecase for 32bit LibreOffice is to use it on 32bit-only machines… Change-Id: Icf1eacafd9e157788e8ec5a035716327492f5c2c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185565 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/Repository.mk b/Repository.mk index 976cc8090db1..546e72f4eddf 100644 --- a/Repository.mk +++ b/Repository.mk @@ -760,18 +760,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexp shlxthdl \ )) -ifneq ($(BUILD_X64),) -$(eval $(call gb_Helper_register_packages_for_install,winexplorerextwin64, \ - $(if $(filter MSC,$(COM)),msvc_dlls) \ -)) - -$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexplorerextwin64, \ - ooofilt_x64 \ - propertyhdl_x64 \ - shlxthdl_x64 \ -)) -endif # BUILD_X64 - endif # WNT $(eval $(call gb_Helper_register_libraries_for_install,RTVERLIBS,ure, \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d73e6203801c..757a38162190 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -365,11 +365,6 @@ $(call gb_LinkTarget_add_libs,$(1),-lz) endef -# nothing on system -define gb_LinkTarget__use_zlib_x64 - -endef - gb_ExternalProject__use_zlib := else # !SYSTEM_ZLIB @@ -397,11 +392,6 @@ $(call gb_LinkTarget__use_zlib_multiarch,$(1),zlib) endef -define gb_LinkTarget__use_zlib_x64 -$(call gb_LinkTarget__use_zlib_multiarch,$(1),zlib_x64) - -endef - define gb_ExternalProject__use_zlib $(call gb_ExternalProject_use_static_libraries,$(1),zlib) @@ -537,11 +527,6 @@ $(call gb_LinkTarget__use_expat_impl,$(1),expat) endef -define gb_LinkTarget__use_expat_x64 -$(call gb_LinkTarget__use_expat_impl,$(1),expat_x64) - -endef - ifneq ($(SYSTEM_HYPH),) define gb_LinkTarget__use_hyphen diff --git a/external/expat/Module_expat.mk b/external/expat/Module_expat.mk index baac0b595e20..485e8c417659 100644 --- a/external/expat/Module_expat.mk +++ b/external/expat/Module_expat.mk @@ -20,11 +20,4 @@ $(eval $(call gb_Module_add_targets,expat,\ )) endif -# ---------------- X64 stuff special --------------------- -ifeq ($(BUILD_X64),TRUE) -$(eval $(call gb_Module_add_targets,expat,\ - StaticLibrary_expat_x64 \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/external/expat/StaticLibrary_expat_x64.mk b/external/expat/StaticLibrary_expat_x64.mk deleted file mode 100644 index 97b009d87aed..000000000000 --- a/external/expat/StaticLibrary_expat_x64.mk +++ /dev/null @@ -1,33 +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/. -# - -$(eval $(call gb_StaticLibrary_StaticLibrary,expat_x64)) - -$(eval $(call gb_StaticLibrary_set_x64,expat_x64,YES)) - -$(eval $(call gb_StaticLibrary_set_warnings_disabled,expat_x64)) - -$(eval $(call gb_StaticLibrary_use_unpacked,expat_x64,expat)) - -$(eval $(call gb_StaticLibrary_set_include,expat_x64,\ - -I$(gb_UnpackedTarball_workdir)/expat \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_StaticLibrary_add_defs,expat_x64,\ - -DCOMPILED_FROM_DSP \ -)) - -$(eval $(call gb_StaticLibrary_add_x64_generated_cobjects,expat_x64,\ - UnpackedTarball/expat/lib/xmlparse_x64 \ - UnpackedTarball/expat/lib/xmltok_x64 \ - UnpackedTarball/expat/lib/xmlrole_x64 \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk index 30d0e935d489..e9e4f75046f2 100644 --- a/external/expat/UnpackedTarball_expat.mk +++ b/external/expat/UnpackedTarball_expat.mk @@ -19,18 +19,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,expat,\ external/expat/expat-winapi.patch \ )) -# This is a bit hackish. - -# When building for Windows (as 32-bit) we need to build it twice: as -# 32- and 64-bit code, to be able to produce a 64-bit Explorer -# ("shell") extension that is used when the 32-bit LibreOffice is -# installed on a 64-bit OS. - -$(eval $(call gb_UnpackedTarball_set_post_action,expat,\ - $(if $(filter $(BUILD_X64),TRUE), \ - cp lib/xmlparse.c lib/xmlparse_x64.c && \ - cp lib/xmltok.c lib/xmltok_x64.c && \ - cp lib/xmlrole.c lib/xmlrole_x64.c) \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/zlib/Module_zlib.mk b/external/zlib/Module_zlib.mk index 468cb2dea9fb..762aa77068fa 100644 --- a/external/zlib/Module_zlib.mk +++ b/external/zlib/Module_zlib.mk @@ -14,10 +14,4 @@ $(eval $(call gb_Module_add_targets,zlib,\ UnpackedTarball_zlib \ )) -ifeq ($(BUILD_X64),TRUE) -$(eval $(call gb_Module_add_targets,zlib,\ - StaticLibrary_zlib_x64 \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/external/zlib/StaticLibrary_zlib_x64.mk b/external/zlib/StaticLibrary_zlib_x64.mk deleted file mode 100644 index 1f1a46fb9df8..000000000000 --- a/external/zlib/StaticLibrary_zlib_x64.mk +++ /dev/null @@ -1,39 +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/. -# - -$(eval $(call gb_StaticLibrary_StaticLibrary,zlib_x64)) - -$(eval $(call gb_StaticLibrary_set_x64,zlib_x64,YES)) - -$(eval $(call gb_StaticLibrary_use_unpacked,zlib_x64,zlib)) - -$(eval $(call gb_StaticLibrary_set_warnings_disabled,zlib_x64)) - -$(eval $(call gb_StaticLibrary_set_include,zlib_x64,\ - -I$(gb_UnpackedTarball_workdir)/zlib \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_StaticLibrary_add_x64_generated_cobjects,zlib_x64,\ - UnpackedTarball/zlib/x64/adler32 \ - UnpackedTarball/zlib/x64/compress \ - UnpackedTarball/zlib/x64/crc32 \ - UnpackedTarball/zlib/x64/deflate \ - UnpackedTarball/zlib/x64/inffast \ - UnpackedTarball/zlib/x64/inflate \ - UnpackedTarball/zlib/x64/inftrees \ - UnpackedTarball/zlib/x64/trees \ - UnpackedTarball/zlib/x64/zutil \ -)) - -ifeq ($(ENABLE_DEBUG),TRUE) -$(eval $(call gb_StaticLibrary_add_cflags,zlib_x64,-DZLIB_DEBUG)) -endif - -# vim: set noet sw=4 ts=4: diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 185300406dc8..4f66255c8dad 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -46,9 +46,6 @@ $(eval $(call gb_AutoInstall_add_module,spsuppfiles,LIBO_LIB_FILE,LIBO_EXECUTABL $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE)) -ifeq ($(BUILD_X64),TRUE) -$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_X64_LIB_FILE_COMPONENTCONDITION,,,PACKAGE_FILELIST_COMPONENTCONDITION,"VersionNT64")) -endif $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,writer_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,xsltfilter,,,,PACKAGE_FILELIST)) diff --git a/scp2/InstallModule_windows.mk b/scp2/InstallModule_windows.mk index 296f7fccfa5b..34f1c49b7910 100644 --- a/scp2/InstallModule_windows.mk +++ b/scp2/InstallModule_windows.mk @@ -9,10 +9,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/windows)) -$(eval $(call gb_InstallModule_define_if_set,scp2/windows,\ - BUILD_X64 \ -)) - $(eval $(call gb_InstallModule_add_defs,scp2/windows,\ $(if $(WINDOWS_SDK_HOME),\ -DHAVE_WINDOWS_SDK \ diff --git a/scp2/InstallModule_winexplorerext.mk b/scp2/InstallModule_winexplorerext.mk index c3da66809a4f..2bf2773d3514 100644 --- a/scp2/InstallModule_winexplorerext.mk +++ b/scp2/InstallModule_winexplorerext.mk @@ -9,14 +9,9 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/winexplorerext)) -$(eval $(call gb_InstallModule_define_if_set,scp2/winexplorerext,\ - BUILD_X64 \ -)) - $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/winexplorerext,\ winexplorerextbinarytable \ winexplorerext \ - $(if $(filter TRUE,$(BUILD_X64)),winexplorerextwin64) \ )) $(eval $(call gb_InstallModule_add_scpfiles,scp2/winexplorerext,\ diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 8f507c510346..d3e136f58cf3 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -179,15 +179,6 @@ End Dir = gid_Dir_Shlxthdl; \ End -#define SHLXTHDL_X64_LIB_FILE_COMPONENTCONDITION(id,name,cond) \ - File id \ - Name = name; \ - LIB_FILE_BODY; \ - Styles = (PACKED); \ - Dir = gid_Dir_Shlxthdl_x64; \ - ComponentCondition = cond; \ - End - #ifdef MACOSX // links are created at configure time by odk/config/setsdkenv_unix.sh.in #define SDK_LIBRARY_LINK(id,name,target) @@ -418,26 +409,6 @@ End #ifdef _MSC_VER -#ifdef BUILD_X64 - -#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \ - RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \ - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ - ModuleID = gid_Module_Optional_Winexplorerext; \ - Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \ - Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \ - End \ -\ - RegistryItem CONCAT3(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension,_x64) \ - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ - ModuleID = gid_Module_Optional_Winexplorerext_x64; \ - ComponentCondition = "VersionNT64"; \ - Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \ - Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \ - End - -#else - #define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \ RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ @@ -446,8 +417,6 @@ End Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \ End -#endif - #else #define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) // empty #endif diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index 3eb80bbec63b..ba9d674b0ed3 100644 --- a/scp2/source/winexplorerext/file_winexplorerext.scp +++ b/scp2/source/winexplorerext/file_winexplorerext.scp @@ -22,10 +22,3 @@ Directory gid_Dir_Shlxthdl ParentID = gid_Brand_Dir_Program; DosName = "shlxthdl"; End - -#ifdef BUILD_X64 -Directory gid_Dir_Shlxthdl_x64 - ParentID = gid_Dir_Shlxthdl; - DosName = "."; -End -#endif diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp index 2acd44c1ed89..db7ac983b2d2 100644 --- a/scp2/source/winexplorerext/module_winexplorerext.scp +++ b/scp2/source/winexplorerext/module_winexplorerext.scp @@ -20,9 +20,6 @@ #include "AutoInstall/winexplorerextbinarytable" #include "AutoInstall/winexplorerext" -#ifdef BUILD_X64 -#include "AutoInstall/winexplorerextwin64" -#endif Module gid_Module_Optional_Winexplorerext MOD_NAME_DESC ( MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS ); @@ -34,16 +31,3 @@ Module gid_Module_Optional_Winexplorerext auto_winexplorerext_ALL, gid_File_Tmp_Userinstall_Winexplorerext_Inf); End - -#ifdef BUILD_X64 -Module gid_Module_Optional_Winexplorerext_x64 - ParentID = gid_Module_Optional_Winexplorerext; - Name = "gid_Module_Optional_Winexplorerext_x64"; - Description = "gid_Module_Optional_Winexplorerext_x64"; - Sortkey = "1210"; - Default = YES; - Styles = (HIDDEN_ROOT); - Dirs = (gid_Dir_Shlxthdl_x64); - Files = (auto_winexplorerextwin64_ALL); -End -#endif diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp index c144160f8391..5538986bc58f 100644 --- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp +++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp @@ -28,18 +28,6 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32"; - Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll"; -End - -#endif - RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_TM ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -48,18 +36,6 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer Value = "Apartment"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_TM_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32"; - Name = "ThreadingModel"; - Value = "Apartment"; -End -#endif - RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_Approved ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; ModuleID = gid_Module_Optional_Winexplorerext; @@ -68,19 +44,6 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_Approved Value = "%PRODUCTNAME Infotip Handler"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_Approved_x64 - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved"; - Name = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}"; - Value = "%PRODUCTNAME Infotip Handler"; -End - -#endif - // End registry items for the Infotip handler // Begin registry items for the Thumbnail viewer @@ -92,18 +55,6 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32"; - Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll"; -End - -#endif - RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_TM ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -113,19 +64,6 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer Val64 = "Apartment"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_TM_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32"; - Name = "ThreadingModel"; - Value = "Apartment"; -End - -#endif - RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_Approved ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; ModuleID = gid_Module_Optional_Winexplorerext; @@ -134,19 +72,6 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_Approved Value = "%PRODUCTNAME Thumbnail Viewer"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_Approved_x64 - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved"; - Name = "{3B092F0C-7696-40E3-A80F-68D74DA84210}"; - Value = "%PRODUCTNAME Thumbnail Viewer"; -End - -#endif - // End registry items for the Thumbnail viewer // Begin registry items for the Column handler @@ -158,18 +83,6 @@ RegistryItem gid_Regitem_Folder_shellex_ColHandl_C52AF81D_F7A0_4AAB_8E87_F80A60C Value = "%PRODUCTNAME Column Handler"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Folder_shellex_ColHandl_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"; - Value = "%PRODUCTNAME Column Handler"; -End - -#endif - RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -177,18 +90,6 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32"; - Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll"; -End - -#endif - RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_TM ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -197,19 +98,6 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer Value = "Apartment"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_TM_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32"; - Name = "ThreadingModel"; - Value = "Apartment"; -End - -#endif - RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_Approved ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; ModuleID = gid_Module_Optional_Winexplorerext; @@ -218,19 +106,6 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_Approved Value = "%PRODUCTNAME Column Handler"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_Approved_x64 - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved"; - Name = "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}"; - Value = "%PRODUCTNAME Column Handler"; -End - -#endif - // End registry items for the Column handler // Begin registry items for the MS Indexing server filter component @@ -242,18 +117,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262 Value = "OpenDocument Format Filter"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}"; - Value = "OpenDocument Format Filter"; -End - -#endif - RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -262,18 +125,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer Val64 = "[INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32"; - Value = "[INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll"; -End - -#endif - RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_TM ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -282,19 +133,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer Value = "Apartment"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_TM_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32"; - Name = "ThreadingModel"; - Value = "Apartment"; -End - -#endif - RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -302,18 +140,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262 Value = "OpenDocument Format Persistent Handler"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}"; - Value = "OpenDocument Format Persistent Handler"; -End - -#endif - RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsReg ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -321,18 +147,6 @@ RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAd Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsReg_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}\PersistentAddinsRegistered\{89BCB740-6119-101A-BCB7-00DD010655AF}"; - Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}"; -End - -#endif - // End registry items for the MS Indexing server filter component // Begin registry entries for the PropertySheet handler @@ -344,18 +158,6 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32"; - Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll"; -End - -#endif - RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_TM ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -364,19 +166,6 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer Value = "Apartment"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_TM_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32"; - Name = "ThreadingModel"; - Value = "Apartment"; -End - -#endif - RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_Approved ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; ModuleID = gid_Module_Optional_Winexplorerext; @@ -385,19 +174,6 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_Approved Value = "%PRODUCTNAME Property Sheet Handler"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_Approved_x64 - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved"; - Name = "{63542C48-9552-494A-84F7-73AA6A7C99C1}"; - Value = "%PRODUCTNAME Property Sheet Handler"; -End - -#endif - // End registry entries for the PropertySheet handler // Begin registry entries for the Property handler @@ -417,26 +193,6 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareD Value = "#1"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}"; - Value = "%PRODUCTNAME Property Handler"; -End - -RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}"; - Name = "EnableShareDenyNone"; - Value = "#1"; -End - -#endif - RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -444,18 +200,6 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer Value = "[INSTALLLOCATION]program\shlxthdl\propertyhdl.dll"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32"; - Value = "[INSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll"; -End - -#endif - RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_TM ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Optional_Winexplorerext; @@ -464,19 +208,6 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer Value = "Apartment"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_TM_x64 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32"; - Name = "ThreadingModel"; - Value = "Apartment"; -End - -#endif - RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; ModuleID = gid_Module_Optional_Winexplorerext; @@ -485,17 +216,4 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved Value = "%PRODUCTNAME Property Handler"; End -#ifdef BUILD_X64 - -RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved_x64 - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - ModuleID = gid_Module_Optional_Winexplorerext_x64; - ComponentCondition = "VersionNT64"; - Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved"; - Name = "{AE424E85-F6DF-4910-A6A9-438797986431}"; - Value = "%PRODUCTNAME Property Handler"; -End - -#endif - // End registry entries for the Property handler diff --git a/shell/CustomTarget_x64.mk b/shell/CustomTarget_x64.mk deleted file mode 100644 index b5aa0397ae4f..000000000000 --- a/shell/CustomTarget_x64.mk +++ /dev/null @@ -1,69 +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/. -# - -$(eval $(call gb_CustomTarget_CustomTarget,shell/source)) - -SHELL_SHLXTHANDLER_COMMON_FILES := \ - win32/ooofilereader/autostyletag \ - win32/ooofilereader/basereader \ - win32/ooofilereader/contentreader \ - win32/ooofilereader/keywordstag \ - win32/ooofilereader/metainforeader \ - win32/ooofilereader/simpletag \ - win32/shlxthandler/ooofilt/stream_helper \ - win32/shlxthandler/util/fileextensions \ - win32/shlxthandler/util/iso8601_converter \ - win32/shlxthandler/util/registry \ - win32/shlxthandler/util/utilities \ - win32/zipfile/zipexcptn \ - win32/zipfile/zipfile - -SHELL_SHLXTHDL_FILES := \ - win32/shlxthandler/classfactory \ - win32/shlxthandler/columninfo/columninfo \ - win32/shlxthandler/infotips/infotips \ - win32/shlxthandler/propsheets/document_statistic \ - win32/shlxthandler/propsheets/listviewbuilder \ - win32/shlxthandler/propsheets/propsheets \ - win32/shlxthandler/shlxthdl \ - win32/shlxthandler/thumbviewer/thumbviewer - -SHELL_OOOFILT_FILES := \ - win32/shlxthandler/ooofilt/ooofilt \ - win32/shlxthandler/ooofilt/propspec - -SHELL_PROPERTYHDL_FILES := \ - win32/shlxthandler/prophdl/propertyhdl - -SHELL_XMLPARSER_FILES := \ - all/xml_parser - -SHELL_HEADERS := \ - win32/ooofilereader/autostyletag \ - win32/ooofilereader/dummytag \ - win32/ooofilereader/itag \ - win32/ooofilereader/keywordstag \ - win32/ooofilereader/simpletag \ - win32/shlxthandler/classfactory \ - win32/shlxthandler/ooofilt/ooofilt \ - win32/shlxthandler/ooofilt/propspec \ - win32/shlxthandler/propsheets/document_statistic \ - win32/shlxthandler/propsheets/listviewbuilder \ - win32/zipfile/zipexcptn - -$(call gb_CustomTarget_get_target,shell/source) : \ - $(foreach source,$(SHELL_SHLXTHANDLER_COMMON_FILES) $(SHELL_SHLXTHDL_FILES) $(SHELL_OOOFILT_FILES) $(SHELL_PROPERTYHDL_FILES) $(SHELL_XMLPARSER_FILES),\ - $(gb_CustomTarget_workdir)/shell/source/$(source).cxx) \ - $(foreach header,$(SHELL_HEADERS),\ - $(gb_CustomTarget_workdir)/shell/source/$(header).hxx) - -$(gb_CustomTarget_workdir)/shell/source/% : $(SRCDIR)/shell/source/% - mkdir -p $(dir $@) && $(call gb_Deliver_deliver,$<,$@) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk deleted file mode 100644 index a09f89214f48..000000000000 --- a/shell/Library_ooofilt_x64.mk +++ /dev/null @@ -1,66 +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/. -# - -$(eval $(call gb_Library_Library,ooofilt_x64)) - -$(eval $(call gb_Library_set_x64,ooofilt_x64,YES)) - -$(eval $(call gb_Library_use_custom_headers,ooofilt_x64,\ - shell/source \ -)) - -$(eval $(call gb_Library_set_include,ooofilt_x64,\ - -I$(SRCDIR)/shell/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_Library_add_defs,ooofilt_x64,\ - -DISOLATION_AWARE_ENABLED \ - -DWIN32_LEAN_AND_MEAN \ - -UNOMINMAX \ -)) - -$(eval $(call gb_Library_use_externals,ooofilt_x64,\ - expat_x64 \ - zlib_x64 \ -)) - -$(eval $(call gb_Library_use_system_win32_libs,ooofilt_x64,\ - advapi32 \ - comctl32 \ - gdi32 \ - gdiplus \ - kernel32 \ - msvcprt \ - msvcrt \ - oldnames \ - ole32 \ - oleaut32 \ - propsys \ - shell32 \ - user32 \ - uuid \ -)) - -$(eval $(call gb_Library_use_static_libraries,ooofilt_x64,\ - shell_xmlparser_x64 \ - shlxthandler_common_x64 \ -)) - -$(eval $(call gb_Library_add_ldflags,ooofilt_x64,\ - /DEF:$(SRCDIR)/shell/source/win32/shlxthandler/ooofilt/ooofilt.def \ - /NODEFAULTLIB:libcmt.lib \ -)) - -$(eval $(call gb_Library_add_x64_generated_exception_objects,ooofilt_x64,\ - CustomTarget/shell/source/win32/shlxthandler/ooofilt/ooofilt \ - CustomTarget/shell/source/win32/shlxthandler/ooofilt/propspec \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk deleted file mode 100644 index 5736f2152a11..000000000000 --- a/shell/Library_propertyhdl_x64.mk +++ /dev/null @@ -1,66 +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/. -# - -$(eval $(call gb_Library_Library,propertyhdl_x64)) - -$(eval $(call gb_Library_set_x64,propertyhdl_x64,YES)) - -$(eval $(call gb_Library_use_custom_headers,propertyhdl_x64,\ - shell/source \ -)) - -$(eval $(call gb_Library_set_include,propertyhdl_x64,\ - -I$(SRCDIR)/shell/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_Library_add_defs,propertyhdl_x64,\ - -DISOLATION_AWARE_ENABLED \ - -DWIN32_LEAN_AND_MEAN \ - -UNOMINMAX \ -)) - -$(eval $(call gb_Library_use_externals,propertyhdl_x64,\ - expat_x64 \ - zlib_x64 \ -)) - -$(eval $(call gb_Library_use_system_win32_libs,propertyhdl_x64,\ - advapi32 \ - comctl32 \ - gdi32 \ - gdiplus \ - kernel32 \ - msvcprt \ - msvcrt \ - oldnames \ - ole32 \ - oleaut32 \ - propsys \ - shell32 \ - shlwapi \ - user32 \ - uuid \ -)) - -$(eval $(call gb_Library_use_static_libraries,propertyhdl_x64,\ - shell_xmlparser_x64 \ - shlxthandler_common_x64 \ -)) - -$(eval $(call gb_Library_add_ldflags,propertyhdl_x64,\ - /DEF:$(SRCDIR)/shell/source/win32/shlxthandler/prophdl/propertyhdl.def \ - /NODEFAULTLIB:libcmt.lib \ -)) - -$(eval $(call gb_Library_add_x64_generated_exception_objects,propertyhdl_x64,\ - CustomTarget/shell/source/win32/shlxthandler/prophdl/propertyhdl \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk deleted file mode 100644 index 3501d46c3239..000000000000 --- a/shell/Library_shlxthdl_x64.mk +++ /dev/null @@ -1,74 +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/. -# - -$(eval $(call gb_Library_Library,shlxthdl_x64)) - -$(eval $(call gb_Library_set_x64,shlxthdl_x64,YES)) - -$(eval $(call gb_Library_use_custom_headers,shlxthdl_x64,\ - shell/source \ -)) - -$(eval $(call gb_Library_set_include,shlxthdl_x64,\ - -I$(SRCDIR)/shell/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_Library_add_defs,shlxthdl_x64,\ - -DISOLATION_AWARE_ENABLED \ - -DWIN32_LEAN_AND_MEAN \ - -UNOMINMAX \ -)) - -$(eval $(call gb_Library_use_externals,shlxthdl_x64,\ - expat_x64 \ - zlib_x64 \ -)) - -$(eval $(call gb_Library_use_system_win32_libs,shlxthdl_x64,\ - advapi32 \ - comctl32 \ - gdi32 \ - gdiplus \ - kernel32 \ - msvcprt \ - msvcrt \ - oldnames \ - ole32 \ - oleaut32 \ - shell32 \ - shlwapi \ - user32 \ - uuid \ -)) - -$(eval $(call gb_Library_use_static_libraries,shlxthdl_x64,\ - shlxthandler_common_x64 \ - shell_xmlparser_x64 \ -)) - -$(eval $(call gb_Library_add_nativeres,shlxthdl_x64,shlxthdl)) - -$(eval $(call gb_Library_add_ldflags,shlxthdl_x64,\ - /DEF:$(SRCDIR)/shell/source/win32/shlxthandler/shlxthdl.def \ - /NODEFAULTLIB:libcmt.lib \ -)) - -$(eval $(call gb_Library_add_x64_generated_exception_objects,shlxthdl_x64,\ - CustomTarget/shell/source/win32/shlxthandler/classfactory \ - CustomTarget/shell/source/win32/shlxthandler/columninfo/columninfo \ - CustomTarget/shell/source/win32/shlxthandler/infotips/infotips \ - CustomTarget/shell/source/win32/shlxthandler/propsheets/document_statistic \ - CustomTarget/shell/source/win32/shlxthandler/propsheets/listviewbuilder \ - CustomTarget/shell/source/win32/shlxthandler/propsheets/propsheets \ - CustomTarget/shell/source/win32/shlxthandler/shlxthdl \ - CustomTarget/shell/source/win32/shlxthandler/thumbviewer/thumbviewer \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index 220f27ebe7ac..58a598714a05 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -74,16 +74,6 @@ $(eval $(call gb_Module_add_check_targets,shell,\ )) endif -ifeq ($(BUILD_X64),TRUE) -$(eval $(call gb_Module_add_targets,shell,\ - CustomTarget_x64 \ - Library_ooofilt_x64 \ - Library_propertyhdl_x64 \ - Library_shlxthdl_x64 \ - StaticLibrary_shlxthandler_common_x64 \ - StaticLibrary_xmlparser_x64 \ -)) -endif ifneq ($(CXX_X64_BINARY),) $(eval $(call gb_Module_add_targets,shell,\ diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk deleted file mode 100644 index 2f906c516e68..000000000000 --- a/shell/StaticLibrary_shlxthandler_common_x64.mk +++ /dev/null @@ -1,49 +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/. -# - -$(eval $(call gb_StaticLibrary_StaticLibrary,shlxthandler_common_x64)) - -$(eval $(call gb_StaticLibrary_set_x64,shlxthandler_common_x64,YES)) - -$(eval $(call gb_StaticLibrary_use_custom_headers,shlxthandler_common_x64,\ - shell/source \ -)) - -$(eval $(call gb_StaticLibrary_set_include,shlxthandler_common_x64,\ - -I$(SRCDIR)/shell/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\ - -DISOLATION_AWARE_ENABLED \ - -DWIN32_LEAN_AND_MEAN \ -)) - -$(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\ - expat_x64 \ - zlib_x64 \ -)) - -$(eval $(call gb_StaticLibrary_add_x64_generated_exception_objects,shlxthandler_common_x64,\ - CustomTarget/shell/source/win32/ooofilereader/autostyletag \ - CustomTarget/shell/source/win32/ooofilereader/basereader \ - CustomTarget/shell/source/win32/ooofilereader/contentreader \ - CustomTarget/shell/source/win32/ooofilereader/keywordstag \ - CustomTarget/shell/source/win32/ooofilereader/metainforeader \ - CustomTarget/shell/source/win32/ooofilereader/simpletag \ - CustomTarget/shell/source/win32/shlxthandler/ooofilt/stream_helper \ - CustomTarget/shell/source/win32/shlxthandler/util/fileextensions \ - CustomTarget/shell/source/win32/shlxthandler/util/iso8601_converter \ - CustomTarget/shell/source/win32/shlxthandler/util/registry \ - CustomTarget/shell/source/win32/shlxthandler/util/utilities \ - CustomTarget/shell/source/win32/zipfile/zipexcptn \ - CustomTarget/shell/source/win32/zipfile/zipfile \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/StaticLibrary_xmlparser_x64.mk b/shell/StaticLibrary_xmlparser_x64.mk deleted file mode 100644 index e52e5a373633..000000000000 --- a/shell/StaticLibrary_xmlparser_x64.mk +++ /dev/null @@ -1,27 +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/. -# - -$(eval $(call gb_StaticLibrary_StaticLibrary,shell_xmlparser_x64)) - -$(eval $(call gb_StaticLibrary_set_x64,shell_xmlparser_x64,YES)) - -$(eval $(call gb_StaticLibrary_set_include,shell_xmlparser_x64,\ - -I$(SRCDIR)/shell/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser_x64,\ - expat_x64 \ -)) - -$(eval $(call gb_StaticLibrary_add_x64_generated_exception_objects,shell_xmlparser_x64,\ - CustomTarget/shell/source/all/xml_parser \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/gbuild/gen-autoinstall.py b/solenv/gbuild/gen-autoinstall.py index d42e8ae96ace..f4af6cc62c4a 100644 --- a/solenv/gbuild/gen-autoinstall.py +++ b/solenv/gbuild/gen-autoinstall.py @@ -71,7 +71,7 @@ print(", \ ".join([" " + gid for gid in allgids])) for (gid, link, target) in autosdklibs: print("SDK_LIBRARY_LINK(" + gid + "," + link + "," + target + ")") -scp2libtemplates = set([ "URE_PRIVATE_LIB", "LIBO_LIB_FILE", "LIBO_LIB_FILE_BINARYTABLE", "LIBO_LIB_FILE_COMPONENTCONDITION", "SHLXTHDL_LIB_FILE", "SHLXTHDL_X64_LIB_FILE_COMPONENTCONDITION" ]) +scp2libtemplates = set([ "URE_PRIVATE_LIB", "LIBO_LIB_FILE", "LIBO_LIB_FILE_BINARYTABLE", "LIBO_LIB_FILE_COMPONENTCONDITION", "SHLXTHDL_LIB_FILE" ]) for (gid, libfile) in autolibs: if scp2libtemplate not in scp2libtemplates: raise Exception("invalid scp2libtemplate \"" + scp2libtemplate + "\"") commit 396c9dd4a40c2e64774c34bb661ef75bfb235af6 Author: Christian Lohmaier <[email protected]> AuthorDate: Tue May 20 14:24:46 2025 +0200 Commit: Christian Lohmaier <[email protected]> CommitDate: Sat May 24 23:40:34 2025 +0200 don't add 64bit activex component to 32bit builds anymore makefile stuff anymore, there's still code that can be removed from the actual code (partly reverting 8f6b5370be6fe558f6658a0b0719ed64eb205212 that added support for using 64bit Internet Explorer with 32bit Office Change-Id: Id0c59e2ef2f4c87a04f18ea54ed04f4337ea6c73 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185564 Reviewed-by: Christian Lohmaier <[email protected]> Tested-by: Jenkins diff --git a/Repository.mk b/Repository.mk index 9543dcd4746c..976cc8090db1 100644 --- a/Repository.mk +++ b/Repository.mk @@ -728,12 +728,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activex, \ so_activex \ )) -ifneq ($(BUILD_X64),) -$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexwin64, \ - so_activex_x64 \ -)) -endif - $(eval $(call gb_Helper_register_executables_for_install,OOO,spsuppfiles, \ spsupp_helper \ )) diff --git a/extensions/CustomTarget_so_activex_x64.mk b/extensions/CustomTarget_so_activex_x64.mk deleted file mode 100644 index a91a114b52ff..000000000000 --- a/extensions/CustomTarget_so_activex_x64.mk +++ /dev/null @@ -1,25 +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/. -# - -$(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex)) - -$(call gb_CustomTarget_get_target,extensions/source/activex) : \ - $(gb_CustomTarget_workdir)/extensions/source/activex/SOActionsApproval.cxx \ - $(gb_CustomTarget_workdir)/extensions/source/activex/SOActiveX.cxx \ - $(gb_CustomTarget_workdir)/extensions/source/activex/SOComWindowPeer.cxx \ - $(gb_CustomTarget_workdir)/extensions/source/activex/SODispatchInterceptor.cxx \ - $(gb_CustomTarget_workdir)/extensions/source/activex/StdAfx2.cxx \ - $(gb_CustomTarget_workdir)/extensions/source/activex/so_activex.cxx \ - -$(gb_CustomTarget_workdir)/extensions/source/activex/% : \ - $(SRCDIR)/extensions/source/activex/% \ - | $(gb_CustomTarget_workdir)/extensions/source/activex/.dir - cp $< $@ - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk deleted file mode 100644 index 047c1044f86e..000000000000 --- a/extensions/Library_so_activex_x64.mk +++ /dev/null @@ -1,56 +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/. -# -# - -$(eval $(call gb_Library_Library,so_activex_x64)) - -$(eval $(call gb_Library_set_x64,so_activex_x64,YES)) - -$(eval $(call gb_Library_use_custom_headers,so_activex_x64,extensions/source/activex/idl)) - -$(eval $(call gb_Library_set_include,so_activex_x64,\ - $$(INCLUDE) \ - -I$(SRCDIR)/extensions/source/activex \ - $(foreach i,$(ATL_INCLUDE), -I$(i)) \ -)) - -$(eval $(call gb_Library_use_sdk_api,so_activex_x64)) - -$(eval $(call gb_Library_add_nativeres,so_activex_x64,so_activex)) - -$(eval $(call gb_Library_add_x64_generated_exception_objects,so_activex_x64,\ - CustomTarget/extensions/source/activex/so_activex \ - CustomTarget/extensions/source/activex/SOActiveX \ - CustomTarget/extensions/source/activex/SOComWindowPeer \ - CustomTarget/extensions/source/activex/SODispatchInterceptor \ - CustomTarget/extensions/source/activex/SOActionsApproval \ - CustomTarget/extensions/source/activex/StdAfx2 \ -)) - -$(eval $(call gb_Library_add_ldflags,so_activex_x64,\ - /DEF:$(SRCDIR)/extensions/source/activex/so_activex.def \ - -LIBPATH:$(ATL_LIB)/amd64 \ -)) - -$(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\ - advapi32 \ - gdi32 \ - ole32 \ - oleaut32 \ - shlwapi \ - urlmon \ - uuid \ -)) - -$(eval $(call gb_Library_add_libs,so_activex_x64,\ - $(subst /x86,/x64,$(ATL_LIB)/atls.lib)) \ -) - -# vim:set noet sw=4 ts=4: diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 9d415ea8c8c4..d353db855cff 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -84,12 +84,6 @@ $(eval $(call gb_Module_add_targets,extensions,\ CustomTarget_so_activex_idl \ )) -ifeq ($(BUILD_X64),TRUE) -$(eval $(call gb_Module_add_targets,extensions,\ - CustomTarget_so_activex_x64 \ - Library_so_activex_x64 \ -)) -endif # BUILD_X64 endif # COM=MSC $(eval $(call gb_Module_add_targets,extensions,\ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index e07de841357f..185300406dc8 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -11,7 +11,6 @@ $(eval $(call gb_AutoInstall_AutoInstall)) $(eval $(call gb_AutoInstall_add_module,activexbinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,activex,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstall_add_module,activexwin64,LIBO_LIB_FILE_COMPONENTCONDITION,,,,"VersionNT64")) $(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,base_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) diff --git a/scp2/InstallModule_activex.mk b/scp2/InstallModule_activex.mk index ea9b4731313b..b375b37cfc40 100644 --- a/scp2/InstallModule_activex.mk +++ b/scp2/InstallModule_activex.mk @@ -12,7 +12,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/activex)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/activex,\ activexbinarytable \ activex \ - activexwin64 \ )) $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/activex,\ diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp index 2f6645593b96..4bcfe848ff99 100644 --- a/scp2/source/activex/module_activex.scp +++ b/scp2/source/activex/module_activex.scp @@ -20,7 +20,6 @@ #include "AutoInstall/activexbinarytable" #include "AutoInstall/activex" -#include "AutoInstall/activexwin64" Module gid_Module_Optional_Activexcontrol PackageInfo = "packinfo_office.txt"; @@ -29,6 +28,5 @@ Module gid_Module_Optional_Activexcontrol Default = NO; ParentID = gid_Module_Optional; Files = (auto_activexbinarytable_ALL, - auto_activex_ALL, - auto_activexwin64_ALL); + auto_activex_ALL); End
