From a8485d558fab53291e2530fd9a1be581c1628deb Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 14 Sep 2021 17:26:17 +0200 Subject: [API CHANGE] Remove deprecated idlc and regmerge from the SDK * Client code must replace uses of idlc and regmerge with uses of unoidl-write, see the changes to odk/examples/ and ure/source/uretext/ in 40f2aee6584eafcf4cd1d95fcf1f775e5435440d "Provide unoidl-write also for the SDK" for examples. * The new types.rdb format is not compatible with LibreOffice < 4.1. Clients generating extensions containing such files are advised to use appropriate LibreOffice-minimal-version elements. * For compatibility with old extensions, reading the legacy types.rdb format is still supported. * The SDK no longer ships an idl/ sub-directory containing the udkap and offapi .idl files (as, unlike idlc, unoidl-write does not need them). odk/config/cfgWin.js had to be adapted to look (somewhat arbitrarily) for an examples/ sub-directory instead of idl/ when checking for "an sdk folder". gb_UnoApi_package_idlfiles became unused and has been removed. * The idlc and regmerge executables have been removed. Module idlc has been removed except for idlc/test/parser/, which is also used by CustomTarget_unoidl/unoidl-write_test, and which may eventually be moved into module unoidl. Module external/ucpp and the corresponding configure options have also been removed. Change-Id: I42a0231699b863b5ebe2bee63bc32c8f79278cc1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122363 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- external/Module_external.mk | 1 - external/ucpp/Executable_ucpp.mk | 33 --------------------------------- external/ucpp/Makefile | 14 -------------- external/ucpp/Module_ucpp.mk | 20 -------------------- external/ucpp/README | 3 --- external/ucpp/UnpackedTarball_ucpp.mk | 20 -------------------- external/ucpp/ucpp.patch | 11 ----------- 7 files changed, 102 deletions(-) delete mode 100644 external/ucpp/Executable_ucpp.mk delete mode 100644 external/ucpp/Makefile delete mode 100644 external/ucpp/Module_ucpp.mk delete mode 100644 external/ucpp/README delete mode 100644 external/ucpp/UnpackedTarball_ucpp.mk delete mode 100644 external/ucpp/ucpp.patch (limited to 'external') diff --git a/external/Module_external.mk b/external/Module_external.mk index c8ad9ae110a6..ed8f4904798a 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -94,7 +94,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,SKIA,skia) \ $(call gb_Helper_optional,STAROFFICE,libstaroffice) \ $(if $(filter WNT,$(OS)),twain_dsm) \ - $(call gb_Helper_optional,UCPP,ucpp) \ $(call gb_Helper_optional,VISIO,libvisio) \ $(call gb_Helper_optional,WPD,libwpd) \ $(call gb_Helper_optional,WPG,libwpg) \ diff --git a/external/ucpp/Executable_ucpp.mk b/external/ucpp/Executable_ucpp.mk deleted file mode 100644 index a4be71c4901c..000000000000 --- a/external/ucpp/Executable_ucpp.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_Executable_Executable,ucpp)) - -$(eval $(call gb_Executable_set_warnings_disabled,ucpp)) - -$(eval $(call gb_Executable_use_unpacked,ucpp,ucpp)) - -$(eval $(call gb_Executable_add_defs,ucpp,\ - -DNO_UCPP_BUF \ - -DUCPP_CONFIG \ - -DSTAND_ALONE \ -)) - -$(eval $(call gb_Executable_add_generated_cobjects,ucpp,\ - UnpackedTarball/ucpp/assert \ - UnpackedTarball/ucpp/cpp \ - UnpackedTarball/ucpp/eval \ - UnpackedTarball/ucpp/hash \ - UnpackedTarball/ucpp/lexer \ - UnpackedTarball/ucpp/macro \ - UnpackedTarball/ucpp/mem \ - UnpackedTarball/ucpp/nhash \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/ucpp/Makefile b/external/ucpp/Makefile deleted file mode 100644 index 569ad8a0ba7a..000000000000 --- a/external/ucpp/Makefile +++ /dev/null @@ -1,14 +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/. -# - -module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) - -include $(module_directory)/../../solenv/gbuild/partial_build.mk - -# vim: set noet sw=4 ts=4: diff --git a/external/ucpp/Module_ucpp.mk b/external/ucpp/Module_ucpp.mk deleted file mode 100644 index dc4c02f5307b..000000000000 --- a/external/ucpp/Module_ucpp.mk +++ /dev/null @@ -1,20 +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_Module_Module,ucpp)) - -# if not cross-compiling or we need ucpp for ODK -ifneq (,$(if $(CROSS_COMPILING),,T)$(filter ODK,$(BUILD_TYPE))) -$(eval $(call gb_Module_add_targets,ucpp,\ - Executable_ucpp \ - UnpackedTarball_ucpp \ -)) -endif - -# vim: set noet sw=4 ts=4: diff --git a/external/ucpp/README b/external/ucpp/README deleted file mode 100644 index 9246c701a267..000000000000 --- a/external/ucpp/README +++ /dev/null @@ -1,3 +0,0 @@ -ucpp is a C99 preprocessor - -Used to be hosted at https://code.google.com/p/ucpp/ - not sure where it's gone diff --git a/external/ucpp/UnpackedTarball_ucpp.mk b/external/ucpp/UnpackedTarball_ucpp.mk deleted file mode 100644 index 04d7113b8513..000000000000 --- a/external/ucpp/UnpackedTarball_ucpp.mk +++ /dev/null @@ -1,20 +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_UnpackedTarball_UnpackedTarball,ucpp)) - -$(eval $(call gb_UnpackedTarball_set_tarball,ucpp,$(UCPP_TARBALL))) - -$(eval $(call gb_UnpackedTarball_set_patchlevel,ucpp,0)) - -$(eval $(call gb_UnpackedTarball_add_patches,ucpp,\ - external/ucpp/ucpp.patch \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/ucpp/ucpp.patch b/external/ucpp/ucpp.patch deleted file mode 100644 index c9c4b92b7f79..000000000000 --- a/external/ucpp/ucpp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cpp.c -+++ cpp.c -@@ -2464,7 +2464,7 @@ - warning(-1, "unknown option '%s'", argv[i]); - } else { - if (filename != 0) { -- error(-1, "spurious filename '%s'", argv[i]); -+ error(-1, "spurious duplicate filename '%s' - vs. '%s' ", argv[i], filename); - return 2; - } - filename = argv[i]; -- cgit