summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)AuthorFilesLines
2014-09-25make signing depend on slowchecks being donecp-4.2-16Christian Lohmaier2-1/+2
otherwise signing (at least on windows) fails because files are in use Change-Id: Ida6a7d43dc74eb278fd79410b9c0a60f823c5933 Reviewed-on: https://gerrit.libreoffice.org/9176 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2014-09-23Let's use -O3Tor Lillqvist1-1/+1
Change-Id: Id7d068df3cabe9e7c01cc90ffdc61fa325f79dab
2014-09-21Need the entitlements for embedded app executables tooTor Lillqvist1-1/+1
Change-Id: I75f31df295fdf7bccf82356c26ba757cc7ea276c
2014-09-21The code signature identifiers of bundles need to match the bundle identifiersTor Lillqvist1-9/+16
Change-Id: Iaf4af02dd23f77758db76107d08050978ef95c82
2014-09-20The bundle signature's identifier must equal the bundle identifierTor Lillqvist1-1/+1
Change-Id: I8230c85555711ea53ab7ec247e01d77f7be589b9
2014-09-19OS X code signing fixesTor Lillqvist2-33/+34
Remove unnecessary Python executables and stuff that complicates code signing in the test-install target. Sign executables in codesign-macosx-app-bundle, not when building them. It is more uniform to do all code signing in just one place. All executables must have the com.apple.security.app-sandbox entitlement. Change-Id: Ic6a640eb03964fe9ce75d3a8fff071971a3e1939
2014-09-12Use $(LIBO_SHARE_FOLDER) instead of hardcoded 'share'Tor Lillqvist2-2/+2
Change-Id: I073d44c0e3e8c6eff0e885f827fa661e3c8e5206
2014-09-12Handle LIBO_SHARE_HELP_FOLDERTor Lillqvist2-1/+5
Change-Id: I4f004321c58da1d81a2cc3c80504347db583d86a
2014-09-10Make test-install work also in the non-release-build caseTor Lillqvist1-1/+1
In the (default) --disable-release-build case the -p option to make_installer.pl should be "LibreOffice_Dev", not "LibreOffice". See instsetoo_native/util/openoffice.lst.in. Also, the pathname passed to solenv/bin/macosx-codesign-app-bundle needs to adapt to ENABLE_RELEASE_BUILD, either LibreOffice.app or LibreOfficeDev.app. Change-Id: If2b8efee096339f9c0cf52e663826d0086b1e35e (cherry picked from commit 7826428cf80364099a3f351e7fec44043d88b05a)
2014-09-10The --resource-rules option in being deprecatedTor Lillqvist1-3/+6
The documentation is a bit unclear yet, but I think it is safe to assume that Apple strongly wants sandboxed apps to have what we call ENABLE_MACOSX_MACLIKE_APP_STRUCTURE and to be signed without any special resource rules. (cherry picked from commit 41f2ebfbaa9fb06f56530b4a330fc029df87ecfd)
2014-08-23enable MSP creationAndras Timar1-1/+1
Change-Id: I3d28cae66d8658505e2339d22304c1b3852fbb43
2014-08-23MSP patchsequence fixAndras Timar1-8/+3
Change-Id: Iaf4a6e5eb8291d78835a391894ba1b1cc675390a
2014-08-23fixes related to MSP digital signatureAndras Timar2-2/+4
Change-Id: I06bcf0d2cc8c4915eff3658905087be6a2eadca6
2014-08-23use MSM directly from MSVC dirAndras Timar1-3/+3
Change-Id: I62ebf7f7bc10a81a3949b0aad6e6353619ef6b22
2014-08-21gdb: print the SwNodeIndex properly if there are multiple blocksMichael Stahl1-2/+6
Change-Id: I178d365e71ef3377b1a2cfc115bb297640161efe (cherry picked from commit 4f211a0d0c4ef0c248fd3d4493994c1a122c2eb9) Reviewed-on: https://gerrit.libreoffice.org/11047 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-06-06Use MACOSX_APP_NAME instead of the build-time app bundle nameTor Lillqvist1-2/+1
Change-Id: I447cf96778e56cbc89c7aa7eb066df0bc52b1755
2014-06-05Revert "Collabora branding"Tor Lillqvist1-3/+3
Nah, this breaks a --with-package-format=dmg build. Will have to think harder. This reverts commit e8d629dc06ef79d5db1c80af1b1047f4fcb216b7. Change-Id: I6b0e1c9a460acfe0304e9bafa5f2114e177bbe50
2014-06-04Collabora brandingTor Lillqvist1-3/+3
Change-Id: I6044c9aeba8b7f3a58b0465b2944275bb5aee6bb
2014-06-04Turn eventual spaces in the app bundle name into dashes in its codesigning idTor Lillqvist1-0/+1
Change-Id: Ibf643da61ce7fffb9bc8e704914afb5985be8f6a
2014-04-18LibreOffice from Collabora EULAAndras Timar1-1/+1
Change-Id: Ia380db465f5094216cb36526f6cc178043376356
2014-04-02Add apr and serf externals for alternative webdav implementation.Matúš Kukan3-0/+12
Change-Id: I5e93bb6fb53537b889c6ba9888f0f32a0d6f8050 (cherry picked from commit 0b27253aff771e104a9fd5d17595b205b2fc39fd)
2014-03-07Merge macosx-codesign-app-bundle changes from cp-4.1Tor Lillqvist1-28/+27
Don't unintentionally drop a period, and actually simplify. Handle app bundles with space in name, also sign the mdimporter properly. Just like the Python framework, also the Spotlight importer needs to be signed specially, it seems. Include the directory names in the "ids" to make them unique. There are lots of files with the same name, especially in an app bundle that includes help in multiple languages. Change-Id: Idd8a19be0b6eba69c7086a7ba706f00521aa6ff6
2014-02-26fdo#75526: sdk: install URE library symlinks / import libs againMichael Stahl8-0/+20
This is a bit involved because since the LinkTarget now creates the instdir/sdk/lib/* files itself a Package cannot be used; so convert the URE libraries to AutoInstall and add special handling for them to gb_Helper_register_libraries_for_install to create the necessary links in the "sdk" install-module. (regression from 70c35265f517ef372cb739d4cc64499abf57a838) (cherry picked from commit 482ab0d09620f92eb3618125930dc7c4c8335b5e) Conflicts: solenv/gbuild/AutoInstall.mk fdo#75526: argh missing semicolon (cherry picked from commit 7eeac88bdb111cc069d208cc2d82a6143748d9d3) Change-Id: Ia5467f3303d59f7f5f4a88adc22ceffb82a21ff1 Reviewed-on: https://gerrit.libreoffice.org/8365 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2014-02-10adjust PackageInfo for zip filesBjoern Michaelsen1-3/+5
see commit 7fe9808f009af2f0a4da58663eacd2caccdcaafe for reference Change-Id: I060021150f8ef976ffeb417b18dda31367e549b8 Reviewed-on: https://gerrit.libreoffice.org/7975 Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Tested-by: Matúš Kukan <matus.kukan@collabora.com>
2014-02-04fdo#74495: gbuild: AutoInstall: add support for ComponentConditionMichael Stahl1-1/+2
... via new scp2 macro LIBO_LIB_FILE_COMPONENTCONDITION. (regression from 2feb756dd5ff486a3972cf676f6f1d07017bf0f6) Change-Id: I6ab30cc1c14c34bd7dc1325e3f98d972544e7eea Signed-off-by: Andras Timar <andras.timar@collabora.com>
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>