summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)AuthorFilesLines
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 (cherry picked from commit f4ccd054a94de1290e01bd21d5d45f1720f7cb74) Reviewed-on: https://gerrit.libreoffice.org/7569 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-01-21gbuild: UnoApi: fix rebuilds after IDL changesMichael Stahl2-0/+16
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 (cherry picked from commit 0190a70e79efa437e1516e635f4f670d7a35bb2d) Reviewed-on: https://gerrit.libreoffice.org/7547 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-01-18allow to codesign on Mac OS X MavericksChristian Lohmaier2-9/+21
codesign on Mavericks wants much more stuff to be signed apart from the actual Mach libraries and executables. However the signature for those data-style files are stored as extended files attributes, so one needs to take special care on how to package the dmg to not break the seal. Also explicitly remove some files from the signing, to allow adjusting user-config path or similar or for gallery. Change-Id: Ic4c4f7718df1bca7ffa2fecd3fb1d616146d7b14 Reviewed-on: https://gerrit.libreoffice.org/7490 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-01-17sign language pack on Mac, and add the locale name to the App nameNorbert Thiebaud1-7/+23
Change-Id: Ie05a03e1edc02527b6895da07cfede69df7ec157 Reviewed-on: https://gerrit.libreoffice.org/7386 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-01-17give an identifier to the app_bundle itselfNorbert Thiebaud1-2/+2
Language Pack did not seem to pick a decent default value for that Change-Id: I567f24882e16533e10d8ba91b777ad91dc507b87 Reviewed-on: https://gerrit.libreoffice.org/7385 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-01-17codesign: do not sign stuff that is inside the bundled pythonNorbert Thiebaud1-1/+1
bundled framework are signed as a 'framework'.. it does not seems like we should sign random piece of it while attempting to sign the App itself Change-Id: Ia9ea34f5ba484e4a15337aa4edabd86e3b5fe406 Reviewed-on: https://gerrit.libreoffice.org/7387 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-01-10fix help packaging for Mac OS X language packsChristian Lohmaier3-30/+12
helpcontent was not packaged into the tarball that is extracted into the user's installation directory (and thus never was installed) simplify the packaging by getting rid of the special "collect" dir (LangPackHostName) that was the cause for the problem to begin with: LanguagePack files were collected in LangPackHostName based directory, while HelpPack files were collected in regular directory. And that value wasn't even used for the actual path that is delivered to the user, so get rid of it and the associated code. Change-Id: Iadd24382a45722bbe8d58bd97be79609fd03021b (cherry picked from commit deb39c012031b7981360665cc19dc81d3342a3ad) Reviewed-on: https://gerrit.libreoffice.org/7350 Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-01-09fix Framework Codesigning on MacOSXNorbert Thiebaud1-1/+5
on the 32 bits build 10.6 SDK we deliver Python Framework The code to sign the framework, although clearly the command that is recommanded for such things, failed with "object file format invalid" This patch make it 'works'... and with it the 10.6 build does not complain anymore about not satsifying it's 'requierments' Change-Id: I4fb5c6f3a9ed573d0bb2a09bddaf44300dc6f98b Reviewed-on: https://gerrit.libreoffice.org/7152 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2013-12-16initial install-package-foo target for partial installsBjoern Michaelsen8-3/+114
make packageinfo target add uiconfig file translations add missing l10n config files add missing help files in packageinfo Reviewed-on: https://gerrit.libreoffice.org/6754 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Conflicts: helpcontent2 translations a2498a118e729276a78ef3a4eb43b5d0b302d326 9bb39bdd677af4be0da621370c51eb9e22ecc33f a7e654cdeffd832f51016ff51aa180fe3924ff4e 4ee41fdb600cb3a89da387dffe64e6a30192761c 349fb24a388775c58be7a326832b3fc0ec38180f 8a2ca73c02fd6b04ce60e7701c51d2362ef7ec06 Change-Id: Id5f6f5c1f3e46df2d9033ccd5bbf2af6ab38a9e8 Reviewed-on: https://gerrit.libreoffice.org/6982 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-12-11Add back check for missing libgetuid.so.Matúš Kukan2-3/+6
If the library does not work, things like fdo#67388 happen. Change-Id: I3390fdb6f2cdf24145ddde4466146f91e5dfde82 (cherry picked from commit 2b1fcd466eea63cd8e694693255b765c863fda8c)
2013-12-11fdo#67388: installer: Fix path to libgetuid.so again. Hardcode it.Matúš Kukan2-18/+3
(cherry picked from commit 203e84d434de904add0b4426e87a4eb0a9a50c66) Change-Id: I5bcbb59a0f49e925d60f225b0f8f925d6d5dc468
2013-12-10Get rid of $(share_subdir_name) againStephan Bergmann1-0/+4
Quoting 56211a166ab25d80de84c2cccce22be15a9be051 "fdo#72394 Don't endlessly expand $(share_subdir_name) into itself": * The compile-time variable LIBO_SHARE_FOLDER should not end up as a runtime framework path variable, esp. since accidentally re-substituting it for "share" segments in unrelated URLs like <file:///export/share/for-all> does not make sense. ac4e19f9085dbd0103c7336a5318aa1e55b3e3e0 "fdo#68552: Don't (attempt to) do run-time expansion of build-time parameters" had already attempted a fix for that, but it had to be reverted again with 791a8b96f754798192875da287c84f8cfa4e533e because it "Unfortunately does not work if BUILDDIR is different from SRCDIR." So this time fix it not via configure-expanded *.in files, but via xsltproc (for officecfg/registry/ files) and sed (for wizards/soruce/configshare files). The changes to officecfg/util/alllang.xsl will replace @LIBO_SHARE_FOLDER@ only in oor:name attribues (and in <value> text), not in any other attributes, because I have no idea how to write that generically in XSLT and it happens to be only needed in oor:name for now. Change-Id: Iec78eb70dcbf1a5bbabf4e42f21c44dc65c3e438 (cherry picked from commit 87dd1780a31de9ea1df70a8511c262ff252bf99a)
2013-12-09fdo#72451: installer: Make filelists work again.Matúš Kukan1-1/+10
regression from c2f5e09900561d417d53a74fd6bc189cb7d898e1 Change-Id: I840d066ec2fccb35fdbd96939c5593a71beb0abd (cherry picked from commit 5015f04db460806a8247e97d9f1fe77f1501b255)
2013-12-09Do not compress .ui translations in .zip files.Matúš Kukan1-0/+1
Using zip files reduce the file count in installer. Uncompressed zip files can be compressed better by packaging, thus we reduce the size of final package. Change-Id: Id7c5ee9e302de325a29702b4e64301dc7102b2cf Reviewed-on: https://gerrit.libreoffice.org/6938 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2013-12-09Zip .ui translations per UIConfig target.Matúš Kukan3-20/+41
Fix installer / scp2 to not ignore directory prefix in 'Name'. Change-Id: Ib319363c8be73a72029f1ba3833e518e15c55e29 Reviewed-on: https://gerrit.libreoffice.org/6915 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-12-09Name the .pdb files so that WinDbg can consume them.Jan Holesovsky1-2/+11
Change-Id: I62cecfb36dd912a1a736d063761faa445a29f3a7
2013-11-28put CJK/CTL .xcds into instdirDavid Tardon1-0/+6
Change-Id: Ibbc34014f91c8f1ce73a6e9a8f61fa421fdb9144 (cherry picked from commit 5f9befa22e166ffb790a49b0d41ab823cf347435)
2013-11-22Add exectest.pl OLD-/NEW-FAILURE for deliberate idlc/unoidl diffsStephan Bergmann1-3/+8
Change-Id: I653522d8ebaac3329f368c102d14041c6b49d41d (cherry picked from commit c5bb39d64d26398e9ebf8f973059a887c271052f)
2013-11-20gbuild: TARGETGUI variable must be set on all LinkTargetsMichael Stahl3-2/+2
... otherwise it will get inherited from Executables to StaticLibraries and then mt.exe will be unhappy and complain. Change-Id: Ic9cc32ea3d0fb5d1fe91c1e9efa354fdf30c8264
2013-11-20gbuild: MSVC 2012 does not like /pdb for static librariesMichael Stahl1-3/+4
Complains with warning LNK4044 and ignores it. Change-Id: Ie91369339d121a652ce51e9229c3ef3b1c39d214
2013-11-20fdo#67060 do not package RPM-only install script to DEB packsAndras Timar1-0/+6
This reverts commit 5003ab57eee903d072fc7fac8cb5c69a34fb9d5c. It did not work, when both RPM and DEB were selected as targets. Change-Id: I90c74f0d00804b80daeca2c69d1f12e094243a81
2013-11-20Windows: Require at least Windows XP SP2Thomas Arnhold3-4/+4
* Windows XP SP2 is 0x0502, see http://msdn.microsoft.com/en-us/library/aa383745.aspx * If a module changes the Windows SDK version setting, this is done module wide now. So the overall behavior is as before. This seems to be the best compromise for now. * We need at least SP2 because of the bluetooth stuff used in sd/source/ui/remotecontrol. * Now, we require at least Internet Explorer 7.0. IE6 has been outdated for a long time. * Leave StdAfx.h file definitions, as those are Microsoft project specific precompiled header files. * All local definitions of WINVER are removed, because the global WINVER setting makes them obsolete now. To the relation of the three macros: Setting _WIN32_WINNT sets WINVER and NTDDI_VERSION automatically to the same value as _WIN32_WINNT. WINVER and NTDDI_VERSION can be set idenpendently each for itself. Change-Id: Ibcc12493aae4fcaf7bcfda88be99c1b61bc326cb Reviewed-on: https://gerrit.libreoffice.org/6496 Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-11-18renamed ku* to kmr-Latn*, fdo#63460Eike Rathke1-1/+1
Change-Id: I8069657d8829a0315c704e884a1cf15b26e02eb8
2013-11-17good-bye stringex, you served wellAndras Timar1-1/+0
It will be better to handle Android Impress Remote localization independent of the big LibreOffice source tree. Instead of stringex, we will use android2po, a 3rd party utility for conversion strings.xml <-> pot/po. Change-Id: I4eae53e4f8d94c55e5564d54c5e5c214bc9569d7
2013-11-15Add Python 3 compatibility to GDB pretty printers.Jan-Marek Glogowski12-37/+50
GDB on *buntu is linked against Python 3.3, which has many incompatibilities to Python 2, resulting in broken code. This patch uses the Python six library as a compatibility layer. Change-Id: Icb4cc54a1d05afb119376bb5e1430c91cb794d08 Reviewed-on: https://gerrit.libreoffice.org/6688 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-11-15Import Python six v1.4.1.Jan-Marek Glogowski1-0/+577
Python six just consists of a single Python file, so this includes the file as a convenience. Change-Id: I98ed50fba657013f5f3f12a4d13b3ba5558bfa2e Reviewed-on: https://gerrit.libreoffice.org/6687 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-11-15No fpicker lib any more, no mork lib on WindowsTor Lillqvist1-2/+1
Change-Id: I07cdd13eef09a84abca0d5204c6f55ca25b9d9c0
2013-11-14gbuild: fix typo in Module clean ruleMichael Stahl1-1/+1
regression from 04dead1c6b9fd8ea24b27d2c5824ae889a2fac66 Change-Id: I623ec25a0666cd3cac1d4f6371e6460a25faa6c4
2013-11-14make l10n buildable separatelyBjoern Michaelsen3-10/+53
- this renames the 'almost' module target to non-l10n - and adds a l10n target which is intended to only build l10n parts of the product - packagers should then be able to build l10n and non-l10n parts of the product independently, thus: - enable quicker rebuilds - distribution of load - updates to l10n without a full rebuild - security fixes to binaries without rebuilding all l10n - the new targets are called build-l10n-only and build-non-l10n-only - note this is not intended to move a concept of split packages upstream -- while this exsists in distros, the number of test scenarios for this would explode upstream Change-Id: Ib8ccc9bc52718d9b0ebbfee76ad93dc29c260863 Conflicts: filter/Module_filter.mk
2013-11-13installer: use 'mkdir -p' before 'ln -sf'Miklos Vajna1-1/+4
Fixes the "ln: failed to create symbolic link '.../usr/lib/libreoffice/sdk/classes/win/unowinreg.dll': No such file or directory" problem, reported at http://lists.freedesktop.org/archives/libreoffice/2013-November/057443.html Change-Id: Ibe7dbbecc670921ca3c372cc9b8655cf2f50aefa
2013-11-12gbuild: ExtensionPackage: fix incremental builds wrt. Package here tooMichael Stahl1-1/+2
Change-Id: If37bd98faa6ec043ceb73a0cdfb8dddef7a6359e
2013-11-12gbuild: HelpTarget: more incremental rebuild fixingMichael Stahl1-0/+2
gb_HelpLinkTarget_add_renamed_file also adds a file to Package and there neeeds to be a rule for it. Change-Id: Iefbcb082248e4e565b821e9b9a676b2b487cfc98
2013-11-12gbuild: UIConfig: fix incremental buildsMichael Stahl1-1/+1
The files added by gb_UIConfig_add_uifiles get re-built but not delivered to instdir (only in a second make invocation); try to fix that with a dependency from the file in workdir/UILocalizeTarget to the UILocalizeTarget that builds them. Change-Id: Ifb41d4b9f6f6a671cc8cc5a7f6800857ac355064
2013-11-11Add EBOOK_LIBSTor Lillqvist1-0/+1
Change-Id: I180346fe33814ac72e2293bd010b993caefbc71e
2013-11-10gbuild: SdiTarget: avoid more spurious rebuilds...Michael Stahl1-1/+4
... because the .hxx file only occurs as a target in .d files of objects, the rule for it will not trigger in a build from scratch and it will be older than the SdiTarget itself and will be touched on the next incremental build. Ensure that it's not older than the SdiTarget. Change-Id: I49504814ff62efb22d1f10b37e3bec2ea841bfc9
2013-11-10gbuild: HelpTarget: need more recipes...Michael Stahl1-0/+23
The files in gb_HelpTarget__get_index_files need to be targets with a rule since they are delivered via Package. Same for the ".tree" file, and the HelpJarTarget. Change-Id: I03167f358aabf297c9f2feacc170ec4e9db437d1
2013-11-10gbuild: Gallery: avoid spurious re-deliveryMichael Stahl1-0/+8
The .sdg/.sdv/.thm files are generated by gengal (i.e. the Gallery_get_target) but are not targets, which means they will only be delivered in a second make invocation because make requires running a command to propagate out-of-date-ness. Change-Id: Iddb2222151bdbcf93d79bd801fa30ab7d7fbd1d3
2013-11-08gbuild: Extension: avoid re-build on missing translation description.xmlMichael Stahl1-2/+2
Change-Id: I6292f4ec235f8880176c2671ec7c8533168cdbeb
2013-11-08gbuild: HelpTarget: avoid spurious rebuilds on missing translationMichael Stahl1-6/+6
... if the darn files are allowed to be missing, use wildcard to avoid dependencies on them. Change-Id: I36a83413f8fb65b081681a8f351ec6afcf15fe6d
2013-11-08gbuild: AllLangResTarget: avoid spurious rebuilds on missing translationMichael Stahl1-1/+3
... if the darn files are allowed to be missing, use wildcard to avoid dependencies on them. Change-Id: I5232efcb17342d0b2a1e909da6449b08c4148245
2013-11-08gbuild: SdiTarget: .hxx file is always out-of-dateMichael Stahl1-1/+1
... so touch it to avoid that, just to avoid the "true" rule from being invoked every time. Change-Id: I6f27c6e4b0d071b9877a38dc1f4cd3c3eb10bfc0
2013-11-08installer: the perl is borkedMichael Stahl2-3/+5
Apparently the $$languagesref in create_directories results in the full path to services.rdb when called from mergemodules.pm as my $unpackdir = installer::systemactions::create_directories("cab", ""); ... which apparently means that there's some variable whose name is the empty string and whose value is the path to services.rdb. Add some mysterious workaround suggested by mmeeks. Change-Id: I6ba203f5cc44786969795eebab5359d5e9a8a12a
2013-11-08Hard-code the path to libgetuid.so in epmfile.pmStephan Bergmann1-10/+2
...so that it is still found after 7b3133ad882b24834f87b478d00bf4ee92d3cd63 "instsetoo_native: shouldn't need instdir in include path." And no idea why getuid was in PLAINLIBS_URE instead of PLAINLIBS_NONE. Change-Id: I5de2a79cbd3c0064cd7776e269f4792304ec34e3
2013-11-08instsetoo_native: shouldn't need instdir in include pathMichael Stahl1-3/+3
get_Source_Directory_For_Files_From_Includepathlist already has a special hack to find all the files in instdir so ideally it should not be necessary to put these directories on the include path. Clean up readlicense_oo to make that possible; also copying license.txt as-is to LICENSE on Unix but first converting it on WNT is rather silly... Change-Id: I95f30bc5e0b7ca73c50156a7ce0131640185778c Reviewed-on: https://gerrit.libreoffice.org/6613 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-11-08installer: remove (now unnecessary) shlxthdlpathMichael Stahl1-3/+0
Change-Id: Ic84cdc33f470ce3ed143d86add04a422f8b9e365 Reviewed-on: https://gerrit.libreoffice.org/6614 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-11-07gbuild: AllLangResTarget: clean install targetMichael Stahl2-1/+1
Change-Id: Ic71d50e2374f15f2cb5d15dd32604a867bfb74e4
2013-11-07a little instdir sub-dir cleanupMichael Stahl1-1/+1
Change-Id: I97df3f949da7403e46951cf159a9fc1fca4cc23f
2013-11-07installer: remove unused variableMichael Stahl1-2/+0
Change-Id: I03648e07b6f1ab895254c4e2a02717a6a318c783
2013-11-07remove INPATH and PROEXTMichael Stahl9-29/+10
- WORKDIR path is just workdir - INSTDIR path is just instdir - WORKDIR_FOR_BUILD is workdir_for_build - INSTDIR_FOR_BUILD is instdir_for_build - replace other usage of INPATH by combination of OS and CPUNAME Change-Id: Ie398387ebd82a968ec2605f2103c55b43a231482 Reviewed-on: https://gerrit.libreoffice.org/6601 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-11-07Include backtrace in logStephan Bergmann1-2/+3
Change-Id: I76306ac61365282ef2de4869c1c8e21e044304ff
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 03:30:06 +0000