Commit Graph
39 Commits
Author SHA1 Message Date
Michael Stahl 3563faa837 odk: remove PackageSet_odk_headers
This is quite confusing: the gb_Helper_register_packages_for_install
odk_headers does not actually use the Package odk_headers, but the
PackageSet odk_headers, because the name is the same and the PackageSet
directory comes first in the search path.

This means that the Package odk_headers_generated is installed despite
there being no obvious reason why.

The PackageSet doesn't provide much value here, so just remove it.

Change-Id: I564f3b9fc6acaabe700328bc8c3db70c3b2de0cd
2017-06-02 23:01:11 +02:00
Stephan Bergmann c14b9630a9 Adapt CustomTarget_odk/build-examples to macOS
Change-Id: Ib64d5b5fa1bf13a484adb296b969d1b96387f0c6
2017-02-01 15:16:24 +01:00
Stephan Bergmann 0270018b68 Build the ODK examples during subsequentcheck
...at least on Linux for now

Change-Id: Id9d909a3b071c37ba0cd29bbff0edb83d937145f
2017-01-31 13:52:45 +01:00
Stephan Bergmann cfd2691e5b [API CHANGE] Remove salcpprt static library
...containing replacements for global operator new/delete (that can be linked
into executables), but which is no longer used.  The mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2012-March/028690.html>
"operator new no longer routes through rtl_AllocMemory in libsalcpprt under
gbuild link rules" has the details of how this was used on some platforms (but
not on others) before the switch to gbuild, and has been "lost" ever since---but
apparently a loss not mourned much over the years.

For the SDK, c5f974287f "INTEGRATION: CWS jsc3:
#i62434# copy libsalcpprt.a" added the library (under Linux) and
6db9c5af96 "INTEGRATION: CWS jsc3: #i62434# extend
link options for executbales to link libsalcpprt.a, LINUX only" added its use to
odk/settings/settings.mk, but fc0ca57f2c
"INTEGRATION: CWS jsc21" removed that use again (for no documented reason).  So
this is an incompatible change, but unlikely to actually affect any users of the
SDK.

Change-Id: Ia38b4c439f21fca3f5d9af7d1a34054e992054e9
Reviewed-on: https://gerrit.libreoffice.org/31810
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-12-12 09:16:34 +00:00
Stephan Bergmann dc4b82a030 Fixed some CppunitTest names
Change-Id: I57b039c7114c03944e8eaba9ca1bb81da563640a
2014-08-28 15:06:58 +02:00
Michael Stahl 7e73edc5b6 normalize values of BUILD_UNOWINREG
Change-Id: Iedbab675ffd10c6d353c44d99ddb4d32133d0717
2014-03-11 11:57:17 +01:00
Stephan Bergmann a59e5ecd61 Change SDK javaodc from static Package to dynamic GeneratedPackage
...as e.g. the list of resrouces/*.gif apparently varies per javadoc version.

Change-Id: Idcf95229295c1c5cd16e565bcd168c1a0e7d4f0c
2014-02-25 15:51:21 +01:00
Michael Stahl fa424af27e readlicense_oo: stop delivering files to OUTDIR
- remove Package_readme, use generated files from WORKDIR via include
  path
- Package_license and Package_files deliver to INSTDIR
- split up Package_odk_shared_readme to have extra Package for
  generated files
- gb_Extension_LICENSEFILE_DEFAULT points to INSTDIR

Change-Id: I019d3431e30d982e887ae0000c755e0d61f98893
2013-10-31 10:42:24 +01:00
Michael Stahl 6cf65f9612 odk: merge Package_config_notwin into Packge_config
Change-Id: I021ae1bc6d816d359be364c221d70a0e178a8b80
2013-10-31 10:42:23 +01:00
Michael Stahl 5e300e9030 odk: remove Package_bin, instead auto-install executables
This is somewhat annoying since it requires re-introducing stupid
directories in scp2, but if the executables should be put in INSTDIR
directly then the Package_bin needs to go.

Change-Id: I893694c7f9d4cb5b9ef8ec4a3d30e08536223740
2013-09-22 11:08:31 +02:00
Michael Stahl e2b8cbef51 odk: remove addsym-macosx.sh
This was added in commit 66eedcee02
but has apparently never actually been used in the bundled SDK
makefiles.

Change-Id: Ifa6cab95be6575ac26840250ad717d94e15bea66
2013-09-11 18:23:15 +02:00
Matúš Kukan f48fa3c390 install whole sdk using filelists
Change-Id: I9d8d0a20d776740c4701ec9a1facded9f4bde77a
2013-09-09 22:09:03 +02:00
Tor Lillqvist 08452f1208 Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
2013-08-19 10:29:04 +03:00
David Tardon 41efa15358 use GeneratedPackage to deliver uno loader classes
This is a workaround for problems with file names containing $ in
gbuild. And it does not matter much in this case, because the classes
are never used during build, so there is no need to have exact
dependencies.

Change-Id: Ibeb30257a62ed13744dc4fe987830d1e5a4102b0
2013-06-19 16:16:42 +02:00
Michael Stahl e2fd9fbe6e odk: stop packaging autodoc generated documentation
Change-Id: I9d1e232f2fea779f111067b588bbb36411039de2
2013-06-04 12:01:10 +02:00
Michael Stahl 4146cef50c odk: package doxygen IDL docs
Change-Id: I1613ce8cf9b8248bb5d5e546df7310154e11b830
2013-06-04 12:01:10 +02:00
David Tardon ffa50f643c install cpp docs using filelist
Change-Id: I93176653935b6ccfd4181e6086444fbe7475f2b0
Reviewed-on: https://gerrit.libreoffice.org/3775
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-05-04 14:42:19 +00:00
David Tardon 148c7629fc deliver uno loader classes using filelist
Change-Id: I121a4ad5d7cff54b914796142fa7c50006856300
2013-04-30 17:49:08 +02:00
David Tardon c93a752ae7 ritually kill odkcommon.zip
Change-Id: I0a814e3f5605340f00d4b48e83ce26792abec067
2013-04-24 15:56:09 +02:00
David Tardon 0ea6217986 install gen. IDL docs using filelist
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-24 13:06:11 +00:00
David Tardon 3dffe4a13e install javadoc files using filelist
Change-Id: I434508057dbfab9410d8f7fc3844c45cd4201b11
Reviewed-on: https://gerrit.libreoffice.org/3588
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-24 06:01:47 +00:00
David Tardon 498091c772 clean up install. of C++ docs
Change-Id: I51841a8c92cb73912757fcc0766b11d8f9be4b77
Reviewed-on: https://gerrit.libreoffice.org/3587
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-24 05:22:17 +00:00
David Tardon 6c7659b584 move URE headers to include/
Change-Id: Ib48a12e902f2311c295b2007f08f44dee28f431d
Reviewed-on: https://gerrit.libreoffice.org/3499
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-24 05:17:10 +00:00
David Tardon 085c5c6bea make odk inst. check a check target
Change-Id: I1bd8ee091a3c74ad05af69a4b7d5a2db21731b76
Reviewed-on: https://gerrit.libreoffice.org/3535
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-22 07:05:35 +00:00
David Tardon 60b2b24d8e replace CustomTarget_odk/odkcommon/settings by Package
Change-Id: Iee97a510be822836b2115f50d0b1c9e7e14b5e1a
Reviewed-on: https://gerrit.libreoffice.org/3534
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-22 07:05:10 +00:00
David Tardon 4f4344b515 chip more files off the odkcommon.zip block
Change-Id: I3d5d841d094f397130e37799a2f26e4d85f7c136
Reviewed-on: https://gerrit.libreoffice.org/3533
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-22 07:04:52 +00:00
David Tardon 0d752247d8 replace CustomTarget_odk/odkcommon/lib by Package
Change-Id: I929384077255b2fd944abf2da573c66572dec62b
Reviewed-on: https://gerrit.libreoffice.org/3532
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-22 07:04:33 +00:00
David Tardon 1ea1818dd1 use Package for unowinreg
Change-Id: I7546e8938ba41e1462e704bd0405c5a887151d7b
Reviewed-on: https://gerrit.libreoffice.org/3531
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-22 07:04:11 +00:00
David Tardon 5c7f6ca7e1 replace CustomTarget_odk/odkcommon/cli by Package
Change-Id: I1d747fec9b1bf2aeef2a1886981f7f07a338ea12
Reviewed-on: https://gerrit.libreoffice.org/3530
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-22 07:03:53 +00:00
David Tardon 2996c3d41f replace CustomTarget_odk/odkcommon/bin by Package
Change-Id: Ia57ed471294595f1a8ee0aa0af05f3b82d439393
Reviewed-on: https://gerrit.libreoffice.org/3529
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-22 07:03:29 +00:00
David Tardon 2636236a5c gbuild: use Package for odk examples
Change-Id: I978573b792cf159b7c818ec20a14195bfd6605e5
2013-04-16 13:39:13 +02:00
Michael Stahl 3f07029fc2 gbuild: refactor SDK packaging of IDL files:
- 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-03-13 14:33:55 +01:00
Stephan Bergmann bfdcde7c2e Unused UDK_MAJOR/MINOR/MICRO macros (and udkversion.mk), also removed from SDK
Change-Id: I466424c5b71de4d6bb126499895539813283502a
2013-02-28 13:33:48 +01:00
Michael Stahl e0beed4683 remove odk/CustomTarget_include.mk and package udkversion.mk in sal
Change-Id: Iab7335bc440484a6c01700ae36d1e004f8e96be7
2013-02-27 17:09:47 +01:00
Stephan Bergmann de471513bb CustomTarget_include had apparently been forgotten
Change-Id: If61617ae3d18ef4f15f2d150af76f0b1b64a3fa6
2013-02-26 10:59:22 +01:00
Stephan Bergmann 852cc47ab6 Add comment about dependency gotcha
Change-Id: Ia3eee9d4c06ef3411ad0a8547edcb08fe901d9dc
2013-02-26 10:07:38 +01:00
Stephan Bergmann b30e154c2b Revert "Clean up"
This reverts commit 7b6cac16ef,
dependency hell.
2013-02-26 09:57:20 +01:00
Stephan Bergmann 7b6cac16ef Clean up
Change-Id: I25cde2532ed9228b5b674908050a275c4206599e
2013-02-26 09:39:29 +01:00
Peter Foley 613221bde1 convert odk to gbuild and add to tail_build
Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0
Reviewed-on: https://gerrit.libreoffice.org/2288
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
2013-02-23 21:39:52 +00:00