From 4ffdb6750fa7d656d249a745f9c6d5ba98353b14 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 12 Jun 2017 22:25:22 +0200 Subject: remove TDE integration (vclplug, address book, config backend) It has ~no users, can't even be built on modern Linuxes, and it annoys folks who want to refactor VCL. Per ESC decision from 2017-06-08, remove --enable-tde and --enable-tdeab. Change-Id: I51ce4786f29f8fcac2e2bb2a654c41fbfbbd8afd Reviewed-on: https://gerrit.libreoffice.org/38718 Tested-by: Jenkins Reviewed-by: Michael Stahl --- scp2/AutoInstall.mk | 1 - scp2/InstallModule_tde.mk | 18 ------------------ scp2/InstallScript_setup_osl.mk | 3 --- scp2/Module_scp2.mk | 3 --- scp2/source/tde/module_tde.scp | 24 ------------------------ scp2/source/tde/module_tde.ulf | 17 ----------------- 6 files changed, 66 deletions(-) delete mode 100644 scp2/InstallModule_tde.mk delete mode 100644 scp2/source/tde/module_tde.scp delete mode 100644 scp2/source/tde/module_tde.ulf (limited to 'scp2') diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 3c15f888584b..7c9d6c4538bd 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -45,7 +45,6 @@ $(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE, $(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE,,SDK_PACKAGE_FILELIST)) -$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(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)) diff --git a/scp2/InstallModule_tde.mk b/scp2/InstallModule_tde.mk deleted file mode 100644 index 0e5dae6a2ff5..000000000000 --- a/scp2/InstallModule_tde.mk +++ /dev/null @@ -1,18 +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_InstallModule_InstallModule,scp2/tde)) - -$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/tde,tde)) - -$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/tde,\ - scp2/source/tde/module_tde \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk index 862db6190b8f..63121d2cdc75 100644 --- a/scp2/InstallScript_setup_osl.mk +++ b/scp2/InstallScript_setup_osl.mk @@ -41,9 +41,6 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\ $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\ scp2/onlineupdate \ ) \ - $(if $(filter TRUE,$(ENABLE_TDE)),\ - scp2/tde \ - ) \ )) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index f94966bb74a7..f2bc6f45c3c4 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -42,9 +42,6 @@ $(eval $(call gb_Module_add_targets,scp2,\ $(if $(filter TRUE,$(ENABLE_KDE4)),\ InstallModule_kde \ ) \ - $(if $(filter TRUE,$(ENABLE_TDE)),\ - InstallModule_tde \ - ) \ )) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp deleted file mode 100644 index 24725de25303..000000000000 --- a/scp2/source/tde/module_tde.scp +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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/. - */ -/* - * Copyright (C) 2012, Timothy Pearson - */ - -#include "macros.inc" - -#include "AutoInstall/tde" - -Module gid_Module_Optional_Tde - ParentID = gid_Module_Optional; - Default = YES; - PackageInfo = "packinfo_office.txt"; - MOD_NAME_DESC(MODULE_OPTIONAL_TDE); - Styles = (); - Files = (auto_tde_ALL); -End - diff --git a/scp2/source/tde/module_tde.ulf b/scp2/source/tde/module_tde.ulf deleted file mode 100644 index ba230d28386f..000000000000 --- a/scp2/source/tde/module_tde.ulf +++ /dev/null @@ -1,17 +0,0 @@ -/* - * 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/. - */ -/* - * Copyright (C) 2012, Timothy Pearson - */ - -[STR_NAME_MODULE_OPTIONAL_TDE] -en-US = "TDE Integration" - -[STR_DESC_MODULE_OPTIONAL_TDE] -en-US = "System integration of %PRODUCTNAME %PRODUCTVERSION into TDE." - -- cgit