summaryrefslogtreecommitdiff
path: root/solenv/gbuild/UnoApi.mk
AgeCommit message (Collapse)AuthorFilesLines
2019-07-05Make font-based unit test depend on instdir fontsJan-Marek Glogowski1-1/+1
The current dependency is already a hack, because there is no way I know of to depend on delivered top-level modules like more_fonts. The original patch parses the gb_Package_MODULE_ooo_fonts list of registered packages to add them as build dependencies. But this is not sufficient, as it just adds the dependencies on the installed / unpacked fonts in the workdir (actually it's just the installer filelist), where they can't be found by the unit test running in the instdir environment. So this converts the depndency into a make error, if either the filelist is missing or the included font files. But if we are in a full run and know the more_fonts module, we simply depend on its delivered files. This needs some minimal changes to gbuild, as neither the delivered file list nor the modules class names are yet available. And this moves the fontconfig handling to extras, where the opensymbol font is already handled. Change-Id: I1b70a4c45ff189266ce56c57e534ddc45e7c5c19 Reviewed-on: https://gerrit.libreoffice.org/74624 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2014-01-21idl files need to be packaged relative to INSTDIR, not INSTROOTStephan Bergmann1-0/+1
...so that on OS X they end up in LibreOffice*_SDK.app/idl/, not LibreOffice.app/Contents/LibreOffice*_SDK.app/idl/. Change-Id: Id001aed334a0e1d8f835ce797a17f1f67d1a3abb
2014-01-20gbuild: UnoApi: remove unused sinular gb_UnoApi_add_idlfile etc.Michael Stahl1-18/+0
Change-Id: I9ad8798b205e697a588804de3de758be7203f1a5
2014-01-20gbuild: UnoApi: fix rebuilds after IDL changesMichael Stahl1-0/+3
There used to be a dependency between .urd file and .hpp/.hdl files but that was removed; introduce a dependency between .idl files and .hpp/.hdl files to replace it so headers and stuff depending on them get rebuilt. Change-Id: Ibf1fe1db08c36ce42c392d27b794c2bc2a33738c
2013-10-28gbuild: remove internal calls to gb_Package_set_outdir with INSTROOTMichael Stahl1-1/+0
Change-Id: If8aded13ed91a871b119192401d2c2edbbd50f94
2013-10-27gbuild: fix spurious re-delivery of .rdb filesMichael Stahl1-1/+1
Order-only dependency from INSTDIR target to IDL Package is enough; the Package depends on the WORKDIR .rdb and deliver preserves timestamps... Change-Id: I060f7f27b543d9cc93658c93d472a933a18a6952
2013-10-25gbuild: refactor UnoApi to remove rdb files from OUTDIRMichael Stahl1-10/+3
- gb_UnoApi_get_target returns the files in INSTDIR - stop using rdb files from OUTDIR - remove gb_UnoApi_install - remove pointless 2nd parameter of gb_UnoApi_UnoApi - order-only dependency from gb_UnoApi_get_target to gb_UnoApiHeadersTarget_get_target because INSTDIR .rdb is always outdated Change-Id: Id418f75e9b38d6fe135b55eca2594c2624bc41cc
2013-09-23Fixes for cross-compilation on OS X (to iOS)Tor Lillqvist1-1/+1
Introduce SDKDIRNAME as a configury variable and use it instead of the gbuild gb_Package_SDKDIRNAME. Then we can easily construct the SDKDIRNAME_FOR_BUILD variant that is needed to find the specially named SDK in instdir on OS X when cross-compiling. Move the version number section in configure.ac earlier. Change-Id: Iee3db1a50ad4c7a9f91bbc5e0d0b01d76a76f701
2013-09-23Try to fix cross-compilationTor Lillqvist1-1/+1
Add more FOO_FOR_BUILD variables and some gb_Foo_for_build functions. Get rid of gb_INSTROOT and gb_DEVINSTALLROOT, just use INSTROOT. Change-Id: Iee531b02d14fae41edb68ad589a5dec829a60255
2013-09-19Directly build UNOIDL .rdb files from .idl filesStephan Bergmann1-44/+8
...via unoidl-write and the new source-format registry provicers, instead of using idlc to produce .urd files, regmerge to merge them into legacy .rdb files, and unoidl-write to translate those to new UNOIDL .rdb files. gb_UnoApi and gb_InternalUnoApi ctors take an additional argument now that is the path (below $(SRCDIR)) of the source-format registry from which to obtain UNOIDL entity definitions. It can either be an .idl file (in which case no *_add_idlfiles calls should be used and the resulting .rdb will contain all the entities from that one .idl file; used in some tests to conveniently define all test-specific entities in a single file) or a directory denoting the root of an .idl file tree (in which case *_add_idlfiles calls specify the entites to include in the resulting .idl file). (In the first case, the generated .rdb file needs to depend on that single .idl file, so the gb_UnoApiTarget ctor contains a dependency on that additional argument, which happens, as a side effect, to trigger rebuilds in the second, tree-based case when addition/removal of .idl files in the tree causes updates of directory time-stamps.) UnoApiPartTarget and all the dependency-tracking logic based on .urd files in solenv/gbuild/UnoApiTarget.mk is gone. Generation of an .rdb file now depends on its source registry (see previous paragraph) and all the .idl files specified with *_add_idlfiles (in the second, tree-based case above). A consequence of that is that gb_UnoApi_add_idlfile, -_nohdl, and -_noheader all do the same now. I left them in for now anyway, maybe they become relevant again when the use of cppumaker is changed to read directly from a source-format registry instead of going via a .rdb registry. The legacy tools idlc, regcompare, regmerge, and regview are still contained in the URE or SDK for now. cb344cd59e1ddb7c6db66dbd9263b4755969d4ba "Revert 'Looks like idlc resolved typedefs inside sequence<...>'" is re-reverted as now "the current offapi.rdb is generated via unoidl-write instead of idlc." Change-Id: I3d9d92f17326bc9f49dd934c85aab6a17951d06d
2013-09-18Fix documentationStephan Bergmann1-3/+4
Change-Id: I0fa7a31ea783437632838ef82ee4d21c38f75698
2013-09-18Replace binary type_references with human-readable .idl versionsStephan Bergmann1-5/+0
...obtained from the old .rdb files via "unoidl-read --published". This removes the need for update-rdb.sh. Change-Id: I73c0d026af7e27370602f83c61dfa76fc4d17a83
2013-09-11Towards a working instdir for Mac OS XStephan Bergmann1-1/+1
Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X, where it is $(INSTDIR)/LibreOffice.app/Contents. Most stuff ends up there (so most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK- related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME). (And GeneratedPackage needed to be made more flexible, to allow for packages that go into either of those two places.) For Android and iOS, gb_INSTROOT probably still needs to be set. The most obvious missing thing yet to make instdir work for Mac OS X is the instdir/*/LibreOffice.app/Contents/ure/ vs. instdir/*/LibreOffice.app/Contents/ure-link/ split. Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
2013-09-09gbuild: install rdb files directly in module they come fromMatúš Kukan1-0/+8
Change-Id: I3a9cb4ce71cfb02b7378289a36aa0eb6e3a42f26
2013-06-04gbuild: UnoApi: revert documentation Package supportMichael Stahl1-56/+0
This was a good idea in its time and age (2 weeks ago) but has been obsoleted by recent developments: sadly with the zoo of files generated by doxygen this kind of tracking makes no sense. Change-Id: I243de5cf6129ea3532067a39006d8e4259f15a95
2013-05-05Revert "gbuild: fix generated deps for API headers"David Tardon1-11/+0
It's been quite a time since the big header move. I suppose this iss not needed anymore. This reverts commit 1b2f3b9c64c7903dfa56953b91db4f5f105e4e7d. Conflicts: solenv/gbuild/UnoApi.mk Change-Id: Iea817c17a2559e853709d3b7686365dd29e12ea8
2013-04-28do not copy anything to instdir in build stageDavid Tardon1-9/+6
Change-Id: I923704d47d4fbc764e847a1bd6eed9fca2dce089
2013-04-28drop UnoApiTarget_get_*headersDavid Tardon1-5/+0
This was actually meant for idls, not headers :-) And it is obsolete, as we do not deliver these to $(OUTDIR) anymore. We use explicit include paths into $(SRCDIR) instead. Change-Id: Iccb0dc529a99be59390f032fc331996146829abb
2013-04-28drop forgotten decl. of _inc Package for UnoApiDavid Tardon1-1/+0
We do not deliver the created headers anymore. Change-Id: I5317c43522d0b91044ccc880031795360816b21d
2013-04-28only deliver IDL files if neededDavid Tardon1-0/+14
Change-Id: If59a19363d9b82f17fcdfe4632edf6f757c65f64
2013-04-24Generate new format type rdb filesStephan Bergmann1-0/+1
With the main components (theTypeDescriptionManager, codemakers) supporting the new unoidl format, it is time to switch the generated type rdb files to that new format. For now, this is done as a two-stage process, though: Every $(WORKDIR)/UnoApiTarget/*.rdb file in the new format is accompanied by an *.rdb.oldformat file; both are generated in the same [UNO] gbuild step. This is for several reasons: * idlc still generates old format output. * The regcompare step (comparing against a reference rdb to catch incompatible changes) is still based on the old format. (The reg2unoidl tool needs any dependend rdbs as additional inputs, that's why the use_api information needs to be tracked as UNOAPI_DEPRDBS for now. That can be removed again when reg2unoidl is no longer used.) Change-Id: Id625c88f9ecdbaba9e2af7410417e00b4ba36acc
2013-04-24install gen. IDL docs using filelistDavid Tardon1-0/+61
Change-Id: I474f6e7a45d09683eb0dd7172114407c9dca84d7 Reviewed-on: https://gerrit.libreoffice.org/3571 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-04-24gbuild: fix generated deps for API headersDavid Tardon1-0/+11
This should be reverted after some time, as it solves a one-time problem. Change-Id: Iaa4bc17267a24bd744573e56108b8d207936629c Reviewed-on: https://gerrit.libreoffice.org/3506 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-04-24gbuild: do not deliver UNO API headersDavid Tardon1-5/+1
There is no reason to copy 1000s of files to $(OUTDIR)/inc when we can easily include them from $(WORKDIR). Change-Id: I133ab6506ba76af132143b982f056e652c09d8f5 Reviewed-on: https://gerrit.libreoffice.org/3505 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-04-22Move to MPLv2 license headers, with ESC decision and author's permission.Michael Meeks1-22/+4
2013-04-05use filelist install method for udkapi and offapiDavid Tardon1-0/+25
... so we can drop ZipUnoApi again. Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa Reviewed-on: https://gerrit.libreoffice.org/3152 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-13gbuild: refactor SDK packaging of IDL files:Michael Stahl1-17/+0
- UnoApi: stop delivering IDL files to $(OUTDIR)/idl - add ZipUnoApi to package IDL files for SDK - convert udkapi and offapi to ZipUnoApi and package them in scp2 - odk: remove ugly CustomTarget_idl that uses "find" Change-Id: I8dc4e0e7d0dc51c1abf18f31bfe095760d3c2104
2013-02-25Last use of obsolete gb_*_add_api is long goneStephan Bergmann1-4/+0
Change-Id: Ia6c938ef0e45ec86c0c202e95ef28d49fccd3497
2012-12-10userfriendly make targets for build and cleanLuboš Luňák1-0/+1
So that now it's possible to do just 'make CppunitTest_sw_macros_test' instead of 'make /home/llunak/build/src/l2/workdir/unxlngx6/CppunitTest/sw_macros_test.test' Change-Id: Ibd1e9ef4fc825043a71bd669b2f5c37ffec68e33 Reviewed-on: https://gerrit.libreoffice.org/1253 Reviewed-by: Peter Foley <jpfoley2@gmail.com> Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de> Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
2012-09-22ensure IDL files of used UnoApis are in placeDavid Tardon1-0/+2
Change-Id: I27740a60b9b5ff7ef5541713b2f85e03f8e70c7d
2012-07-26gbuild: UnoApi: fix spurious re-delivery of RDBsMichael Stahl1-1/+1
similar to 3378c2d3b88a8413deeb8365ce40d4ee0716eff6 but for gb_UnoApi__use_api. Change-Id: I20c1e3bc63caa5ead695d142d8ef39effe54fdab
2012-06-22gbuild: fix UnoApiTarget header dependencies:Michael Stahl1-1/+1
The existing situtation of not having any explicit rules for header files does not work because it requires a make restart after the headers are generated in order for the headers to be delivered. Because requiring running make twice to get a complete rebuild is bad, add some rules to force the headers to be delivered immediately. Change-Id: I5b4d5c8f8e9c9d7d0874fc797e62972eaa1dd904
2012-06-07gbuild: introduce gb_Package_Package_internal:Michael Stahl1-2/+2
The gb_InternalUnoApi_set_xmlfile function creates a new package, which registers at the current Module, overwriting the InternalUnoApi targets set there and causing make clean not to clean the InternalUnoApi. Change-Id: I46e9b4437788a479701187334325fe1e065e612c
2012-05-17fix spurious delivery of rdb files (better way)David Tardon1-3/+2
The only task of the UnoApi class is to deliver a RDB file and all the stuff related to it (i.e., the IDL files and the generated headers). For that purpose, order-only dependecies are sufficient. Change-Id: Ibe0a58d1e8ceaad62ff71773e372fb8dfb921fbd
2012-05-17Revert "fix spurious re-delivery of RDB files:"David Tardon1-8/+0
This reverts commit 07c0b800d9d70857882238204820f75b8dc98b26.
2012-05-16fix spurious re-delivery of RDB files:Michael Stahl1-0/+8
The OUTDIR RDB depends on Packages for IDL and headers, the latter of which depends on the WORKDIR RDB, hence preserving timestamps here leads to spurious re-delivery because the OUTDIR RDB always has older timestamp than the headers Package.
2012-05-09gbuild: remove gb_Helper_abbreviate_dirs_nativeMatúš Kukan1-1/+1
Change-Id: I0a3ad6553692fc21eaf96cf35e9c343b4d716c21
2012-04-08gbuild: "use" vs. "add"David Tardon1-4/+13
2012-04-01merge origin/masterDavid Tardon1-0/+1
2012-03-24rename targets to match LinkTarget's functionsDavid Tardon1-3/+3
2012-03-24use correct rdb root dirsDavid Tardon1-0/+2
2012-03-24use the default deliver ruleDavid Tardon1-5/+0
2012-03-11refactor UnoApi classDavid Tardon1-0/+156
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-18 21:16:26 +0000