diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2020-02-01 11:00:54 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2020-02-01 20:12:21 +0100 |
commit | 69e0d871ec1de2260f9213d3113464155eac173c (patch) | |
tree | 8e2d70bcd7eaef2c0dec275dd89050bf499e17b9 /desktop/inc | |
parent | 961f7e8ec8ef188c361b2b20b60b95e78ecccd33 (diff) |
make update_pch also consider files in <module>/src/**/inc
With --enable-pch=full there's not much difference between a "public"
header in <module>/inc and a private one in <module>/src/somewhere/inc .
And since the script searches recursively, this apparently helps to
find even more headers for lower pch levels.
Change-Id: I8483d0aa5b4fea5a59107c20a8aa5f1ef694af0a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87799
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'desktop/inc')
-rw-r--r-- | desktop/inc/pch/precompiled_deployment.hxx | 27 | ||||
-rw-r--r-- | desktop/inc/pch/precompiled_deploymentgui.hxx | 20 | ||||
-rw-r--r-- | desktop/inc/pch/precompiled_deploymentmisc.hxx | 14 | ||||
-rw-r--r-- | desktop/inc/pch/precompiled_sofficeapp.hxx | 42 |
4 files changed, 34 insertions, 69 deletions
diff --git a/desktop/inc/pch/precompiled_deployment.hxx b/desktop/inc/pch/precompiled_deployment.hxx index 667e9e562ece..f8753b4e6dfd 100644 --- a/desktop/inc/pch/precompiled_deployment.hxx +++ b/desktop/inc/pch/precompiled_deployment.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-10-17 15:14:31 using: + Generated on 2020-02-01 10:57:35 using: ./bin/update_pch desktop deployment --cutoff=3 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -27,41 +27,28 @@ #include <ostream> #include <unordered_map> #include <vector> -#include <o3tl/optional.hxx> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/diagnose.h> #include <osl/file.hxx> -#include <osl/mutex.hxx> #include <osl/security.hxx> -#include <osl/thread.h> -#include <osl/time.h> #include <rtl/bootstrap.hxx> #include <rtl/byteseq.hxx> #include <rtl/strbuf.hxx> -#include <rtl/string.h> #include <rtl/string.hxx> #include <rtl/textenc.h> -#include <rtl/uri.h> #include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> #include <sal/config.h> #include <sal/log.hxx> -#include <sal/saldllapi.h> -#include <sal/types.h> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <com/sun/star/deployment/DeploymentException.hpp> #include <com/sun/star/deployment/ExtensionRemovedException.hpp> -#include <com/sun/star/deployment/InstallException.hpp> -#include <com/sun/star/deployment/LicenseException.hpp> -#include <com/sun/star/deployment/VersionException.hpp> -#include <com/sun/star/deployment/thePackageManagerFactory.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/task/XInteractionApprove.hpp> @@ -74,11 +61,10 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/RuntimeException.hpp> +#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/util/XUpdatable.hpp> -#include <com/sun/star/xml/dom/XDocumentBuilder.hpp> -#include <com/sun/star/xml/xpath/XXPathAPI.hpp> #include <comphelper/comphelperdllapi.h> #include <comphelper/sequence.hxx> #include <comphelper/servicedecl.hxx> @@ -86,6 +72,7 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> +#include <o3tl/optional.hxx> #include <svl/inettype.hxx> #include <tools/diagnose_ex.h> #include <ucbhelper/content.hxx> @@ -93,6 +80,14 @@ #include <xmlscript/xml_helper.hxx> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 +#include <dp_backend.h> +#include <dp_descriptioninfoset.hxx> +#include <dp_identifier.hxx> +#include <dp_interact.h> +#include <dp_misc_api.hxx> +#include <dp_platform.hxx> +#include <dp_services.hxx> +#include <dp_ucb.h> #endif // PCH_LEVEL >= 4 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/pch/precompiled_deploymentgui.hxx b/desktop/inc/pch/precompiled_deploymentgui.hxx index 994036573ac1..4ee2eea8a0ad 100644 --- a/desktop/inc/pch/precompiled_deploymentgui.hxx +++ b/desktop/inc/pch/precompiled_deploymentgui.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-10-17 15:14:32 using: + Generated on 2020-02-01 10:57:35 using: ./bin/update_pch desktop deploymentgui --cutoff=3 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -28,7 +28,6 @@ #include <initializer_list> #include <iomanip> #include <limits.h> -#include <limits> #include <memory> #include <new> #include <ostream> @@ -37,12 +36,10 @@ #include <string> #include <utility> #include <vector> -#include <o3tl/optional.hxx> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/conditn.hxx> #include <osl/diagnose.h> -#include <osl/endian.h> #include <osl/file.hxx> #include <osl/interlck.h> #include <osl/mutex.hxx> @@ -50,9 +47,7 @@ #include <rtl/alloc.h> #include <rtl/locale.h> #include <rtl/ref.hxx> -#include <rtl/textcvt.h> #include <rtl/ustrbuf.hxx> -#include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/config.h> #include <sal/detail/log.h> @@ -67,13 +62,11 @@ #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/deployment/DependencyException.hpp> #include <com/sun/star/deployment/DeploymentException.hpp> +#include <com/sun/star/deployment/ExtensionManager.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> -#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> @@ -89,24 +82,25 @@ #include <comphelper/processfactory.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> -#include <cppuhelper/cppuhelperdllapi.h> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> +#include <o3tl/optional.hxx> #include <o3tl/typed_flags_set.hxx> #include <salhelper/thread.hxx> -#include <svtools/controldims.hxx> -#include <toolkit/helper/vclunohelper.hxx> #include <tools/gen.hxx> #include <tools/link.hxx> #include <tools/solar.h> #include <tools/toolsdllapi.h> #include <typelib/typedescription.h> -#include <ucbhelper/content.hxx> #include <uno/data.h> #include <uno/sequence2.h> #include <unotools/configmgr.hxx> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 +#include <dp_dependencies.hxx> +#include <dp_identifier.hxx> +#include <dp_misc_api.hxx> +#include <dp_update.hxx> #endif // PCH_LEVEL >= 4 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/pch/precompiled_deploymentmisc.hxx b/desktop/inc/pch/precompiled_deploymentmisc.hxx index 703c029f8609..abc7000aa514 100644 --- a/desktop/inc/pch/precompiled_deploymentmisc.hxx +++ b/desktop/inc/pch/precompiled_deploymentmisc.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-10-17 16:10:32 using: + Generated on 2020-02-01 10:57:36 using: ./bin/update_pch desktop deploymentmisc --cutoff=3 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -29,19 +29,14 @@ #include <string> #include <utility> #include <vector> -#include <o3tl/optional.hxx> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/diagnose.h> #include <osl/doublecheckedlocking.h> -#include <osl/file.h> #include <osl/getglobalmutex.hxx> #include <osl/interlck.h> -#include <osl/module.hxx> -#include <osl/mutex.hxx> #include <osl/pipe.hxx> #include <osl/security.hxx> -#include <osl/socket.hxx> #include <osl/thread.hxx> #include <osl/time.h> #include <rtl/alloc.h> @@ -51,10 +46,8 @@ #include <rtl/locale.h> #include <rtl/random.h> #include <rtl/ref.hxx> -#include <rtl/string.h> #include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> -#include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/config.h> #include <sal/detail/log.h> @@ -64,6 +57,7 @@ #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <com/sun/star/lang/XTypeProvider.hpp> +#include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.h> @@ -81,9 +75,11 @@ #include <salhelper/linkhelper.hxx> #include <typelib/typedescription.h> #include <uno/data.h> -#include <unotools/unotoolsdllapi.h> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 +#include <dp_descriptioninfoset.hxx> +#include <dp_misc_api.hxx> +#include <dp_version.hxx> #endif // PCH_LEVEL >= 4 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx index 87bcfaf98187..20f0f17391da 100644 --- a/desktop/inc/pch/precompiled_sofficeapp.hxx +++ b/desktop/inc/pch/precompiled_sofficeapp.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-10-17 15:14:35 using: + Generated on 2020-02-01 10:57:36 using: ./bin/update_pch desktop sofficeapp --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -32,7 +32,6 @@ #include <iomanip> #include <limits.h> #include <limits> -#include <list> #include <math.h> #include <memory> #include <new> @@ -44,30 +43,31 @@ #include <type_traits> #include <utility> #include <vector> -#include <o3tl/optional.hxx> -#include <boost/property_tree/ptree.hpp> +#include <boost/property_tree/ptree_fwd.hpp> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/conditn.hxx> #include <osl/diagnose.h> #include <osl/doublecheckedlocking.h> #include <osl/endian.h> +#include <osl/file.h> #include <osl/file.hxx> #include <osl/getglobalmutex.hxx> #include <osl/interlck.h> -#include <osl/module.h> #include <osl/mutex.h> #include <osl/mutex.hxx> +#include <osl/pipe.h> +#include <osl/pipe.hxx> #include <osl/security.h> #include <osl/security.hxx> #include <osl/thread.h> -#include <osl/thread.hxx> #include <osl/time.h> #include <rtl/alloc.h> #include <rtl/bootstrap.hxx> #include <rtl/byteseq.hxx> #include <rtl/digest.h> #include <rtl/instance.hxx> +#include <rtl/locale.h> #include <rtl/math.h> #include <rtl/math.hxx> #include <rtl/process.h> @@ -92,36 +92,19 @@ #include <sal/saldllapi.h> #include <sal/types.h> #include <sal/typesizes.h> -#include <vcl/IDialogRenderable.hxx> #include <vcl/Scanline.hxx> #include <vcl/alpha.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> -#include <vcl/cairo.hxx> #include <vcl/checksum.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> #include <vcl/errcode.hxx> #include <vcl/fntstyle.hxx> -#include <vcl/font.hxx> -#include <vcl/keycod.hxx> -#include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> -#include <vcl/metaactiontypes.hxx> -#include <vcl/outdev.hxx> -#include <vcl/outdevmap.hxx> -#include <vcl/outdevstate.hxx> #include <vcl/region.hxx> -#include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> -#include <vcl/task.hxx> -#include <vcl/timer.hxx> -#include <vcl/uitest/factory.hxx> #include <vcl/vclenum.hxx> -#include <vcl/vclevent.hxx> #include <vcl/vclptr.hxx> -#include <vcl/vclreferencebase.hxx> -#include <vcl/wall.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> @@ -144,7 +127,6 @@ #include <basic/sbxdef.hxx> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> -#include <com/sun/star/drawing/LineCap.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> @@ -156,6 +138,7 @@ #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/TypeClass.hdl> #include <com/sun/star/uno/XInterface.hpp> +#include <com/sun/star/uno/XWeak.hpp> #include <com/sun/star/uno/genfunc.h> #include <com/sun/star/uno/genfunc.hxx> #include <comphelper/comphelperdllapi.h> @@ -163,40 +146,37 @@ #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> #include <cppuhelper/cppuhelperdllapi.h> +#include <cppuhelper/implbase_ex_post.hxx> +#include <cppuhelper/implbase_ex_pre.hxx> #include <i18nlangtag/lang.h> #include <o3tl/cow_wrapper.hxx> +#include <o3tl/optional.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> +#include <salhelper/thread.hxx> #include <sfx2/dllapi.h> #include <svl/hint.hxx> -#include <svl/lstner.hxx> #include <svl/poolitem.hxx> #include <svl/svldllapi.h> #include <svl/typedwhich.hxx> #include <svtools/svtdllapi.h> #include <tools/color.hxx> #include <tools/diagnose_ex.h> -#include <tools/fldunit.hxx> #include <tools/fontenum.hxx> #include <tools/gen.hxx> #include <tools/link.hxx> #include <tools/mapunit.hxx> -#include <tools/poly.hxx> #include <tools/ref.hxx> #include <tools/solar.h> #include <tools/toolsdllapi.h> -#include <tools/wintypes.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> #include <uno/any2.h> #include <uno/data.h> #include <uno/sequence2.h> -#include <unotools/fontdefs.hxx> #include <unotools/options.hxx> -#include <unotools/resmgr.hxx> -#include <unotools/syslocale.hxx> #include <unotools/unotoolsdllapi.h> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 |