From 6c7659b584ea7ed3652ca4eb9a2297f36310c365 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 19 Apr 2013 18:54:16 +0200 Subject: [PATCH] move URE headers to include/ Change-Id: Ib48a12e902f2311c295b2007f08f44dee28f431d Reviewed-on: https://gerrit.libreoffice.org/3499 Reviewed-by: David Tardon Tested-by: David Tardon --- bean/Library_officebean.mk | 2 - codemaker/StaticLibrary_codemaker.mk | 3 - codemaker/StaticLibrary_codemaker_cpp.mk | 3 - codemaker/StaticLibrary_codemaker_java.mk | 3 - cosv/StaticLibrary_cosv.mk | 2 - cppu/CppunitTest_cppu_checkapi.mk | 48 ----- cppu/CustomTarget_cppu_allheaders.mk | 44 ---- cppu/Library_cppu.mk | 2 - cppu/Module_cppu.mk | 3 - cppu/Package_cppu_odk_headers.mk | 85 -------- .../CustomTarget_cppuhelper_allheaders.mk | 44 ---- cppuhelper/Module_cppuhelper.mk | 3 - cppuhelper/Package_cppuhelper_odk_headers.mk | 90 -------- cppuhelper/StaticLibrary_findsofficepath.mk | 2 - desktop/Executable_unopkg.com.mk | 1 - desktop/Library_libreoffice.mk | 2 - desktop/StaticLibrary_winextendloaderenv.mk | 2 - dtrans/StaticLibrary_dtobj.mk | 4 - embedserv/Library_inprocserv.mk | 1 - extensions/StaticLibrary_npsoenv.mk | 1 - extensions/StaticLibrary_plugcon.mk | 1 - i18nlangtag/Library_i18nlangtag.mk | 1 - {cppu/inc => include}/com/sun/star/uno/Any.h | 0 .../inc => include}/com/sun/star/uno/Any.hxx | 0 .../com/sun/star/uno/Reference.h | 0 .../com/sun/star/uno/Reference.hxx | 0 .../com/sun/star/uno/Sequence.h | 0 .../com/sun/star/uno/Sequence.hxx | 0 {cppu/inc => include}/com/sun/star/uno/Type.h | 0 .../inc => include}/com/sun/star/uno/Type.hxx | 0 .../com/sun/star/uno/genfunc.h | 0 .../com/sun/star/uno/genfunc.hxx | 0 {cppu/inc => include}/cppu/Enterable.hxx | 0 {cppu/inc => include}/cppu/EnvDcp.hxx | 0 {cppu/inc => include}/cppu/EnvGuards.hxx | 0 {cppu/inc => include}/cppu/Map.hxx | 0 {cppu/inc => include}/cppu/cppudllapi.h | 0 .../cppu/helper/purpenv/Environment.hxx | 0 .../cppu/helper/purpenv/Mapping.hxx | 0 {cppu/inc => include}/cppu/macros.hxx | 0 {cppu/inc => include}/cppu/unotype.hxx | 0 .../cppuhelper/access_control.hxx | 0 .../inc => include}/cppuhelper/basemutex.hxx | 0 .../inc => include}/cppuhelper/bootstrap.hxx | 0 .../inc => include}/cppuhelper/compbase.hxx | 0 .../inc => include}/cppuhelper/compbase1.hxx | 0 .../inc => include}/cppuhelper/compbase10.hxx | 0 .../inc => include}/cppuhelper/compbase11.hxx | 0 .../inc => include}/cppuhelper/compbase12.hxx | 0 .../inc => include}/cppuhelper/compbase2.hxx | 0 .../inc => include}/cppuhelper/compbase3.hxx | 0 .../inc => include}/cppuhelper/compbase4.hxx | 0 .../inc => include}/cppuhelper/compbase5.hxx | 0 .../inc => include}/cppuhelper/compbase6.hxx | 0 .../inc => include}/cppuhelper/compbase7.hxx | 0 .../inc => include}/cppuhelper/compbase8.hxx | 0 .../inc => include}/cppuhelper/compbase9.hxx | 0 .../cppuhelper/compbase_ex.hxx | 0 .../inc => include}/cppuhelper/component.hxx | 0 .../cppuhelper/component_context.hxx | 0 .../cppuhelper/cppuhelperdllapi.h | 0 .../inc => include}/cppuhelper/exc_hlp.hxx | 0 .../inc => include}/cppuhelper/factory.hxx | 0 .../cppuhelper/findsofficepath.h | 0 .../inc => include}/cppuhelper/implbase.hxx | 0 .../inc => include}/cppuhelper/implbase1.hxx | 0 .../inc => include}/cppuhelper/implbase10.hxx | 0 .../inc => include}/cppuhelper/implbase11.hxx | 0 .../inc => include}/cppuhelper/implbase12.hxx | 0 .../inc => include}/cppuhelper/implbase13.hxx | 0 .../inc => include}/cppuhelper/implbase2.hxx | 0 .../inc => include}/cppuhelper/implbase3.hxx | 0 .../inc => include}/cppuhelper/implbase4.hxx | 0 .../inc => include}/cppuhelper/implbase5.hxx | 0 .../inc => include}/cppuhelper/implbase6.hxx | 0 .../inc => include}/cppuhelper/implbase7.hxx | 0 .../inc => include}/cppuhelper/implbase8.hxx | 0 .../inc => include}/cppuhelper/implbase9.hxx | 0 .../cppuhelper/implbase_ex.hxx | 0 .../cppuhelper/implbase_ex_post.hxx | 0 .../cppuhelper/implbase_ex_pre.hxx | 0 .../cppuhelper/implementationentry.hxx | 0 .../cppuhelper/interfacecontainer.h | 0 .../cppuhelper/interfacecontainer.hxx | 0 .../cppuhelper/propertysetmixin.hxx | 0 .../inc => include}/cppuhelper/propshlp.hxx | 0 .../inc => include}/cppuhelper/proptypehlp.h | 0 .../cppuhelper/proptypehlp.hxx | 0 .../cppuhelper/queryinterface.hxx | 0 .../inc => include}/cppuhelper/shlib.hxx | 0 .../cppuhelper/supportsservice.hxx | 0 .../cppuhelper/typeprovider.hxx | 0 .../inc => include}/cppuhelper/unourl.hxx | 0 .../inc => include}/cppuhelper/weak.hxx | 0 .../inc => include}/cppuhelper/weakagg.hxx | 0 .../inc => include}/cppuhelper/weakref.hxx | 0 {sal/inc => include}/osl/conditn.h | 0 {sal/inc => include}/osl/conditn.hxx | 0 {sal/inc => include}/osl/diagnose.h | 0 {sal/inc => include}/osl/diagnose.hxx | 0 .../osl/doublecheckedlocking.h | 0 {sal/inc => include}/osl/endian.h | 0 {sal/inc => include}/osl/file.h | 0 {sal/inc => include}/osl/file.hxx | 0 {sal/inc => include}/osl/getglobalmutex.hxx | 0 {sal/inc => include}/osl/interlck.h | 0 {sal/inc => include}/osl/module.h | 0 {sal/inc => include}/osl/module.hxx | 0 {sal/inc => include}/osl/mutex.h | 0 {sal/inc => include}/osl/mutex.hxx | 0 {sal/inc => include}/osl/nlsupport.h | 0 {sal/inc => include}/osl/pipe.h | 0 {sal/inc => include}/osl/pipe.hxx | 0 {sal/inc => include}/osl/pipe_decl.hxx | 0 {sal/inc => include}/osl/process.h | 0 {sal/inc => include}/osl/profile.h | 0 {sal/inc => include}/osl/profile.hxx | 0 {sal/inc => include}/osl/security.h | 0 {sal/inc => include}/osl/security.hxx | 0 {sal/inc => include}/osl/security_decl.hxx | 0 {sal/inc => include}/osl/signal.h | 0 {sal/inc => include}/osl/socket.h | 0 {sal/inc => include}/osl/socket.hxx | 0 {sal/inc => include}/osl/socket_decl.hxx | 0 {sal/inc => include}/osl/thread.h | 0 {sal/inc => include}/osl/thread.hxx | 0 {sal/inc => include}/osl/time.h | 0 {sal/inc => include}/osl/util.h | 0 {sal/inc => include}/rtl/alloc.h | 0 {sal/inc => include}/rtl/allocator.hxx | 0 {sal/inc => include}/rtl/bootstrap.h | 0 {sal/inc => include}/rtl/bootstrap.hxx | 0 {sal/inc => include}/rtl/byteseq.h | 0 {sal/inc => include}/rtl/byteseq.hxx | 0 {sal/inc => include}/rtl/character.hxx | 0 {sal/inc => include}/rtl/cipher.h | 0 {sal/inc => include}/rtl/crc.h | 0 {sal/inc => include}/rtl/digest.h | 0 {sal/inc => include}/rtl/instance.hxx | 0 {sal/inc => include}/rtl/locale.h | 0 {sal/inc => include}/rtl/logfile.h | 0 {sal/inc => include}/rtl/logfile.hxx | 0 .../rtl/malformeduriexception.hxx | 0 {sal/inc => include}/rtl/math.h | 0 {sal/inc => include}/rtl/math.hxx | 0 {sal/inc => include}/rtl/process.h | 0 {sal/inc => include}/rtl/random.h | 0 {sal/inc => include}/rtl/ref.hxx | 0 {sal/inc => include}/rtl/strbuf.h | 0 {sal/inc => include}/rtl/strbuf.hxx | 0 {sal/inc => include}/rtl/string.h | 0 {sal/inc => include}/rtl/string.hxx | 0 {sal/inc => include}/rtl/stringconcat.hxx | 0 {sal/inc => include}/rtl/stringutils.hxx | 0 {sal/inc => include}/rtl/tencinfo.h | 0 {sal/inc => include}/rtl/textcvt.h | 0 {sal/inc => include}/rtl/textenc.h | 0 {sal/inc => include}/rtl/unload.h | 0 {sal/inc => include}/rtl/uri.h | 0 {sal/inc => include}/rtl/uri.hxx | 0 {sal/inc => include}/rtl/ustrbuf.h | 0 {sal/inc => include}/rtl/ustrbuf.hxx | 0 {sal/inc => include}/rtl/ustring.h | 0 {sal/inc => include}/rtl/ustring.hxx | 0 {sal/inc => include}/rtl/uuid.h | 0 .../inc => include}/sal/ByteBufferWrapper.hxx | 0 {sal/inc => include}/sal/alloca.h | 0 {sal/inc => include}/sal/config.h | 0 {sal/inc => include}/sal/detail/log.h | 0 {sal/inc => include}/sal/log-areas.dox | 0 {sal/inc => include}/sal/log.hxx | 0 {sal/inc => include}/sal/macros.h | 0 {sal/inc => include}/sal/main.h | 0 {sal/inc => include}/sal/mathconf.h | 0 {sal/inc => include}/sal/saldllapi.h | 0 {sal/inc => include}/sal/types.h | 0 include/sal/typesizes.h | 20 ++ .../inc => include}/salhelper/condition.hxx | 0 .../inc => include}/salhelper/dynload.hxx | 0 .../inc => include}/salhelper/linkhelper.hxx | 0 .../inc => include}/salhelper/refobj.hxx | 0 .../salhelper/salhelperdllapi.h | 0 .../salhelper/simplereferenceobject.hxx | 0 .../salhelper/singletonref.hxx | 0 .../inc => include}/salhelper/thread.hxx | 0 .../inc => include}/salhelper/timer.hxx | 0 .../inc => include}/systools/win32/snprintf.h | 0 {cppu/inc => include}/typelib/typeclass.h | 0 .../inc => include}/typelib/typedescription.h | 0 .../typelib/typedescription.hxx | 0 {cppu/inc => include}/typelib/uik.h | 0 {cppu/inc => include}/uno/Enterable.h | 0 {cppu/inc => include}/uno/EnvDcp.h | 0 {cppu/inc => include}/uno/any2.h | 0 {cppu/inc => include}/uno/current_context.h | 0 {cppu/inc => include}/uno/current_context.hxx | 0 {cppu/inc => include}/uno/data.h | 0 {cppu/inc => include}/uno/dispatcher.h | 0 {cppu/inc => include}/uno/dispatcher.hxx | 0 {cppu/inc => include}/uno/environment.h | 0 {cppu/inc => include}/uno/environment.hxx | 0 {cppu/inc => include}/uno/lbnames.h | 0 {cppu/inc => include}/uno/mapping.h | 0 {cppu/inc => include}/uno/mapping.hxx | 0 {cppu/inc => include}/uno/sequence2.h | 0 {cppu/inc => include}/uno/threadpool.h | 0 jurt/Library_jpipe.mk | 1 - l10ntools/StaticLibrary_transex.mk | 2 - lingucomponent/StaticLibrary_ulingu.mk | 4 - mysqlcppconn/Library_mysqlcppconn.mk | 2 - np_sdk/StaticLibrary_nputils.mk | 2 - .../CppunitTest_checkapi.mk | 21 +- .../CustomTarget_allheaders.mk | 14 +- odk/CustomTarget_doxygen.mk | 10 +- odk/Executable_unoapploader.mk | 1 - odk/Module_odk.mk | 5 + odk/PackageSet_odk_headers.mk | 17 ++ odk/Package_odk_headers.mk | 200 ++++++++++++++++++ odk/Package_odk_headers_generated.mk | 17 ++ odk/qa/checkapi/strings.cxx | 31 +++ pyuno/Library_pyuno_wrapper.mk | 2 - registry/StaticLibrary_registry_helper.mk | 2 - sal/CppunitTest_sal_checkapi.mk | 45 ---- sal/Library_sal.mk | 2 - sal/Library_uwinapi.mk | 2 - sal/Module_sal.mk | 4 - sal/Package_sal_generated.mk | 34 --- sal/Package_sal_odk_headers.mk | 109 ---------- sal/StaticLibrary_salcpprt.mk | 2 - salhelper/CppunitTest_salhelper_checkapi.mk | 45 ---- .../CustomTarget_salhelper_allheaders.mk | 44 ---- salhelper/Library_salhelper.mk | 2 - salhelper/Module_salhelper.mk | 3 - salhelper/Package_salhelper_odk_headers.mk | 44 ---- sax/StaticLibrary_sax_shared.mk | 3 - scp2/source/sdkoo/module_sdkoo.scp | 6 +- scp2/source/sdkoo/sdkoo.scp | 32 +-- sdext/Executable_xpdfimport.mk | 2 - sdext/StaticLibrary_pdfimport_s.mk | 4 - solenv/gbuild/LinkTarget.mk | 2 +- svx/AllLangResTarget_svx.mk | 1 - testtools/StaticLibrary_bridgetest.mk | 2 - tools/StaticLibrary_ooopathutils.mk | 2 - udm/StaticLibrary_udm.mk | 2 - vcl/StaticLibrary_headless.mk | 2 - vcl/StaticLibrary_vclmain.mk | 4 - writerperfect/StaticLibrary_writerperfect.mk | 4 - 247 files changed, 317 insertions(+), 783 deletions(-) delete mode 100644 cppu/CppunitTest_cppu_checkapi.mk delete mode 100644 cppu/CustomTarget_cppu_allheaders.mk delete mode 100644 cppu/Package_cppu_odk_headers.mk delete mode 100644 cppuhelper/CustomTarget_cppuhelper_allheaders.mk delete mode 100644 cppuhelper/Package_cppuhelper_odk_headers.mk rename {cppu/inc => include}/com/sun/star/uno/Any.h (100%) rename {cppu/inc => include}/com/sun/star/uno/Any.hxx (100%) rename {cppu/inc => include}/com/sun/star/uno/Reference.h (100%) rename {cppu/inc => include}/com/sun/star/uno/Reference.hxx (100%) rename {cppu/inc => include}/com/sun/star/uno/Sequence.h (100%) rename {cppu/inc => include}/com/sun/star/uno/Sequence.hxx (100%) rename {cppu/inc => include}/com/sun/star/uno/Type.h (100%) rename {cppu/inc => include}/com/sun/star/uno/Type.hxx (100%) rename {cppu/inc => include}/com/sun/star/uno/genfunc.h (100%) rename {cppu/inc => include}/com/sun/star/uno/genfunc.hxx (100%) rename {cppu/inc => include}/cppu/Enterable.hxx (100%) rename {cppu/inc => include}/cppu/EnvDcp.hxx (100%) rename {cppu/inc => include}/cppu/EnvGuards.hxx (100%) rename {cppu/inc => include}/cppu/Map.hxx (100%) rename {cppu/inc => include}/cppu/cppudllapi.h (100%) rename {cppu/inc => include}/cppu/helper/purpenv/Environment.hxx (100%) rename {cppu/inc => include}/cppu/helper/purpenv/Mapping.hxx (100%) rename {cppu/inc => include}/cppu/macros.hxx (100%) rename {cppu/inc => include}/cppu/unotype.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/access_control.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/basemutex.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/bootstrap.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/compbase.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/compbase1.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/compbase10.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/compbase11.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/compbase12.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/compbase2.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/compbase3.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/compbase4.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/compbase5.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/compbase6.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/compbase7.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/compbase8.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/compbase9.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/compbase_ex.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/component.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/component_context.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/cppuhelperdllapi.h (100%) rename {cppuhelper/inc => include}/cppuhelper/exc_hlp.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/factory.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/findsofficepath.h (100%) rename {cppuhelper/inc => include}/cppuhelper/implbase.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/implbase1.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/implbase10.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/implbase11.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/implbase12.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/implbase13.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/implbase2.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/implbase3.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/implbase4.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/implbase5.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/implbase6.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/implbase7.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/implbase8.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/implbase9.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/implbase_ex.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/implbase_ex_post.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/implbase_ex_pre.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/implementationentry.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/interfacecontainer.h (100%) rename {cppuhelper/inc => include}/cppuhelper/interfacecontainer.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/propertysetmixin.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/propshlp.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/proptypehlp.h (100%) rename {cppuhelper/inc => include}/cppuhelper/proptypehlp.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/queryinterface.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/shlib.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/supportsservice.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/typeprovider.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/unourl.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/weak.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/weakagg.hxx (100%) rename {cppuhelper/inc => include}/cppuhelper/weakref.hxx (100%) rename {sal/inc => include}/osl/conditn.h (100%) rename {sal/inc => include}/osl/conditn.hxx (100%) rename {sal/inc => include}/osl/diagnose.h (100%) rename {sal/inc => include}/osl/diagnose.hxx (100%) rename {sal/inc => include}/osl/doublecheckedlocking.h (100%) rename {sal/inc => include}/osl/endian.h (100%) rename {sal/inc => include}/osl/file.h (100%) rename {sal/inc => include}/osl/file.hxx (100%) rename {sal/inc => include}/osl/getglobalmutex.hxx (100%) rename {sal/inc => include}/osl/interlck.h (100%) rename {sal/inc => include}/osl/module.h (100%) rename {sal/inc => include}/osl/module.hxx (100%) rename {sal/inc => include}/osl/mutex.h (100%) rename {sal/inc => include}/osl/mutex.hxx (100%) rename {sal/inc => include}/osl/nlsupport.h (100%) rename {sal/inc => include}/osl/pipe.h (100%) rename {sal/inc => include}/osl/pipe.hxx (100%) rename {sal/inc => include}/osl/pipe_decl.hxx (100%) rename {sal/inc => include}/osl/process.h (100%) rename {sal/inc => include}/osl/profile.h (100%) rename {sal/inc => include}/osl/profile.hxx (100%) rename {sal/inc => include}/osl/security.h (100%) rename {sal/inc => include}/osl/security.hxx (100%) rename {sal/inc => include}/osl/security_decl.hxx (100%) rename {sal/inc => include}/osl/signal.h (100%) rename {sal/inc => include}/osl/socket.h (100%) rename {sal/inc => include}/osl/socket.hxx (100%) rename {sal/inc => include}/osl/socket_decl.hxx (100%) rename {sal/inc => include}/osl/thread.h (100%) rename {sal/inc => include}/osl/thread.hxx (100%) rename {sal/inc => include}/osl/time.h (100%) rename {sal/inc => include}/osl/util.h (100%) rename {sal/inc => include}/rtl/alloc.h (100%) rename {sal/inc => include}/rtl/allocator.hxx (100%) rename {sal/inc => include}/rtl/bootstrap.h (100%) rename {sal/inc => include}/rtl/bootstrap.hxx (100%) rename {sal/inc => include}/rtl/byteseq.h (100%) rename {sal/inc => include}/rtl/byteseq.hxx (100%) rename {sal/inc => include}/rtl/character.hxx (100%) rename {sal/inc => include}/rtl/cipher.h (100%) rename {sal/inc => include}/rtl/crc.h (100%) rename {sal/inc => include}/rtl/digest.h (100%) rename {sal/inc => include}/rtl/instance.hxx (100%) rename {sal/inc => include}/rtl/locale.h (100%) rename {sal/inc => include}/rtl/logfile.h (100%) rename {sal/inc => include}/rtl/logfile.hxx (100%) rename {sal/inc => include}/rtl/malformeduriexception.hxx (100%) rename {sal/inc => include}/rtl/math.h (100%) rename {sal/inc => include}/rtl/math.hxx (100%) rename {sal/inc => include}/rtl/process.h (100%) rename {sal/inc => include}/rtl/random.h (100%) rename {sal/inc => include}/rtl/ref.hxx (100%) rename {sal/inc => include}/rtl/strbuf.h (100%) rename {sal/inc => include}/rtl/strbuf.hxx (100%) rename {sal/inc => include}/rtl/string.h (100%) rename {sal/inc => include}/rtl/string.hxx (100%) rename {sal/inc => include}/rtl/stringconcat.hxx (100%) rename {sal/inc => include}/rtl/stringutils.hxx (100%) rename {sal/inc => include}/rtl/tencinfo.h (100%) rename {sal/inc => include}/rtl/textcvt.h (100%) rename {sal/inc => include}/rtl/textenc.h (100%) rename {sal/inc => include}/rtl/unload.h (100%) rename {sal/inc => include}/rtl/uri.h (100%) rename {sal/inc => include}/rtl/uri.hxx (100%) rename {sal/inc => include}/rtl/ustrbuf.h (100%) rename {sal/inc => include}/rtl/ustrbuf.hxx (100%) rename {sal/inc => include}/rtl/ustring.h (100%) rename {sal/inc => include}/rtl/ustring.hxx (100%) rename {sal/inc => include}/rtl/uuid.h (100%) rename {sal/inc => include}/sal/ByteBufferWrapper.hxx (100%) rename {sal/inc => include}/sal/alloca.h (100%) rename {sal/inc => include}/sal/config.h (100%) rename {sal/inc => include}/sal/detail/log.h (100%) rename {sal/inc => include}/sal/log-areas.dox (100%) rename {sal/inc => include}/sal/log.hxx (100%) rename {sal/inc => include}/sal/macros.h (100%) rename {sal/inc => include}/sal/main.h (100%) rename {sal/inc => include}/sal/mathconf.h (100%) rename {sal/inc => include}/sal/saldllapi.h (100%) rename {sal/inc => include}/sal/types.h (100%) create mode 100644 include/sal/typesizes.h rename {salhelper/inc => include}/salhelper/condition.hxx (100%) rename {salhelper/inc => include}/salhelper/dynload.hxx (100%) rename {salhelper/inc => include}/salhelper/linkhelper.hxx (100%) rename {salhelper/inc => include}/salhelper/refobj.hxx (100%) rename {salhelper/inc => include}/salhelper/salhelperdllapi.h (100%) rename {salhelper/inc => include}/salhelper/simplereferenceobject.hxx (100%) rename {salhelper/inc => include}/salhelper/singletonref.hxx (100%) rename {salhelper/inc => include}/salhelper/thread.hxx (100%) rename {salhelper/inc => include}/salhelper/timer.hxx (100%) rename {sal/inc => include}/systools/win32/snprintf.h (100%) rename {cppu/inc => include}/typelib/typeclass.h (100%) rename {cppu/inc => include}/typelib/typedescription.h (100%) rename {cppu/inc => include}/typelib/typedescription.hxx (100%) rename {cppu/inc => include}/typelib/uik.h (100%) rename {cppu/inc => include}/uno/Enterable.h (100%) rename {cppu/inc => include}/uno/EnvDcp.h (100%) rename {cppu/inc => include}/uno/any2.h (100%) rename {cppu/inc => include}/uno/current_context.h (100%) rename {cppu/inc => include}/uno/current_context.hxx (100%) rename {cppu/inc => include}/uno/data.h (100%) rename {cppu/inc => include}/uno/dispatcher.h (100%) rename {cppu/inc => include}/uno/dispatcher.hxx (100%) rename {cppu/inc => include}/uno/environment.h (100%) rename {cppu/inc => include}/uno/environment.hxx (100%) rename {cppu/inc => include}/uno/lbnames.h (100%) rename {cppu/inc => include}/uno/mapping.h (100%) rename {cppu/inc => include}/uno/mapping.hxx (100%) rename {cppu/inc => include}/uno/sequence2.h (100%) rename {cppu/inc => include}/uno/threadpool.h (100%) rename cppuhelper/CppunitTest_cppuhelper_checkapi.mk => odk/CppunitTest_checkapi.mk (71%) rename sal/CustomTarget_sal_allheaders.mk => odk/CustomTarget_allheaders.mk (82%) create mode 100644 odk/PackageSet_odk_headers.mk create mode 100644 odk/Package_odk_headers.mk create mode 100644 odk/Package_odk_headers_generated.mk create mode 100644 odk/qa/checkapi/strings.cxx delete mode 100644 sal/CppunitTest_sal_checkapi.mk delete mode 100644 sal/Package_sal_generated.mk delete mode 100644 sal/Package_sal_odk_headers.mk delete mode 100644 salhelper/CppunitTest_salhelper_checkapi.mk delete mode 100644 salhelper/CustomTarget_salhelper_allheaders.mk delete mode 100644 salhelper/Package_salhelper_odk_headers.mk diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index f76f224a29db..47e5d2fe174c 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_externals,officebean,\ ifneq ($(OS),WNT) $(eval $(call gb_Library_use_packages,officebean,\ - sal_generated \ - sal_odk_headers \ )) $(eval $(call gb_Library_add_cobjects,officebean,\ diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk index f95842fe37bb..36fbd962c0ea 100644 --- a/codemaker/StaticLibrary_codemaker.mk +++ b/codemaker/StaticLibrary_codemaker.mk @@ -32,9 +32,6 @@ $(eval $(call gb_StaticLibrary_use_external,codemaker,boost_headers)) $(eval $(call gb_StaticLibrary_use_packages,codemaker,\ codemaker_inc \ registry_inc \ - sal_generated \ - sal_odk_headers \ - salhelper_odk_headers \ unoidl_inc \ )) diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk index 6c081ffefcb6..61750aa040e4 100644 --- a/codemaker/StaticLibrary_codemaker_cpp.mk +++ b/codemaker/StaticLibrary_codemaker_cpp.mk @@ -32,9 +32,6 @@ $(eval $(call gb_StaticLibrary_use_external,codemaker_cpp,boost_headers)) $(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\ codemaker_inc \ registry_inc \ - sal_generated \ - sal_odk_headers \ - salhelper_odk_headers \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_cpp,\ diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk index 096da0fd78de..9bce1322d69f 100644 --- a/codemaker/StaticLibrary_codemaker_java.mk +++ b/codemaker/StaticLibrary_codemaker_java.mk @@ -32,9 +32,6 @@ $(eval $(call gb_StaticLibrary_use_external,codemaker_java,boost_headers)) $(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\ codemaker_inc \ registry_inc \ - sal_generated \ - sal_odk_headers \ - salhelper_odk_headers \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_java,\ diff --git a/cosv/StaticLibrary_cosv.mk b/cosv/StaticLibrary_cosv.mk index a2bef2b75177..d6f3229ee3e3 100644 --- a/cosv/StaticLibrary_cosv.mk +++ b/cosv/StaticLibrary_cosv.mk @@ -11,8 +11,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,cosv)) $(eval $(call gb_StaticLibrary_use_packages,cosv,\ cosv_inc \ - sal_generated \ - sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,cosv,\ diff --git a/cppu/CppunitTest_cppu_checkapi.mk b/cppu/CppunitTest_cppu_checkapi.mk deleted file mode 100644 index fe2c40f30430..000000000000 --- a/cppu/CppunitTest_cppu_checkapi.mk +++ /dev/null @@ -1,48 +0,0 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2011 Matúš Kukan (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_CppunitTest_CppunitTest,cppu_checkapi)) - -$(eval $(call gb_CppunitTest_use_custom_headers,cppu_checkapi,\ - cppu/allheaders \ -)) - -$(eval $(call gb_CppunitTest_add_exception_objects,cppu_checkapi,\ - cppu/qa/checkapi/strings \ -)) - -$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_checkapi, \ - cppu \ - udkapi \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,cppu_checkapi,\ - cppu \ - $(gb_UWINAPI) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/cppu/CustomTarget_cppu_allheaders.mk b/cppu/CustomTarget_cppu_allheaders.mk deleted file mode 100644 index 6959f5f5b104..000000000000 --- a/cppu/CustomTarget_cppu_allheaders.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2011 Matúš Kukan (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_CustomTarget_CustomTarget,cppu/allheaders)) - -cppu_allheaders_DIR := $(call gb_CustomTarget_get_workdir,cppu/allheaders) - -$(call gb_CustomTarget_get_target,cppu/allheaders) : \ - $(cppu_allheaders_DIR)/cppu_allheaders.hxx - -$(cppu_allheaders_DIR)/cppu_allheaders.hxx : \ - $(call gb_Package_get_target,cppu_odk_headers) \ - | $(cppu_allheaders_DIR)/.dir - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - printf '// Generated list of cppu includes\n' > $@ \ - $(foreach file,$(shell cat $<),\ - && printf '#include <%s>\n' $(subst $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,,$(file)) >> $@ \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk index dd6e4339b22e..3848a3dfcb8c 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -29,8 +29,6 @@ $(eval $(call gb_Library_Library,cppu)) $(eval $(call gb_Library_set_soversion_script,cppu,3,$(SRCDIR)/cppu/util/cppu.map)) -$(eval $(call gb_Library_use_package,cppu,cppu_odk_headers)) - $(eval $(call gb_Library_use_udk_api,cppu)) $(eval $(call gb_Library_add_defs,cppu,\ diff --git a/cppu/Module_cppu.mk b/cppu/Module_cppu.mk index c957320361a8..9ad0bfc6d184 100644 --- a/cppu/Module_cppu.mk +++ b/cppu/Module_cppu.mk @@ -28,18 +28,15 @@ $(eval $(call gb_Module_Module,cppu)) $(eval $(call gb_Module_add_targets,cppu,\ - CustomTarget_cppu_allheaders \ InternalUnoApi_cppu \ Library_affine_uno \ Library_cppu \ Library_log_uno \ Library_purpenvhelper \ Library_unsafe_uno \ - Package_cppu_odk_headers \ )) $(eval $(call gb_Module_add_check_targets,cppu,\ - CppunitTest_cppu_checkapi \ CppunitTest_cppu_qa_any \ CppunitTest_cppu_qa_recursion \ CppunitTest_cppu_qa_reference \ diff --git a/cppu/Package_cppu_odk_headers.mk b/cppu/Package_cppu_odk_headers.mk deleted file mode 100644 index 15459f769da1..000000000000 --- a/cppu/Package_cppu_odk_headers.mk +++ /dev/null @@ -1,85 +0,0 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2011 Matúš Kukan -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Package_Package,cppu_odk_headers,$(SRCDIR)/cppu/inc)) - -$(eval $(call gb_Package_set_outdir,cppu_odk_headers,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/com/sun/star/uno,\ - com/sun/star/uno/Any.h \ - com/sun/star/uno/Any.hxx \ - com/sun/star/uno/genfunc.h \ - com/sun/star/uno/genfunc.hxx \ - com/sun/star/uno/Reference.h \ - com/sun/star/uno/Reference.hxx \ - com/sun/star/uno/Sequence.h \ - com/sun/star/uno/Sequence.hxx \ - com/sun/star/uno/Type.h \ - com/sun/star/uno/Type.hxx \ -)) - -$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/cppu,\ - cppu/cppudllapi.h \ - cppu/EnvDcp.hxx \ - cppu/Enterable.hxx \ - cppu/EnvGuards.hxx \ - cppu/macros.hxx \ - cppu/Map.hxx \ - cppu/unotype.hxx \ -)) - -$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/cppu/helper/purpenv,\ - cppu/helper/purpenv/Environment.hxx \ - cppu/helper/purpenv/Mapping.hxx \ -)) - -$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/typelib,\ - typelib/typeclass.h \ - typelib/typedescription.h \ - typelib/typedescription.hxx \ - typelib/uik.h \ -)) - -$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/uno,\ - uno/any2.h \ - uno/current_context.h \ - uno/current_context.hxx \ - uno/data.h \ - uno/dispatcher.h \ - uno/dispatcher.hxx \ - uno/Enterable.h \ - uno/EnvDcp.h \ - uno/environment.h \ - uno/environment.hxx \ - uno/lbnames.h \ - uno/mapping.h \ - uno/mapping.hxx \ - uno/sequence2.h \ - uno/threadpool.h \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk b/cppuhelper/CustomTarget_cppuhelper_allheaders.mk deleted file mode 100644 index 08c8ee34a7c3..000000000000 --- a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2011 Matúš Kukan (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_CustomTarget_CustomTarget,cppuhelper/allheaders)) - -cppuhelper_allheaders_DIR := $(call gb_CustomTarget_get_workdir,cppuhelper/allheaders) - -$(call gb_CustomTarget_get_target,cppuhelper/allheaders) : \ - $(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx - -$(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx : \ - $(call gb_Package_get_target,cppuhelper_odk_headers) \ - | $(cppuhelper_allheaders_DIR)/.dir - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - printf '// Generated list of cppuhelper includes\n' > $@ \ - $(foreach file,$(shell cat $<),\ - && printf '#include <%s>\n' $(subst $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,,$(file)) >> $@ \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/cppuhelper/Module_cppuhelper.mk b/cppuhelper/Module_cppuhelper.mk index 96fd971b01f8..2606bd01e453 100644 --- a/cppuhelper/Module_cppuhelper.mk +++ b/cppuhelper/Module_cppuhelper.mk @@ -28,16 +28,13 @@ $(eval $(call gb_Module_Module,cppuhelper)) $(eval $(call gb_Module_add_targets,cppuhelper,\ - CustomTarget_cppuhelper_allheaders \ InternalUnoApi_cppuhelper \ Library_cppuhelper \ - Package_cppuhelper_odk_headers \ Package_unorc \ StaticLibrary_findsofficepath \ )) $(eval $(call gb_Module_add_check_targets,cppuhelper,\ - CppunitTest_cppuhelper_checkapi \ CppunitTest_cppuhelper_cppu_ifcontainer \ CppunitTest_cppuhelper_cppu_unourl \ )) diff --git a/cppuhelper/Package_cppuhelper_odk_headers.mk b/cppuhelper/Package_cppuhelper_odk_headers.mk deleted file mode 100644 index 93fac81c36eb..000000000000 --- a/cppuhelper/Package_cppuhelper_odk_headers.mk +++ /dev/null @@ -1,90 +0,0 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2011 Matúš Kukan (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Package_Package,cppuhelper_odk_headers,$(SRCDIR)/cppuhelper/inc)) - -$(eval $(call gb_Package_set_outdir,cppuhelper_odk_headers,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,cppuhelper_odk_headers,$(gb_Package_SDKDIRNAME)/include/cppuhelper,\ - cppuhelper/cppuhelperdllapi.h \ - cppuhelper/access_control.hxx \ - cppuhelper/basemutex.hxx \ - cppuhelper/bootstrap.hxx \ - cppuhelper/compbase10.hxx \ - cppuhelper/compbase11.hxx \ - cppuhelper/compbase12.hxx \ - cppuhelper/compbase1.hxx \ - cppuhelper/compbase2.hxx \ - cppuhelper/compbase3.hxx \ - cppuhelper/compbase4.hxx \ - cppuhelper/compbase5.hxx \ - cppuhelper/compbase6.hxx \ - cppuhelper/compbase7.hxx \ - cppuhelper/compbase8.hxx \ - cppuhelper/compbase9.hxx \ - cppuhelper/compbase_ex.hxx \ - cppuhelper/compbase.hxx \ - cppuhelper/component_context.hxx \ - cppuhelper/component.hxx \ - cppuhelper/exc_hlp.hxx \ - cppuhelper/factory.hxx \ - cppuhelper/findsofficepath.h \ - cppuhelper/implbase10.hxx \ - cppuhelper/implbase11.hxx \ - cppuhelper/implbase12.hxx \ - cppuhelper/implbase13.hxx \ - cppuhelper/implbase1.hxx \ - cppuhelper/implbase2.hxx \ - cppuhelper/implbase3.hxx \ - cppuhelper/implbase4.hxx \ - cppuhelper/implbase5.hxx \ - cppuhelper/implbase6.hxx \ - cppuhelper/implbase7.hxx \ - cppuhelper/implbase8.hxx \ - cppuhelper/implbase9.hxx \ - cppuhelper/implbase_ex.hxx \ - cppuhelper/implbase_ex_post.hxx \ - cppuhelper/implbase_ex_pre.hxx \ - cppuhelper/implbase.hxx \ - cppuhelper/implementationentry.hxx \ - cppuhelper/interfacecontainer.h \ - cppuhelper/interfacecontainer.hxx \ - cppuhelper/propertysetmixin.hxx \ - cppuhelper/propshlp.hxx \ - cppuhelper/proptypehlp.h \ - cppuhelper/proptypehlp.hxx \ - cppuhelper/queryinterface.hxx \ - cppuhelper/shlib.hxx \ - cppuhelper/supportsservice.hxx \ - cppuhelper/typeprovider.hxx \ - cppuhelper/unourl.hxx \ - cppuhelper/weakagg.hxx \ - cppuhelper/weak.hxx \ - cppuhelper/weakref.hxx \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/cppuhelper/StaticLibrary_findsofficepath.mk b/cppuhelper/StaticLibrary_findsofficepath.mk index 446577b32f60..ddb1e5b2334d 100644 --- a/cppuhelper/StaticLibrary_findsofficepath.mk +++ b/cppuhelper/StaticLibrary_findsofficepath.mk @@ -10,8 +10,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,findsofficepath)) $(eval $(call gb_StaticLibrary_use_packages,findsofficepath,\ - cppuhelper_odk_headers \ - sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_add_cobjects,findsofficepath,\ diff --git a/desktop/Executable_unopkg.com.mk b/desktop/Executable_unopkg.com.mk index 499ae59b2919..f8a17fd5a2f3 100644 --- a/desktop/Executable_unopkg.com.mk +++ b/desktop/Executable_unopkg.com.mk @@ -11,7 +11,6 @@ $(eval $(call gb_Executable_Executable,unopkg_com)) $(eval $(call gb_Executable_use_packages,unopkg_com,\ sal_inc \ - sal_odk_headers \ )) $(eval $(call gb_Executable_set_targettype_gui,unopkg_com,NO)) diff --git a/desktop/Library_libreoffice.mk b/desktop/Library_libreoffice.mk index c18816ff3194..6b42adf932cd 100644 --- a/desktop/Library_libreoffice.mk +++ b/desktop/Library_libreoffice.mk @@ -10,8 +10,6 @@ $(eval $(call gb_Library_Library,libreoffice)) $(eval $(call gb_Library_use_packages,libreoffice,\ - sal_generated \ - sal_odk_headers \ )) $(eval $(call gb_Library_set_include,libreoffice,\ diff --git a/desktop/StaticLibrary_winextendloaderenv.mk b/desktop/StaticLibrary_winextendloaderenv.mk index 51f94e2b08a6..f2a2b955ddc1 100644 --- a/desktop/StaticLibrary_winextendloaderenv.mk +++ b/desktop/StaticLibrary_winextendloaderenv.mk @@ -11,8 +11,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,winextendloaderenv)) $(eval $(call gb_StaticLibrary_use_packages,winextendloaderenv,\ - sal_generated \ - sal_odk_headers \ tools_inc \ )) diff --git a/dtrans/StaticLibrary_dtobj.mk b/dtrans/StaticLibrary_dtobj.mk index e275021e443a..70a9aec87734 100644 --- a/dtrans/StaticLibrary_dtobj.mk +++ b/dtrans/StaticLibrary_dtobj.mk @@ -30,11 +30,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,dtobj)) $(eval $(call gb_StaticLibrary_use_packages,dtobj,\ comphelper_inc \ - cppu_odk_headers \ - cppuhelper_odk_headers \ - sal_generated \ sal_inc \ - sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_use_sdk_api,dtobj)) diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk index c016355d8f45..417c22f00b6b 100644 --- a/embedserv/Library_inprocserv.mk +++ b/embedserv/Library_inprocserv.mk @@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_libraries,inprocserv,\ $(eval $(call gb_Library_use_packages,inprocserv,\ comphelper_inc \ - sal_odk_headers \ )) ifeq ($(COM),MSC) diff --git a/extensions/StaticLibrary_npsoenv.mk b/extensions/StaticLibrary_npsoenv.mk index 68a70f50decf..a81c69b1cd97 100644 --- a/extensions/StaticLibrary_npsoenv.mk +++ b/extensions/StaticLibrary_npsoenv.mk @@ -11,7 +11,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,npsoenv)) $(eval $(call gb_StaticLibrary_use_packages,npsoenv,\ - sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,npsoenv,\ diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk index 17f82a7c2bf1..bfe1ea36d019 100644 --- a/extensions/StaticLibrary_plugcon.mk +++ b/extensions/StaticLibrary_plugcon.mk @@ -17,7 +17,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,plugcon)) $(eval $(call gb_StaticLibrary_use_packages,plugcon,\ basegfx_inc \ comphelper_inc \ - cppu_odk_headers \ i18nlangtag_inc \ np_sdk_inc \ o3tl_inc \ diff --git a/i18nlangtag/Library_i18nlangtag.mk b/i18nlangtag/Library_i18nlangtag.mk index 2f5efa0d7d55..2953e764d6cc 100644 --- a/i18nlangtag/Library_i18nlangtag.mk +++ b/i18nlangtag/Library_i18nlangtag.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Library_Library,i18nlangtag)) $(eval $(call gb_Library_use_packages,i18nlangtag,\ - cppu_odk_headers \ i18nlangtag_inc \ )) diff --git a/cppu/inc/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h similarity index 100% rename from cppu/inc/com/sun/star/uno/Any.h rename to include/com/sun/star/uno/Any.h diff --git a/cppu/inc/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx similarity index 100% rename from cppu/inc/com/sun/star/uno/Any.hxx rename to include/com/sun/star/uno/Any.hxx diff --git a/cppu/inc/com/sun/star/uno/Reference.h b/include/com/sun/star/uno/Reference.h similarity index 100% rename from cppu/inc/com/sun/star/uno/Reference.h rename to include/com/sun/star/uno/Reference.h diff --git a/cppu/inc/com/sun/star/uno/Reference.hxx b/include/com/sun/star/uno/Reference.hxx similarity index 100% rename from cppu/inc/com/sun/star/uno/Reference.hxx rename to include/com/sun/star/uno/Reference.hxx diff --git a/cppu/inc/com/sun/star/uno/Sequence.h b/include/com/sun/star/uno/Sequence.h similarity index 100% rename from cppu/inc/com/sun/star/uno/Sequence.h rename to include/com/sun/star/uno/Sequence.h diff --git a/cppu/inc/com/sun/star/uno/Sequence.hxx b/include/com/sun/star/uno/Sequence.hxx similarity index 100% rename from cppu/inc/com/sun/star/uno/Sequence.hxx rename to include/com/sun/star/uno/Sequence.hxx diff --git a/cppu/inc/com/sun/star/uno/Type.h b/include/com/sun/star/uno/Type.h similarity index 100% rename from cppu/inc/com/sun/star/uno/Type.h rename to include/com/sun/star/uno/Type.h diff --git a/cppu/inc/com/sun/star/uno/Type.hxx b/include/com/sun/star/uno/Type.hxx similarity index 100% rename from cppu/inc/com/sun/star/uno/Type.hxx rename to include/com/sun/star/uno/Type.hxx diff --git a/cppu/inc/com/sun/star/uno/genfunc.h b/include/com/sun/star/uno/genfunc.h similarity index 100% rename from cppu/inc/com/sun/star/uno/genfunc.h rename to include/com/sun/star/uno/genfunc.h diff --git a/cppu/inc/com/sun/star/uno/genfunc.hxx b/include/com/sun/star/uno/genfunc.hxx similarity index 100% rename from cppu/inc/com/sun/star/uno/genfunc.hxx rename to include/com/sun/star/uno/genfunc.hxx diff --git a/cppu/inc/cppu/Enterable.hxx b/include/cppu/Enterable.hxx similarity index 100% rename from cppu/inc/cppu/Enterable.hxx rename to include/cppu/Enterable.hxx diff --git a/cppu/inc/cppu/EnvDcp.hxx b/include/cppu/EnvDcp.hxx similarity index 100% rename from cppu/inc/cppu/EnvDcp.hxx rename to include/cppu/EnvDcp.hxx diff --git a/cppu/inc/cppu/EnvGuards.hxx b/include/cppu/EnvGuards.hxx similarity index 100% rename from cppu/inc/cppu/EnvGuards.hxx rename to include/cppu/EnvGuards.hxx diff --git a/cppu/inc/cppu/Map.hxx b/include/cppu/Map.hxx similarity index 100% rename from cppu/inc/cppu/Map.hxx rename to include/cppu/Map.hxx diff --git a/cppu/inc/cppu/cppudllapi.h b/include/cppu/cppudllapi.h similarity index 100% rename from cppu/inc/cppu/cppudllapi.h rename to include/cppu/cppudllapi.h diff --git a/cppu/inc/cppu/helper/purpenv/Environment.hxx b/include/cppu/helper/purpenv/Environment.hxx similarity index 100% rename from cppu/inc/cppu/helper/purpenv/Environment.hxx rename to include/cppu/helper/purpenv/Environment.hxx diff --git a/cppu/inc/cppu/helper/purpenv/Mapping.hxx b/include/cppu/helper/purpenv/Mapping.hxx similarity index 100% rename from cppu/inc/cppu/helper/purpenv/Mapping.hxx rename to include/cppu/helper/purpenv/Mapping.hxx diff --git a/cppu/inc/cppu/macros.hxx b/include/cppu/macros.hxx similarity index 100% rename from cppu/inc/cppu/macros.hxx rename to include/cppu/macros.hxx diff --git a/cppu/inc/cppu/unotype.hxx b/include/cppu/unotype.hxx similarity index 100% rename from cppu/inc/cppu/unotype.hxx rename to include/cppu/unotype.hxx diff --git a/cppuhelper/inc/cppuhelper/access_control.hxx b/include/cppuhelper/access_control.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/access_control.hxx rename to include/cppuhelper/access_control.hxx diff --git a/cppuhelper/inc/cppuhelper/basemutex.hxx b/include/cppuhelper/basemutex.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/basemutex.hxx rename to include/cppuhelper/basemutex.hxx diff --git a/cppuhelper/inc/cppuhelper/bootstrap.hxx b/include/cppuhelper/bootstrap.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/bootstrap.hxx rename to include/cppuhelper/bootstrap.hxx diff --git a/cppuhelper/inc/cppuhelper/compbase.hxx b/include/cppuhelper/compbase.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/compbase.hxx rename to include/cppuhelper/compbase.hxx diff --git a/cppuhelper/inc/cppuhelper/compbase1.hxx b/include/cppuhelper/compbase1.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/compbase1.hxx rename to include/cppuhelper/compbase1.hxx diff --git a/cppuhelper/inc/cppuhelper/compbase10.hxx b/include/cppuhelper/compbase10.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/compbase10.hxx rename to include/cppuhelper/compbase10.hxx diff --git a/cppuhelper/inc/cppuhelper/compbase11.hxx b/include/cppuhelper/compbase11.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/compbase11.hxx rename to include/cppuhelper/compbase11.hxx diff --git a/cppuhelper/inc/cppuhelper/compbase12.hxx b/include/cppuhelper/compbase12.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/compbase12.hxx rename to include/cppuhelper/compbase12.hxx diff --git a/cppuhelper/inc/cppuhelper/compbase2.hxx b/include/cppuhelper/compbase2.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/compbase2.hxx rename to include/cppuhelper/compbase2.hxx diff --git a/cppuhelper/inc/cppuhelper/compbase3.hxx b/include/cppuhelper/compbase3.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/compbase3.hxx rename to include/cppuhelper/compbase3.hxx diff --git a/cppuhelper/inc/cppuhelper/compbase4.hxx b/include/cppuhelper/compbase4.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/compbase4.hxx rename to include/cppuhelper/compbase4.hxx diff --git a/cppuhelper/inc/cppuhelper/compbase5.hxx b/include/cppuhelper/compbase5.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/compbase5.hxx rename to include/cppuhelper/compbase5.hxx diff --git a/cppuhelper/inc/cppuhelper/compbase6.hxx b/include/cppuhelper/compbase6.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/compbase6.hxx rename to include/cppuhelper/compbase6.hxx diff --git a/cppuhelper/inc/cppuhelper/compbase7.hxx b/include/cppuhelper/compbase7.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/compbase7.hxx rename to include/cppuhelper/compbase7.hxx diff --git a/cppuhelper/inc/cppuhelper/compbase8.hxx b/include/cppuhelper/compbase8.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/compbase8.hxx rename to include/cppuhelper/compbase8.hxx diff --git a/cppuhelper/inc/cppuhelper/compbase9.hxx b/include/cppuhelper/compbase9.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/compbase9.hxx rename to include/cppuhelper/compbase9.hxx diff --git a/cppuhelper/inc/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/compbase_ex.hxx rename to include/cppuhelper/compbase_ex.hxx diff --git a/cppuhelper/inc/cppuhelper/component.hxx b/include/cppuhelper/component.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/component.hxx rename to include/cppuhelper/component.hxx diff --git a/cppuhelper/inc/cppuhelper/component_context.hxx b/include/cppuhelper/component_context.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/component_context.hxx rename to include/cppuhelper/component_context.hxx diff --git a/cppuhelper/inc/cppuhelper/cppuhelperdllapi.h b/include/cppuhelper/cppuhelperdllapi.h similarity index 100% rename from cppuhelper/inc/cppuhelper/cppuhelperdllapi.h rename to include/cppuhelper/cppuhelperdllapi.h diff --git a/cppuhelper/inc/cppuhelper/exc_hlp.hxx b/include/cppuhelper/exc_hlp.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/exc_hlp.hxx rename to include/cppuhelper/exc_hlp.hxx diff --git a/cppuhelper/inc/cppuhelper/factory.hxx b/include/cppuhelper/factory.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/factory.hxx rename to include/cppuhelper/factory.hxx diff --git a/cppuhelper/inc/cppuhelper/findsofficepath.h b/include/cppuhelper/findsofficepath.h similarity index 100% rename from cppuhelper/inc/cppuhelper/findsofficepath.h rename to include/cppuhelper/findsofficepath.h diff --git a/cppuhelper/inc/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/implbase.hxx rename to include/cppuhelper/implbase.hxx diff --git a/cppuhelper/inc/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/implbase1.hxx rename to include/cppuhelper/implbase1.hxx diff --git a/cppuhelper/inc/cppuhelper/implbase10.hxx b/include/cppuhelper/implbase10.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/implbase10.hxx rename to include/cppuhelper/implbase10.hxx diff --git a/cppuhelper/inc/cppuhelper/implbase11.hxx b/include/cppuhelper/implbase11.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/implbase11.hxx rename to include/cppuhelper/implbase11.hxx diff --git a/cppuhelper/inc/cppuhelper/implbase12.hxx b/include/cppuhelper/implbase12.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/implbase12.hxx rename to include/cppuhelper/implbase12.hxx diff --git a/cppuhelper/inc/cppuhelper/implbase13.hxx b/include/cppuhelper/implbase13.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/implbase13.hxx rename to include/cppuhelper/implbase13.hxx diff --git a/cppuhelper/inc/cppuhelper/implbase2.hxx b/include/cppuhelper/implbase2.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/implbase2.hxx rename to include/cppuhelper/implbase2.hxx diff --git a/cppuhelper/inc/cppuhelper/implbase3.hxx b/include/cppuhelper/implbase3.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/implbase3.hxx rename to include/cppuhelper/implbase3.hxx diff --git a/cppuhelper/inc/cppuhelper/implbase4.hxx b/include/cppuhelper/implbase4.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/implbase4.hxx rename to include/cppuhelper/implbase4.hxx diff --git a/cppuhelper/inc/cppuhelper/implbase5.hxx b/include/cppuhelper/implbase5.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/implbase5.hxx rename to include/cppuhelper/implbase5.hxx diff --git a/cppuhelper/inc/cppuhelper/implbase6.hxx b/include/cppuhelper/implbase6.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/implbase6.hxx rename to include/cppuhelper/implbase6.hxx diff --git a/cppuhelper/inc/cppuhelper/implbase7.hxx b/include/cppuhelper/implbase7.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/implbase7.hxx rename to include/cppuhelper/implbase7.hxx diff --git a/cppuhelper/inc/cppuhelper/implbase8.hxx b/include/cppuhelper/implbase8.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/implbase8.hxx rename to include/cppuhelper/implbase8.hxx diff --git a/cppuhelper/inc/cppuhelper/implbase9.hxx b/include/cppuhelper/implbase9.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/implbase9.hxx rename to include/cppuhelper/implbase9.hxx diff --git a/cppuhelper/inc/cppuhelper/implbase_ex.hxx b/include/cppuhelper/implbase_ex.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/implbase_ex.hxx rename to include/cppuhelper/implbase_ex.hxx diff --git a/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx b/include/cppuhelper/implbase_ex_post.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/implbase_ex_post.hxx rename to include/cppuhelper/implbase_ex_post.hxx diff --git a/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx b/include/cppuhelper/implbase_ex_pre.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx rename to include/cppuhelper/implbase_ex_pre.hxx diff --git a/cppuhelper/inc/cppuhelper/implementationentry.hxx b/include/cppuhelper/implementationentry.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/implementationentry.hxx rename to include/cppuhelper/implementationentry.hxx diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h similarity index 100% rename from cppuhelper/inc/cppuhelper/interfacecontainer.h rename to include/cppuhelper/interfacecontainer.h diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx b/include/cppuhelper/interfacecontainer.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/interfacecontainer.hxx rename to include/cppuhelper/interfacecontainer.hxx diff --git a/cppuhelper/inc/cppuhelper/propertysetmixin.hxx b/include/cppuhelper/propertysetmixin.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/propertysetmixin.hxx rename to include/cppuhelper/propertysetmixin.hxx diff --git a/cppuhelper/inc/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/propshlp.hxx rename to include/cppuhelper/propshlp.hxx diff --git a/cppuhelper/inc/cppuhelper/proptypehlp.h b/include/cppuhelper/proptypehlp.h similarity index 100% rename from cppuhelper/inc/cppuhelper/proptypehlp.h rename to include/cppuhelper/proptypehlp.h diff --git a/cppuhelper/inc/cppuhelper/proptypehlp.hxx b/include/cppuhelper/proptypehlp.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/proptypehlp.hxx rename to include/cppuhelper/proptypehlp.hxx diff --git a/cppuhelper/inc/cppuhelper/queryinterface.hxx b/include/cppuhelper/queryinterface.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/queryinterface.hxx rename to include/cppuhelper/queryinterface.hxx diff --git a/cppuhelper/inc/cppuhelper/shlib.hxx b/include/cppuhelper/shlib.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/shlib.hxx rename to include/cppuhelper/shlib.hxx diff --git a/cppuhelper/inc/cppuhelper/supportsservice.hxx b/include/cppuhelper/supportsservice.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/supportsservice.hxx rename to include/cppuhelper/supportsservice.hxx diff --git a/cppuhelper/inc/cppuhelper/typeprovider.hxx b/include/cppuhelper/typeprovider.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/typeprovider.hxx rename to include/cppuhelper/typeprovider.hxx diff --git a/cppuhelper/inc/cppuhelper/unourl.hxx b/include/cppuhelper/unourl.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/unourl.hxx rename to include/cppuhelper/unourl.hxx diff --git a/cppuhelper/inc/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/weak.hxx rename to include/cppuhelper/weak.hxx diff --git a/cppuhelper/inc/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/weakagg.hxx rename to include/cppuhelper/weakagg.hxx diff --git a/cppuhelper/inc/cppuhelper/weakref.hxx b/include/cppuhelper/weakref.hxx similarity index 100% rename from cppuhelper/inc/cppuhelper/weakref.hxx rename to include/cppuhelper/weakref.hxx diff --git a/sal/inc/osl/conditn.h b/include/osl/conditn.h similarity index 100% rename from sal/inc/osl/conditn.h rename to include/osl/conditn.h diff --git a/sal/inc/osl/conditn.hxx b/include/osl/conditn.hxx similarity index 100% rename from sal/inc/osl/conditn.hxx rename to include/osl/conditn.hxx diff --git a/sal/inc/osl/diagnose.h b/include/osl/diagnose.h similarity index 100% rename from sal/inc/osl/diagnose.h rename to include/osl/diagnose.h diff --git a/sal/inc/osl/diagnose.hxx b/include/osl/diagnose.hxx similarity index 100% rename from sal/inc/osl/diagnose.hxx rename to include/osl/diagnose.hxx diff --git a/sal/inc/osl/doublecheckedlocking.h b/include/osl/doublecheckedlocking.h similarity index 100% rename from sal/inc/osl/doublecheckedlocking.h rename to include/osl/doublecheckedlocking.h diff --git a/sal/inc/osl/endian.h b/include/osl/endian.h similarity index 100% rename from sal/inc/osl/endian.h rename to include/osl/endian.h diff --git a/sal/inc/osl/file.h b/include/osl/file.h similarity index 100% rename from sal/inc/osl/file.h rename to include/osl/file.h diff --git a/sal/inc/osl/file.hxx b/include/osl/file.hxx similarity index 100% rename from sal/inc/osl/file.hxx rename to include/osl/file.hxx diff --git a/sal/inc/osl/getglobalmutex.hxx b/include/osl/getglobalmutex.hxx similarity index 100% rename from sal/inc/osl/getglobalmutex.hxx rename to include/osl/getglobalmutex.hxx diff --git a/sal/inc/osl/interlck.h b/include/osl/interlck.h similarity index 100% rename from sal/inc/osl/interlck.h rename to include/osl/interlck.h diff --git a/sal/inc/osl/module.h b/include/osl/module.h similarity index 100% rename from sal/inc/osl/module.h rename to include/osl/module.h diff --git a/sal/inc/osl/module.hxx b/include/osl/module.hxx similarity index 100% rename from sal/inc/osl/module.hxx rename to include/osl/module.hxx diff --git a/sal/inc/osl/mutex.h b/include/osl/mutex.h similarity index 100% rename from sal/inc/osl/mutex.h rename to include/osl/mutex.h diff --git a/sal/inc/osl/mutex.hxx b/include/osl/mutex.hxx similarity index 100% rename from sal/inc/osl/mutex.hxx rename to include/osl/mutex.hxx diff --git a/sal/inc/osl/nlsupport.h b/include/osl/nlsupport.h similarity index 100% rename from sal/inc/osl/nlsupport.h rename to include/osl/nlsupport.h diff --git a/sal/inc/osl/pipe.h b/include/osl/pipe.h similarity index 100% rename from sal/inc/osl/pipe.h rename to include/osl/pipe.h diff --git a/sal/inc/osl/pipe.hxx b/include/osl/pipe.hxx similarity index 100% rename from sal/inc/osl/pipe.hxx rename to include/osl/pipe.hxx diff --git a/sal/inc/osl/pipe_decl.hxx b/include/osl/pipe_decl.hxx similarity index 100% rename from sal/inc/osl/pipe_decl.hxx rename to include/osl/pipe_decl.hxx diff --git a/sal/inc/osl/process.h b/include/osl/process.h similarity index 100% rename from sal/inc/osl/process.h rename to include/osl/process.h diff --git a/sal/inc/osl/profile.h b/include/osl/profile.h similarity index 100% rename from sal/inc/osl/profile.h rename to include/osl/profile.h diff --git a/sal/inc/osl/profile.hxx b/include/osl/profile.hxx similarity index 100% rename from sal/inc/osl/profile.hxx rename to include/osl/profile.hxx diff --git a/sal/inc/osl/security.h b/include/osl/security.h similarity index 100% rename from sal/inc/osl/security.h rename to include/osl/security.h diff --git a/sal/inc/osl/security.hxx b/include/osl/security.hxx similarity index 100% rename from sal/inc/osl/security.hxx rename to include/osl/security.hxx diff --git a/sal/inc/osl/security_decl.hxx b/include/osl/security_decl.hxx similarity index 100% rename from sal/inc/osl/security_decl.hxx rename to include/osl/security_decl.hxx diff --git a/sal/inc/osl/signal.h b/include/osl/signal.h similarity index 100% rename from sal/inc/osl/signal.h rename to include/osl/signal.h diff --git a/sal/inc/osl/socket.h b/include/osl/socket.h similarity index 100% rename from sal/inc/osl/socket.h rename to include/osl/socket.h diff --git a/sal/inc/osl/socket.hxx b/include/osl/socket.hxx similarity index 100% rename from sal/inc/osl/socket.hxx rename to include/osl/socket.hxx diff --git a/sal/inc/osl/socket_decl.hxx b/include/osl/socket_decl.hxx similarity index 100% rename from sal/inc/osl/socket_decl.hxx rename to include/osl/socket_decl.hxx diff --git a/sal/inc/osl/thread.h b/include/osl/thread.h similarity index 100% rename from sal/inc/osl/thread.h rename to include/osl/thread.h diff --git a/sal/inc/osl/thread.hxx b/include/osl/thread.hxx similarity index 100% rename from sal/inc/osl/thread.hxx rename to include/osl/thread.hxx diff --git a/sal/inc/osl/time.h b/include/osl/time.h similarity index 100% rename from sal/inc/osl/time.h rename to include/osl/time.h diff --git a/sal/inc/osl/util.h b/include/osl/util.h similarity index 100% rename from sal/inc/osl/util.h rename to include/osl/util.h diff --git a/sal/inc/rtl/alloc.h b/include/rtl/alloc.h similarity index 100% rename from sal/inc/rtl/alloc.h rename to include/rtl/alloc.h diff --git a/sal/inc/rtl/allocator.hxx b/include/rtl/allocator.hxx similarity index 100% rename from sal/inc/rtl/allocator.hxx rename to include/rtl/allocator.hxx diff --git a/sal/inc/rtl/bootstrap.h b/include/rtl/bootstrap.h similarity index 100% rename from sal/inc/rtl/bootstrap.h rename to include/rtl/bootstrap.h diff --git a/sal/inc/rtl/bootstrap.hxx b/include/rtl/bootstrap.hxx similarity index 100% rename from sal/inc/rtl/bootstrap.hxx rename to include/rtl/bootstrap.hxx diff --git a/sal/inc/rtl/byteseq.h b/include/rtl/byteseq.h similarity index 100% rename from sal/inc/rtl/byteseq.h rename to include/rtl/byteseq.h diff --git a/sal/inc/rtl/byteseq.hxx b/include/rtl/byteseq.hxx similarity index 100% rename from sal/inc/rtl/byteseq.hxx rename to include/rtl/byteseq.hxx diff --git a/sal/inc/rtl/character.hxx b/include/rtl/character.hxx similarity index 100% rename from sal/inc/rtl/character.hxx rename to include/rtl/character.hxx diff --git a/sal/inc/rtl/cipher.h b/include/rtl/cipher.h similarity index 100% rename from sal/inc/rtl/cipher.h rename to include/rtl/cipher.h diff --git a/sal/inc/rtl/crc.h b/include/rtl/crc.h similarity index 100% rename from sal/inc/rtl/crc.h rename to include/rtl/crc.h diff --git a/sal/inc/rtl/digest.h b/include/rtl/digest.h similarity index 100% rename from sal/inc/rtl/digest.h rename to include/rtl/digest.h diff --git a/sal/inc/rtl/instance.hxx b/include/rtl/instance.hxx similarity index 100% rename from sal/inc/rtl/instance.hxx rename to include/rtl/instance.hxx diff --git a/sal/inc/rtl/locale.h b/include/rtl/locale.h similarity index 100% rename from sal/inc/rtl/locale.h rename to include/rtl/locale.h diff --git a/sal/inc/rtl/logfile.h b/include/rtl/logfile.h similarity index 100% rename from sal/inc/rtl/logfile.h rename to include/rtl/logfile.h diff --git a/sal/inc/rtl/logfile.hxx b/include/rtl/logfile.hxx similarity index 100% rename from sal/inc/rtl/logfile.hxx rename to include/rtl/logfile.hxx diff --git a/sal/inc/rtl/malformeduriexception.hxx b/include/rtl/malformeduriexception.hxx similarity index 100% rename from sal/inc/rtl/malformeduriexception.hxx rename to include/rtl/malformeduriexception.hxx diff --git a/sal/inc/rtl/math.h b/include/rtl/math.h similarity index 100% rename from sal/inc/rtl/math.h rename to include/rtl/math.h diff --git a/sal/inc/rtl/math.hxx b/include/rtl/math.hxx similarity index 100% rename from sal/inc/rtl/math.hxx rename to include/rtl/math.hxx diff --git a/sal/inc/rtl/process.h b/include/rtl/process.h similarity index 100% rename from sal/inc/rtl/process.h rename to include/rtl/process.h diff --git a/sal/inc/rtl/random.h b/include/rtl/random.h similarity index 100% rename from sal/inc/rtl/random.h rename to include/rtl/random.h diff --git a/sal/inc/rtl/ref.hxx b/include/rtl/ref.hxx similarity index 100% rename from sal/inc/rtl/ref.hxx rename to include/rtl/ref.hxx diff --git a/sal/inc/rtl/strbuf.h b/include/rtl/strbuf.h similarity index 100% rename from sal/inc/rtl/strbuf.h rename to include/rtl/strbuf.h diff --git a/sal/inc/rtl/strbuf.hxx b/include/rtl/strbuf.hxx similarity index 100% rename from sal/inc/rtl/strbuf.hxx rename to include/rtl/strbuf.hxx diff --git a/sal/inc/rtl/string.h b/include/rtl/string.h similarity index 100% rename from sal/inc/rtl/string.h rename to include/rtl/string.h diff --git a/sal/inc/rtl/string.hxx b/include/rtl/string.hxx similarity index 100% rename from sal/inc/rtl/string.hxx rename to include/rtl/string.hxx diff --git a/sal/inc/rtl/stringconcat.hxx b/include/rtl/stringconcat.hxx similarity index 100% rename from sal/inc/rtl/stringconcat.hxx rename to include/rtl/stringconcat.hxx diff --git a/sal/inc/rtl/stringutils.hxx b/include/rtl/stringutils.hxx similarity index 100% rename from sal/inc/rtl/stringutils.hxx rename to include/rtl/stringutils.hxx diff --git a/sal/inc/rtl/tencinfo.h b/include/rtl/tencinfo.h similarity index 100% rename from sal/inc/rtl/tencinfo.h rename to include/rtl/tencinfo.h diff --git a/sal/inc/rtl/textcvt.h b/include/rtl/textcvt.h similarity index 100% rename from sal/inc/rtl/textcvt.h rename to include/rtl/textcvt.h diff --git a/sal/inc/rtl/textenc.h b/include/rtl/textenc.h similarity index 100% rename from sal/inc/rtl/textenc.h rename to include/rtl/textenc.h diff --git a/sal/inc/rtl/unload.h b/include/rtl/unload.h similarity index 100% rename from sal/inc/rtl/unload.h rename to include/rtl/unload.h diff --git a/sal/inc/rtl/uri.h b/include/rtl/uri.h similarity index 100% rename from sal/inc/rtl/uri.h rename to include/rtl/uri.h diff --git a/sal/inc/rtl/uri.hxx b/include/rtl/uri.hxx similarity index 100% rename from sal/inc/rtl/uri.hxx rename to include/rtl/uri.hxx diff --git a/sal/inc/rtl/ustrbuf.h b/include/rtl/ustrbuf.h similarity index 100% rename from sal/inc/rtl/ustrbuf.h rename to include/rtl/ustrbuf.h diff --git a/sal/inc/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx similarity index 100% rename from sal/inc/rtl/ustrbuf.hxx rename to include/rtl/ustrbuf.hxx diff --git a/sal/inc/rtl/ustring.h b/include/rtl/ustring.h similarity index 100% rename from sal/inc/rtl/ustring.h rename to include/rtl/ustring.h diff --git a/sal/inc/rtl/ustring.hxx b/include/rtl/ustring.hxx similarity index 100% rename from sal/inc/rtl/ustring.hxx rename to include/rtl/ustring.hxx diff --git a/sal/inc/rtl/uuid.h b/include/rtl/uuid.h similarity index 100% rename from sal/inc/rtl/uuid.h rename to include/rtl/uuid.h diff --git a/sal/inc/sal/ByteBufferWrapper.hxx b/include/sal/ByteBufferWrapper.hxx similarity index 100% rename from sal/inc/sal/ByteBufferWrapper.hxx rename to include/sal/ByteBufferWrapper.hxx diff --git a/sal/inc/sal/alloca.h b/include/sal/alloca.h similarity index 100% rename from sal/inc/sal/alloca.h rename to include/sal/alloca.h diff --git a/sal/inc/sal/config.h b/include/sal/config.h similarity index 100% rename from sal/inc/sal/config.h rename to include/sal/config.h diff --git a/sal/inc/sal/detail/log.h b/include/sal/detail/log.h similarity index 100% rename from sal/inc/sal/detail/log.h rename to include/sal/detail/log.h diff --git a/sal/inc/sal/log-areas.dox b/include/sal/log-areas.dox similarity index 100% rename from sal/inc/sal/log-areas.dox rename to include/sal/log-areas.dox diff --git a/sal/inc/sal/log.hxx b/include/sal/log.hxx similarity index 100% rename from sal/inc/sal/log.hxx rename to include/sal/log.hxx diff --git a/sal/inc/sal/macros.h b/include/sal/macros.h similarity index 100% rename from sal/inc/sal/macros.h rename to include/sal/macros.h diff --git a/sal/inc/sal/main.h b/include/sal/main.h similarity index 100% rename from sal/inc/sal/main.h rename to include/sal/main.h diff --git a/sal/inc/sal/mathconf.h b/include/sal/mathconf.h similarity index 100% rename from sal/inc/sal/mathconf.h rename to include/sal/mathconf.h diff --git a/sal/inc/sal/saldllapi.h b/include/sal/saldllapi.h similarity index 100% rename from sal/inc/sal/saldllapi.h rename to include/sal/saldllapi.h diff --git a/sal/inc/sal/types.h b/include/sal/types.h similarity index 100% rename from sal/inc/sal/types.h rename to include/sal/types.h diff --git a/include/sal/typesizes.h b/include/sal/typesizes.h new file mode 100644 index 000000000000..e981818b9ced --- /dev/null +++ b/include/sal/typesizes.h @@ -0,0 +1,20 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +/* DO NOT INCLUDE THIS HEADER DIRECTLY! + * + * It is only needed to make the build work. config_typesizes.h is + * copied to SDK as sal/typesizes.h and this is how sal/types.h includes + * it. This means we need to have sal/typesizes.h available for build + * too. + */ + +#include "config_typesizes.h" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/salhelper/inc/salhelper/condition.hxx b/include/salhelper/condition.hxx similarity index 100% rename from salhelper/inc/salhelper/condition.hxx rename to include/salhelper/condition.hxx diff --git a/salhelper/inc/salhelper/dynload.hxx b/include/salhelper/dynload.hxx similarity index 100% rename from salhelper/inc/salhelper/dynload.hxx rename to include/salhelper/dynload.hxx diff --git a/salhelper/inc/salhelper/linkhelper.hxx b/include/salhelper/linkhelper.hxx similarity index 100% rename from salhelper/inc/salhelper/linkhelper.hxx rename to include/salhelper/linkhelper.hxx diff --git a/salhelper/inc/salhelper/refobj.hxx b/include/salhelper/refobj.hxx similarity index 100% rename from salhelper/inc/salhelper/refobj.hxx rename to include/salhelper/refobj.hxx diff --git a/salhelper/inc/salhelper/salhelperdllapi.h b/include/salhelper/salhelperdllapi.h similarity index 100% rename from salhelper/inc/salhelper/salhelperdllapi.h rename to include/salhelper/salhelperdllapi.h diff --git a/salhelper/inc/salhelper/simplereferenceobject.hxx b/include/salhelper/simplereferenceobject.hxx similarity index 100% rename from salhelper/inc/salhelper/simplereferenceobject.hxx rename to include/salhelper/simplereferenceobject.hxx diff --git a/salhelper/inc/salhelper/singletonref.hxx b/include/salhelper/singletonref.hxx similarity index 100% rename from salhelper/inc/salhelper/singletonref.hxx rename to include/salhelper/singletonref.hxx diff --git a/salhelper/inc/salhelper/thread.hxx b/include/salhelper/thread.hxx similarity index 100% rename from salhelper/inc/salhelper/thread.hxx rename to include/salhelper/thread.hxx diff --git a/salhelper/inc/salhelper/timer.hxx b/include/salhelper/timer.hxx similarity index 100% rename from salhelper/inc/salhelper/timer.hxx rename to include/salhelper/timer.hxx diff --git a/sal/inc/systools/win32/snprintf.h b/include/systools/win32/snprintf.h similarity index 100% rename from sal/inc/systools/win32/snprintf.h rename to include/systools/win32/snprintf.h diff --git a/cppu/inc/typelib/typeclass.h b/include/typelib/typeclass.h similarity index 100% rename from cppu/inc/typelib/typeclass.h rename to include/typelib/typeclass.h diff --git a/cppu/inc/typelib/typedescription.h b/include/typelib/typedescription.h similarity index 100% rename from cppu/inc/typelib/typedescription.h rename to include/typelib/typedescription.h diff --git a/cppu/inc/typelib/typedescription.hxx b/include/typelib/typedescription.hxx similarity index 100% rename from cppu/inc/typelib/typedescription.hxx rename to include/typelib/typedescription.hxx diff --git a/cppu/inc/typelib/uik.h b/include/typelib/uik.h similarity index 100% rename from cppu/inc/typelib/uik.h rename to include/typelib/uik.h diff --git a/cppu/inc/uno/Enterable.h b/include/uno/Enterable.h similarity index 100% rename from cppu/inc/uno/Enterable.h rename to include/uno/Enterable.h diff --git a/cppu/inc/uno/EnvDcp.h b/include/uno/EnvDcp.h similarity index 100% rename from cppu/inc/uno/EnvDcp.h rename to include/uno/EnvDcp.h diff --git a/cppu/inc/uno/any2.h b/include/uno/any2.h similarity index 100% rename from cppu/inc/uno/any2.h rename to include/uno/any2.h diff --git a/cppu/inc/uno/current_context.h b/include/uno/current_context.h similarity index 100% rename from cppu/inc/uno/current_context.h rename to include/uno/current_context.h diff --git a/cppu/inc/uno/current_context.hxx b/include/uno/current_context.hxx similarity index 100% rename from cppu/inc/uno/current_context.hxx rename to include/uno/current_context.hxx diff --git a/cppu/inc/uno/data.h b/include/uno/data.h similarity index 100% rename from cppu/inc/uno/data.h rename to include/uno/data.h diff --git a/cppu/inc/uno/dispatcher.h b/include/uno/dispatcher.h similarity index 100% rename from cppu/inc/uno/dispatcher.h rename to include/uno/dispatcher.h diff --git a/cppu/inc/uno/dispatcher.hxx b/include/uno/dispatcher.hxx similarity index 100% rename from cppu/inc/uno/dispatcher.hxx rename to include/uno/dispatcher.hxx diff --git a/cppu/inc/uno/environment.h b/include/uno/environment.h similarity index 100% rename from cppu/inc/uno/environment.h rename to include/uno/environment.h diff --git a/cppu/inc/uno/environment.hxx b/include/uno/environment.hxx similarity index 100% rename from cppu/inc/uno/environment.hxx rename to include/uno/environment.hxx diff --git a/cppu/inc/uno/lbnames.h b/include/uno/lbnames.h similarity index 100% rename from cppu/inc/uno/lbnames.h rename to include/uno/lbnames.h diff --git a/cppu/inc/uno/mapping.h b/include/uno/mapping.h similarity index 100% rename from cppu/inc/uno/mapping.h rename to include/uno/mapping.h diff --git a/cppu/inc/uno/mapping.hxx b/include/uno/mapping.hxx similarity index 100% rename from cppu/inc/uno/mapping.hxx rename to include/uno/mapping.hxx diff --git a/cppu/inc/uno/sequence2.h b/include/uno/sequence2.h similarity index 100% rename from cppu/inc/uno/sequence2.h rename to include/uno/sequence2.h diff --git a/cppu/inc/uno/threadpool.h b/include/uno/threadpool.h similarity index 100% rename from cppu/inc/uno/threadpool.h rename to include/uno/threadpool.h diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk index cb85f06f176e..4810dcbb3f1d 100644 --- a/jurt/Library_jpipe.mk +++ b/jurt/Library_jpipe.mk @@ -22,7 +22,6 @@ $(eval $(call gb_Library_add_cobjects,jpipe,\ )) $(eval $(call gb_Library_use_packages,jpipe,\ - sal_odk_headers \ )) else diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk index cc65614b1039..d251f02566ce 100644 --- a/l10ntools/StaticLibrary_transex.mk +++ b/l10ntools/StaticLibrary_transex.mk @@ -28,8 +28,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,transex)) $(eval $(call gb_StaticLibrary_use_packages,transex,\ - sal_generated \ - sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_set_include,transex,\ diff --git a/lingucomponent/StaticLibrary_ulingu.mk b/lingucomponent/StaticLibrary_ulingu.mk index 1a552b2c5c0b..a9e0a3843525 100644 --- a/lingucomponent/StaticLibrary_ulingu.mk +++ b/lingucomponent/StaticLibrary_ulingu.mk @@ -29,12 +29,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,ulingu)) $(eval $(call gb_StaticLibrary_use_packages,ulingu,\ comphelper_inc \ - cppu_odk_headers \ - cppuhelper_odk_headers \ i18nlangtag_inc \ linguistic_inc \ - sal_generated \ - sal_odk_headers \ tools_inc \ unotools_inc \ )) diff --git a/mysqlcppconn/Library_mysqlcppconn.mk b/mysqlcppconn/Library_mysqlcppconn.mk index 611895bf71d3..d35f8c121c85 100644 --- a/mysqlcppconn/Library_mysqlcppconn.mk +++ b/mysqlcppconn/Library_mysqlcppconn.mk @@ -12,8 +12,6 @@ $(eval $(call gb_Library_Library,mysqlcppconn)) $(eval $(call gb_Library_use_unpacked,mysqlcppconn,mysqlcppconn)) $(eval $(call gb_Library_use_packages,mysqlcppconn,\ - sal_generated \ - sal_odk_headers \ )) $(eval $(call gb_Library_use_externals,mysqlcppconn, \ diff --git a/np_sdk/StaticLibrary_nputils.mk b/np_sdk/StaticLibrary_nputils.mk index 327be43eb100..f365ca9623d2 100644 --- a/np_sdk/StaticLibrary_nputils.mk +++ b/np_sdk/StaticLibrary_nputils.mk @@ -28,8 +28,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,nputils)) $(eval $(call gb_StaticLibrary_use_packages,nputils,\ - sal_generated \ - sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_use_externals,nputils,\ diff --git a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk b/odk/CppunitTest_checkapi.mk similarity index 71% rename from cppuhelper/CppunitTest_cppuhelper_checkapi.mk rename to odk/CppunitTest_checkapi.mk index f8042b70e558..e134a450ac83 100644 --- a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk +++ b/odk/CppunitTest_checkapi.mk @@ -25,23 +25,28 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_CppunitTest_CppunitTest,cppuhelper_checkapi)) +$(eval $(call gb_CppunitTest_CppunitTest,odk_checkapi)) -$(eval $(call gb_CppunitTest_use_custom_headers,cppuhelper_checkapi,\ - cppuhelper/allheaders \ +$(eval $(call gb_CppunitTest_use_custom_headers,odk_checkapi,\ + odk/allheaders \ )) -$(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_checkapi,\ - cppuhelper/qa/checkapi/strings \ +$(eval $(call gb_CppunitTest_add_exception_objects,odk_checkapi,\ + odk/qa/checkapi/strings \ )) -$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppuhelper_checkapi, \ +$(eval $(call gb_CppunitTest_use_external,odk_checkapi,boost_headers)) + +$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,odk_checkapi,\ cppu \ udkapi \ )) -$(eval $(call gb_CppunitTest_use_libraries,cppuhelper_checkapi,\ - cppuhelper \ +$(eval $(call gb_CppunitTest_use_libraries,odk_checkapi,\ + cppu \ + cppuhelper \ + sal \ + salhelper \ $(gb_UWINAPI) \ )) diff --git a/sal/CustomTarget_sal_allheaders.mk b/odk/CustomTarget_allheaders.mk similarity index 82% rename from sal/CustomTarget_sal_allheaders.mk rename to odk/CustomTarget_allheaders.mk index 808f54feee3f..54699b5fc42f 100644 --- a/sal/CustomTarget_sal_allheaders.mk +++ b/odk/CustomTarget_allheaders.mk @@ -25,16 +25,16 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_CustomTarget_CustomTarget,sal/allheaders)) +$(eval $(call gb_CustomTarget_CustomTarget,odk/allheaders)) -sal_allheaders_DIR := $(call gb_CustomTarget_get_workdir,sal/allheaders) +odk_allheaders_DIR := $(call gb_CustomTarget_get_workdir,odk/allheaders) -$(call gb_CustomTarget_get_target,sal/allheaders) : \ - $(sal_allheaders_DIR)/sal_allheaders.hxx +$(call gb_CustomTarget_get_target,odk/allheaders) : \ + $(odk_allheaders_DIR)/allheaders.hxx -$(sal_allheaders_DIR)/sal_allheaders.hxx : \ - $(call gb_Package_get_target,sal_odk_headers) \ - | $(sal_allheaders_DIR)/.dir +$(odk_allheaders_DIR)/allheaders.hxx : \ + $(call gb_PackageSet_get_target,odk_headers) \ + | $(odk_allheaders_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) printf '// Generated list of sal includes\n' > $@ && \ printf '#ifdef WNT\n' >> $@ && \ diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index 8820dd062ed8..06e4b034dadb 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -28,19 +28,15 @@ odk_INCFILELIST := com/sun/star/uno/Any.h \ com/sun/star/uno/Type.hxx # Cygwin Doxygen needs unix paths -DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/main.dox $(SRCDIR)/sal/inc/sal/log-areas.dox \ +DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/main.dox $(SRCDIR)/include/sal/log-areas.dox \ $(addprefix $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,$(odk_INCDIRLIST) $(odk_INCFILELIST)) DOXY_INPUT := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(DOXY_INPUT)),$(DOXY_INPUT)) DOXY_WORKDIR := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(odk_WORKDIR)/docs/cpp/ref),$(odk_WORKDIR)/docs/cpp/ref) DOXY_STRIP_PATH := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(OUTDIR)/inc),$(OUTDIR)/inc) DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \ $(SRCDIR)/odk/pack/gendocu/main.dox \ - $(SRCDIR)/sal/inc/sal/log-areas.dox \ - $(call gb_Package_get_target,sal_odk_headers) \ - $(call gb_Package_get_target,sal_generated) \ - $(call gb_Package_get_target,salhelper_odk_headers) \ - $(call gb_Package_get_target,cppu_odk_headers) \ - $(call gb_Package_get_target,cppuhelper_odk_headers) \ + $(SRCDIR)/include/sal/log-areas.dox \ + $(call gb_PackageSet_get_target,odk_headers) $(eval $(call gb_CustomTarget_register_target,odk/odkcommon/docs/cpp/ref,index.html)) diff --git a/odk/Executable_unoapploader.mk b/odk/Executable_unoapploader.mk index 22bcc87e7e1d..709b1188fd53 100644 --- a/odk/Executable_unoapploader.mk +++ b/odk/Executable_unoapploader.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Executable_Executable,unoapploader)) $(eval $(call gb_Executable_use_packages,unoapploader,\ - sal_generated \ )) $(eval $(call gb_Executable_use_static_libraries,unoapploader,\ diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 6e78471eb30a..c17c57419e03 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -23,8 +23,11 @@ $(eval $(call gb_Module_add_targets,odk,\ Package_html \ Package_examples \ Package_lib \ + Package_odk_headers \ + Package_odk_headers_generated \ Package_settings \ Package_settings_generated \ + PackageSet_odk_headers \ )) ifeq ($(OS),WNT) @@ -62,6 +65,8 @@ $(eval $(call gb_Module_add_targets,odk,\ )) $(eval $(call gb_Module_add_check_targets,odk,\ + CppunitTest_checkapi \ + CustomTarget_allheaders \ CustomTarget_check \ )) diff --git a/odk/PackageSet_odk_headers.mk b/odk/PackageSet_odk_headers.mk new file mode 100644 index 000000000000..d28f6d1bb559 --- /dev/null +++ b/odk/PackageSet_odk_headers.mk @@ -0,0 +1,17 @@ +# -*- 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_PackageSet_PackageSet,odk_headers)) + +$(eval $(call gb_PackageSet_add_packages,odk_headers,\ + odk_headers \ + odk_headers_generated \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/odk/Package_odk_headers.mk b/odk/Package_odk_headers.mk new file mode 100644 index 000000000000..fca30c43046e --- /dev/null +++ b/odk/Package_odk_headers.mk @@ -0,0 +1,200 @@ + +# -*- 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_Package_Package,odk_headers,$(SRCDIR)/include)) + +$(eval $(call gb_Package_set_outdir,odk_headers,$(INSTDIR))) + +$(eval $(call gb_Package_add_files_with_dir,odk_headers,$(gb_Package_SDKDIRNAME)/include,\ + com/sun/star/uno/Any.h \ + com/sun/star/uno/Any.hxx \ + com/sun/star/uno/Reference.h \ + com/sun/star/uno/Reference.hxx \ + com/sun/star/uno/Sequence.h \ + com/sun/star/uno/Sequence.hxx \ + com/sun/star/uno/Type.h \ + com/sun/star/uno/Type.hxx \ + com/sun/star/uno/genfunc.h \ + com/sun/star/uno/genfunc.hxx \ + cppu/Enterable.hxx \ + cppu/EnvDcp.hxx \ + cppu/EnvGuards.hxx \ + cppu/Map.hxx \ + cppu/cppudllapi.h \ + cppu/helper/purpenv/Environment.hxx \ + cppu/helper/purpenv/Mapping.hxx \ + cppu/macros.hxx \ + cppu/unotype.hxx \ + cppuhelper/access_control.hxx \ + cppuhelper/basemutex.hxx \ + cppuhelper/bootstrap.hxx \ + cppuhelper/compbase.hxx \ + cppuhelper/compbase1.hxx \ + cppuhelper/compbase10.hxx \ + cppuhelper/compbase11.hxx \ + cppuhelper/compbase12.hxx \ + cppuhelper/compbase2.hxx \ + cppuhelper/compbase3.hxx \ + cppuhelper/compbase4.hxx \ + cppuhelper/compbase5.hxx \ + cppuhelper/compbase6.hxx \ + cppuhelper/compbase7.hxx \ + cppuhelper/compbase8.hxx \ + cppuhelper/compbase9.hxx \ + cppuhelper/compbase_ex.hxx \ + cppuhelper/component.hxx \ + cppuhelper/component_context.hxx \ + cppuhelper/cppuhelperdllapi.h \ + cppuhelper/exc_hlp.hxx \ + cppuhelper/factory.hxx \ + cppuhelper/findsofficepath.h \ + cppuhelper/implbase.hxx \ + cppuhelper/implbase1.hxx \ + cppuhelper/implbase10.hxx \ + cppuhelper/implbase11.hxx \ + cppuhelper/implbase12.hxx \ + cppuhelper/implbase13.hxx \ + cppuhelper/implbase2.hxx \ + cppuhelper/implbase3.hxx \ + cppuhelper/implbase4.hxx \ + cppuhelper/implbase5.hxx \ + cppuhelper/implbase6.hxx \ + cppuhelper/implbase7.hxx \ + cppuhelper/implbase8.hxx \ + cppuhelper/implbase9.hxx \ + cppuhelper/implbase_ex.hxx \ + cppuhelper/implbase_ex_post.hxx \ + cppuhelper/implbase_ex_pre.hxx \ + cppuhelper/implementationentry.hxx \ + cppuhelper/interfacecontainer.h \ + cppuhelper/interfacecontainer.hxx \ + cppuhelper/propertysetmixin.hxx \ + cppuhelper/propshlp.hxx \ + cppuhelper/proptypehlp.h \ + cppuhelper/proptypehlp.hxx \ + cppuhelper/queryinterface.hxx \ + cppuhelper/shlib.hxx \ + cppuhelper/supportsservice.hxx \ + cppuhelper/typeprovider.hxx \ + cppuhelper/unourl.hxx \ + cppuhelper/weak.hxx \ + cppuhelper/weakagg.hxx \ + cppuhelper/weakref.hxx \ + osl/conditn.h \ + osl/conditn.hxx \ + osl/diagnose.h \ + osl/diagnose.hxx \ + osl/doublecheckedlocking.h \ + osl/endian.h \ + osl/file.h \ + osl/file.hxx \ + osl/getglobalmutex.hxx \ + osl/interlck.h \ + osl/module.h \ + osl/module.hxx \ + osl/mutex.h \ + osl/mutex.hxx \ + osl/nlsupport.h \ + osl/pipe.h \ + osl/pipe.hxx \ + osl/pipe_decl.hxx \ + osl/process.h \ + osl/profile.h \ + osl/profile.hxx \ + osl/security.h \ + osl/security.hxx \ + osl/security_decl.hxx \ + osl/signal.h \ + osl/socket.h \ + osl/socket.hxx \ + osl/socket_decl.hxx \ + osl/thread.h \ + osl/thread.hxx \ + osl/time.h \ + osl/util.h \ + rtl/alloc.h \ + rtl/allocator.hxx \ + rtl/bootstrap.h \ + rtl/bootstrap.hxx \ + rtl/byteseq.h \ + rtl/byteseq.hxx \ + rtl/character.hxx \ + rtl/cipher.h \ + rtl/crc.h \ + rtl/digest.h \ + rtl/instance.hxx \ + rtl/locale.h \ + rtl/logfile.h \ + rtl/logfile.hxx \ + rtl/malformeduriexception.hxx \ + rtl/math.h \ + rtl/math.hxx \ + rtl/process.h \ + rtl/random.h \ + rtl/ref.hxx \ + rtl/strbuf.h \ + rtl/strbuf.hxx \ + rtl/string.h \ + rtl/string.hxx \ + rtl/stringconcat.hxx \ + rtl/stringutils.hxx \ + rtl/tencinfo.h \ + rtl/textcvt.h \ + rtl/textenc.h \ + rtl/unload.h \ + rtl/uri.h \ + rtl/uri.hxx \ + rtl/ustrbuf.h \ + rtl/ustrbuf.hxx \ + rtl/ustring.h \ + rtl/ustring.hxx \ + rtl/uuid.h \ + sal/ByteBufferWrapper.hxx \ + sal/alloca.h \ + sal/config.h \ + sal/detail/log.h \ + sal/log.hxx \ + sal/macros.h \ + sal/main.h \ + sal/mathconf.h \ + sal/saldllapi.h \ + sal/types.h \ + salhelper/condition.hxx \ + salhelper/dynload.hxx \ + salhelper/linkhelper.hxx \ + salhelper/refobj.hxx \ + salhelper/salhelperdllapi.h \ + salhelper/simplereferenceobject.hxx \ + salhelper/singletonref.hxx \ + salhelper/thread.hxx \ + salhelper/timer.hxx \ + systools/win32/snprintf.h \ + typelib/typeclass.h \ + typelib/typedescription.h \ + typelib/typedescription.hxx \ + typelib/uik.h \ + uno/Enterable.h \ + uno/EnvDcp.h \ + uno/any2.h \ + uno/current_context.h \ + uno/current_context.hxx \ + uno/data.h \ + uno/dispatcher.h \ + uno/dispatcher.hxx \ + uno/environment.h \ + uno/environment.hxx \ + uno/lbnames.h \ + uno/mapping.h \ + uno/mapping.hxx \ + uno/sequence2.h \ + uno/threadpool.h \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/odk/Package_odk_headers_generated.mk b/odk/Package_odk_headers_generated.mk new file mode 100644 index 000000000000..fff5c6b85750 --- /dev/null +++ b/odk/Package_odk_headers_generated.mk @@ -0,0 +1,17 @@ + +# -*- 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_Package_Package,odk_headers_generated,$(BUILDDIR)/config_$(gb_Side))) + +$(eval $(call gb_Package_set_outdir,odk_headers_generated,$(INSTDIR))) + +$(eval $(call gb_Package_add_file,odk_headers_generated,$(gb_Package_SDKDIRNAME)/include/sal/typesizes.h,config_typesizes.h)) + +# vim: set noet sw=4 ts=4: diff --git a/odk/qa/checkapi/strings.cxx b/odk/qa/checkapi/strings.cxx new file mode 100644 index 000000000000..87526acb673b --- /dev/null +++ b/odk/qa/checkapi/strings.cxx @@ -0,0 +1,31 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +// The whole purpose of this test is to check that public API headers +// build even without RTL_USING (which enables using e.g. rtl::OUString +// without to refer to the rtl namespace, which is not wanted +// in public API). If there are build errors here, check the headers +// for uses of such types. + +#ifdef RTL_USING +#error Build system problem, RTL_USING using should not be set here. +#endif + +// This module contains no tests, this is for the build system. +#include + +#include "allheaders.hxx" + +CPPUNIT_PLUGIN_IMPLEMENT(); +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL firstfunc( sal_Bool bRes ) +{ + return ( bRes = sal_True ); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/pyuno/Library_pyuno_wrapper.mk b/pyuno/Library_pyuno_wrapper.mk index 507c8f46e8eb..18f1875ab77b 100644 --- a/pyuno/Library_pyuno_wrapper.mk +++ b/pyuno/Library_pyuno_wrapper.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Library_Library,pyuno_wrapper)) $(eval $(call gb_Library_use_packages,pyuno_wrapper,\ - sal_generated \ - sal_odk_headers \ )) $(eval $(call gb_Library_set_include,pyuno_wrapper,\ diff --git a/registry/StaticLibrary_registry_helper.mk b/registry/StaticLibrary_registry_helper.mk index 56550742145e..ffcc5ff8abbf 100644 --- a/registry/StaticLibrary_registry_helper.mk +++ b/registry/StaticLibrary_registry_helper.mk @@ -28,8 +28,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,registry_helper)) $(eval $(call gb_StaticLibrary_use_packages,registry_helper,\ - sal_generated \ - sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,registry_helper,\ diff --git a/sal/CppunitTest_sal_checkapi.mk b/sal/CppunitTest_sal_checkapi.mk deleted file mode 100644 index 42fd5e354d94..000000000000 --- a/sal/CppunitTest_sal_checkapi.mk +++ /dev/null @@ -1,45 +0,0 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2011 Matúš Kukan (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_CppunitTest_CppunitTest,sal_checkapi)) - -$(eval $(call gb_CppunitTest_use_custom_headers,sal_checkapi,\ - sal/allheaders \ -)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sal_checkapi,\ - sal/qa/checkapi/strings \ -)) - -$(eval $(call gb_CppunitTest_use_external,sal_checkapi,boost_headers)) - -$(eval $(call gb_CppunitTest_use_libraries,sal_checkapi,\ - sal \ - $(gb_UWINAPI) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 0d19b3f70182..46ca29073dbf 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_set_soversion_script,sal,3,$(SRCDIR)/sal/util/sal.map)) $(eval $(call gb_Library_set_precompiled_header,sal,$(SRCDIR)/sal/inc/pch/precompiled_sal)) $(eval $(call gb_Library_use_packages,sal,\ - sal_generated \ - sal_odk_headers \ sal_inc \ )) diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk index d83bb636f6e1..dbb91a2a4787 100644 --- a/sal/Library_uwinapi.mk +++ b/sal/Library_uwinapi.mk @@ -29,8 +29,6 @@ $(eval $(call gb_Library_Library,uwinapi)) $(eval $(call gb_Library_use_packages,uwinapi,\ sal_inc \ - sal_generated \ - sal_odk_headers \ )) $(eval $(call gb_Library_use_system_win32_libs,uwinapi,\ diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index f3ec8461dc99..f5ecbc480b2d 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Module_Module,sal)) $(eval $(call gb_Module_add_targets,sal,\ - CustomTarget_sal_allheaders \ $(if $(filter DESKTOP,$(BUILD_TYPE)), \ Executable_cppunittester) \ $(if $(filter $(OS),ANDROID), \ @@ -22,8 +21,6 @@ $(eval $(call gb_Module_add_targets,sal,\ Library_uwinapi) \ Package_inc \ StaticLibrary_salcpprt \ - Package_sal_generated \ - Package_sal_odk_headers \ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) @@ -39,7 +36,6 @@ $(eval $(call gb_Module_add_check_targets,sal,\ $(eval $(call gb_Module_add_check_targets,sal,\ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),,CppunitTest_Module_DLL) \ CppunitTest_sal_bytesequence \ - CppunitTest_sal_checkapi \ CppunitTest_sal_osl_condition \ $(if $(filter $(OS),WNT),, \ CppunitTest_sal_osl_file) \ diff --git a/sal/Package_sal_generated.mk b/sal/Package_sal_generated.mk deleted file mode 100644 index 86578dac954f..000000000000 --- a/sal/Package_sal_generated.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2011 Matúš Kukan (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Package_Package,sal_generated,$(BUILDDIR)/config_$(gb_Side))) - -$(eval $(call gb_Package_set_outdir,sal_generated,$(INSTDIR))) - -$(eval $(call gb_Package_add_file,sal_generated,$(gb_Package_SDKDIRNAME)/include/sal/typesizes.h,config_typesizes.h)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/Package_sal_odk_headers.mk b/sal/Package_sal_odk_headers.mk deleted file mode 100644 index 613eebc9866e..000000000000 --- a/sal/Package_sal_odk_headers.mk +++ /dev/null @@ -1,109 +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_Package_Package,sal_odk_headers,$(SRCDIR)/sal/inc)) - -$(eval $(call gb_Package_set_outdir,sal_odk_headers,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/sal,\ - sal/alloca.h \ - sal/ByteBufferWrapper.hxx \ - sal/config.h \ - sal/log.hxx \ - sal/macros.h \ - sal/main.h \ - sal/mathconf.h \ - sal/saldllapi.h \ - sal/types.h \ -)) - -$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/sal/detail,\ - sal/detail/log.h \ -)) - -$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/rtl,\ - rtl/allocator.hxx \ - rtl/alloc.h \ - rtl/bootstrap.h \ - rtl/bootstrap.hxx \ - rtl/byteseq.h \ - rtl/byteseq.hxx \ - rtl/character.hxx \ - rtl/cipher.h \ - rtl/crc.h \ - rtl/digest.h \ - rtl/instance.hxx \ - rtl/locale.h \ - rtl/logfile.h \ - rtl/logfile.hxx \ - rtl/malformeduriexception.hxx \ - rtl/math.h \ - rtl/math.hxx \ - rtl/process.h \ - rtl/random.h \ - rtl/ref.hxx \ - rtl/strbuf.h \ - rtl/strbuf.hxx \ - rtl/string.h \ - rtl/string.hxx \ - rtl/stringconcat.hxx \ - rtl/stringutils.hxx \ - rtl/tencinfo.h \ - rtl/textcvt.h \ - rtl/textenc.h \ - rtl/unload.h \ - rtl/uri.h \ - rtl/uri.hxx \ - rtl/ustrbuf.h \ - rtl/ustrbuf.hxx \ - rtl/ustring.h \ - rtl/ustring.hxx \ - rtl/uuid.h \ -)) - -$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/osl,\ - osl/conditn.h \ - osl/conditn.hxx \ - osl/diagnose.h \ - osl/diagnose.hxx \ - osl/doublecheckedlocking.h \ - osl/endian.h \ - osl/file.h \ - osl/file.hxx \ - osl/getglobalmutex.hxx \ - osl/interlck.h \ - osl/module.h \ - osl/module.hxx \ - osl/mutex.h \ - osl/mutex.hxx \ - osl/nlsupport.h \ - osl/pipe_decl.hxx \ - osl/pipe.h \ - osl/pipe.hxx \ - osl/process.h \ - osl/profile.h \ - osl/profile.hxx \ - osl/security_decl.hxx \ - osl/security.h \ - osl/security.hxx \ - osl/signal.h \ - osl/socket_decl.hxx \ - osl/socket.h \ - osl/socket.hxx \ - osl/thread.h \ - osl/thread.hxx \ - osl/time.h \ - osl/util.h \ -)) - -$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/systools/win32,\ - systools/win32/snprintf.h \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk index 51e76b29c8f0..475139ca3b1f 100644 --- a/sal/StaticLibrary_salcpprt.mk +++ b/sal/StaticLibrary_salcpprt.mk @@ -28,8 +28,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt)) $(eval $(call gb_StaticLibrary_use_packages,salcpprt,\ - sal_generated \ - sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_add_defs,salcpprt, \ diff --git a/salhelper/CppunitTest_salhelper_checkapi.mk b/salhelper/CppunitTest_salhelper_checkapi.mk deleted file mode 100644 index fed7e58a2444..000000000000 --- a/salhelper/CppunitTest_salhelper_checkapi.mk +++ /dev/null @@ -1,45 +0,0 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2011 Matúš Kukan (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_CppunitTest_CppunitTest,salhelper_checkapi)) - -$(eval $(call gb_CppunitTest_use_custom_headers,salhelper_checkapi,\ - salhelper/allheaders \ -)) - -$(eval $(call gb_CppunitTest_use_external,salhelper_checkapi,boost_headers)) - -$(eval $(call gb_CppunitTest_add_exception_objects,salhelper_checkapi,\ - salhelper/qa/checkapi/strings \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,salhelper_checkapi,\ - salhelper \ - $(gb_UWINAPI) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/salhelper/CustomTarget_salhelper_allheaders.mk b/salhelper/CustomTarget_salhelper_allheaders.mk deleted file mode 100644 index 0415ccfd4022..000000000000 --- a/salhelper/CustomTarget_salhelper_allheaders.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2011 Matúš Kukan (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_CustomTarget_CustomTarget,salhelper/allheaders)) - -salhelper_allheaders_DIR := $(call gb_CustomTarget_get_workdir,salhelper/allheaders) - -$(call gb_CustomTarget_get_target,salhelper/allheaders) : \ - $(salhelper_allheaders_DIR)/salhelper_allheaders.hxx - -$(salhelper_allheaders_DIR)/salhelper_allheaders.hxx : \ - $(call gb_Package_get_target,salhelper_odk_headers) \ - | $(salhelper_allheaders_DIR)/.dir - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - printf '// Generated list of salhelper includes\n' > $@ \ - $(foreach file,$(shell cat $<),\ - && printf '#include <%s>\n' $(subst $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,,$(file)) >> $@ \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk index 26c90dcd81c6..12735dd9f0a2 100644 --- a/salhelper/Library_salhelper.mk +++ b/salhelper/Library_salhelper.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Library_Library,salhelper)) -$(eval $(call gb_Library_use_package,salhelper,salhelper_odk_headers)) - $(eval $(call gb_Library_add_defs,salhelper,\ -DSALHELPER_DLLIMPLEMENTATION \ )) diff --git a/salhelper/Module_salhelper.mk b/salhelper/Module_salhelper.mk index 7ba68a90c4fa..712872a5f9ad 100644 --- a/salhelper/Module_salhelper.mk +++ b/salhelper/Module_salhelper.mk @@ -28,13 +28,10 @@ $(eval $(call gb_Module_Module,salhelper)) $(eval $(call gb_Module_add_targets,salhelper,\ - CustomTarget_salhelper_allheaders \ Library_salhelper \ - Package_salhelper_odk_headers \ )) $(eval $(call gb_Module_add_check_targets,salhelper,\ - CppunitTest_salhelper_checkapi \ CppunitTest_salhelper_testapi \ )) diff --git a/salhelper/Package_salhelper_odk_headers.mk b/salhelper/Package_salhelper_odk_headers.mk deleted file mode 100644 index 89ae6148a477..000000000000 --- a/salhelper/Package_salhelper_odk_headers.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2011 Matúš Kukan -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Package_Package,salhelper_odk_headers,$(SRCDIR)/salhelper/inc/salhelper)) - -$(eval $(call gb_Package_set_outdir,salhelper_odk_headers,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,salhelper_odk_headers,$(gb_Package_SDKDIRNAME)/include/salhelper,\ - salhelperdllapi.h \ - condition.hxx \ - dynload.hxx \ - linkhelper.hxx \ - refobj.hxx \ - simplereferenceobject.hxx \ - singletonref.hxx \ - thread.hxx \ - timer.hxx \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sax/StaticLibrary_sax_shared.mk b/sax/StaticLibrary_sax_shared.mk index a1fd8e0304f2..0c49ab68d0bc 100644 --- a/sax/StaticLibrary_sax_shared.mk +++ b/sax/StaticLibrary_sax_shared.mk @@ -10,9 +10,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,sax_shared)) $(eval $(call gb_StaticLibrary_use_packages,sax_shared,\ - cppu_odk_headers \ - sal_generated \ - sal_odk_headers \ )) $(eval $(call gb_StaticLibrary_set_include,sax_shared,\ diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp index 2c965ea1142e..ed40abd9d595 100644 --- a/scp2/source/sdkoo/module_sdkoo.scp +++ b/scp2/source/sdkoo/module_sdkoo.scp @@ -50,9 +50,5 @@ Module gid_Module_Optional_Sdkoo gid_File_Zip_Odkcommon, gid_File_Zip_OdkIdl_udkapi, gid_File_Zip_OdkIdl_offapi, - gid_File_Zip_Odkheaders_sal_generated, - gid_File_Zip_Odkheaders_sal, - gid_File_Zip_Odkheaders_salhelper, - gid_File_Zip_Odkheaders_cppu, - gid_File_Zip_Odkheaders_cppuhelper); + gid_File_Zip_Odkheaders); End diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index 69b6fd8564fe..a6d4207fcf42 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -236,38 +236,10 @@ File gid_File_Zip_OdkIdl_offapi Styles = (FILELIST,USE_INTERNAL_RIGHTS); End -File gid_File_Zip_Odkheaders_sal_generated +File gid_File_Zip_Odkheaders TXT_FILE_BODY; Dir = FILELIST_SDK_DIR; - Name = "sal_generated.filelist"; - Styles = (FILELIST,USE_INTERNAL_RIGHTS); -End - -File gid_File_Zip_Odkheaders_sal - TXT_FILE_BODY; - Dir = FILELIST_SDK_DIR; - Name = "sal_odk_headers.filelist"; - Styles = (FILELIST,USE_INTERNAL_RIGHTS); -End - -File gid_File_Zip_Odkheaders_salhelper - TXT_FILE_BODY; - Dir = FILELIST_SDK_DIR; - Name = "salhelper_odk_headers.filelist"; - Styles = (FILELIST,USE_INTERNAL_RIGHTS); -End - -File gid_File_Zip_Odkheaders_cppu - TXT_FILE_BODY; - Dir = FILELIST_SDK_DIR; - Name = "cppu_odk_headers.filelist"; - Styles = (FILELIST,USE_INTERNAL_RIGHTS); -End - -File gid_File_Zip_Odkheaders_cppuhelper - TXT_FILE_BODY; - Dir = FILELIST_SDK_DIR; - Name = "cppuhelper_odk_headers.filelist"; + Name = "odk_headers.filelist"; Styles = (FILELIST,USE_INTERNAL_RIGHTS); End diff --git a/sdext/Executable_xpdfimport.mk b/sdext/Executable_xpdfimport.mk index 5d3eda8e107e..ce26d8faeb58 100644 --- a/sdext/Executable_xpdfimport.mk +++ b/sdext/Executable_xpdfimport.mk @@ -10,8 +10,6 @@ $(eval $(call gb_Executable_Executable,xpdfimport)) $(eval $(call gb_Executable_use_packages,xpdfimport,\ - sal_generated \ - sal_odk_headers \ )) $(eval $(call gb_Executable_use_externals,xpdfimport,\ diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk index cefe6feb4c45..8a889dd986f5 100644 --- a/sdext/StaticLibrary_pdfimport_s.mk +++ b/sdext/StaticLibrary_pdfimport_s.mk @@ -12,13 +12,9 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,pdfimport_s)) $(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\ basegfx_inc \ comphelper_inc \ - cppu_odk_headers \ - cppuhelper_odk_headers \ i18nlangtag_inc \ o3tl_inc \ rsc_inc \ - sal_generated \ - sal_odk_headers \ tools_inc \ unotools_inc \ vcl_inc \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index bcd8c22ee614..57340b2954e7 100755 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -371,7 +371,7 @@ endif gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS) define gb_LinkTarget_rtl_defs -$(if $(filter-out sal salhelper cppu cppuhelper, $(gb_Module_CURRENTMODULE_NAME)), -DRTL_USING) +$(if $(filter-out sal salhelper cppu cppuhelper odk, $(gb_Module_CURRENTMODULE_NAME)), -DRTL_USING) endef # defined by platform diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index ca50785202c0..c973b5da0a54 100644 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -29,7 +29,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/res)) $(eval $(call gb_SrsTarget_use_packages,svx/res,\ editeng_inc \ - sal_odk_headers \ sfx2_inc \ svl_inc \ svtools_inc \ diff --git a/testtools/StaticLibrary_bridgetest.mk b/testtools/StaticLibrary_bridgetest.mk index 9f31be8975f6..ece6680b24a1 100644 --- a/testtools/StaticLibrary_bridgetest.mk +++ b/testtools/StaticLibrary_bridgetest.mk @@ -30,8 +30,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,testtools_bridgetest_s)) $(eval $(call gb_StaticLibrary_use_external,testtools_bridgetest_s,boost_headers)) $(eval $(call gb_StaticLibrary_use_packages,testtools_bridgetest_s,\ - cppu_odk_headers \ - cppuhelper_odk_headers \ )) $(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest_s,\ diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk index 6919795979a2..3942e688f801 100644 --- a/tools/StaticLibrary_ooopathutils.mk +++ b/tools/StaticLibrary_ooopathutils.mk @@ -20,8 +20,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,ooopathutils)) $(eval $(call gb_StaticLibrary_use_packages,ooopathutils,\ - sal_generated \ - sal_odk_headers \ tools_inc \ )) diff --git a/udm/StaticLibrary_udm.mk b/udm/StaticLibrary_udm.mk index 3d1b0527b747..3901a45bd727 100644 --- a/udm/StaticLibrary_udm.mk +++ b/udm/StaticLibrary_udm.mk @@ -11,8 +11,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,udm)) $(eval $(call gb_StaticLibrary_use_packages,udm,\ cosv_inc \ - sal_generated \ - sal_odk_headers \ udm_inc \ )) diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk index acac73a6b596..2b003a8da011 100644 --- a/vcl/StaticLibrary_headless.mk +++ b/vcl/StaticLibrary_headless.mk @@ -32,8 +32,6 @@ $(eval $(call gb_StaticLibrary_use_packages,headless,\ basebmp_inc \ basegfx_inc \ comphelper_inc \ - cppu_odk_headers \ - cppuhelper_odk_headers \ i18nlangtag_inc \ i18nutil_inc \ o3tl_inc \ diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk index 81491d6cac3f..0f437a60b7ee 100644 --- a/vcl/StaticLibrary_vclmain.mk +++ b/vcl/StaticLibrary_vclmain.mk @@ -21,10 +21,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain)) $(eval $(call gb_StaticLibrary_use_packages,vclmain,\ comphelper_inc \ - cppu_odk_headers \ - cppuhelper_odk_headers \ - sal_generated \ - sal_odk_headers \ tools_inc \ )) diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk index 4f3e97a5c5d8..9e80119aaa9f 100644 --- a/writerperfect/StaticLibrary_writerperfect.mk +++ b/writerperfect/StaticLibrary_writerperfect.mk @@ -21,10 +21,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,writerperfect)) $(eval $(call gb_StaticLibrary_use_packages,writerperfect,\ comphelper_inc \ - cppu_odk_headers \ - cppuhelper_odk_headers \ - sal_generated \ - sal_odk_headers \ sot_inc \ tools_inc \ unotools_inc \