summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)AuthorFilesLines
2013-03-19touch --no-dereference does not work on MACOSXPetr Mladek1-1/+1
Change-Id: I71e8658453e0e96e631cc2ef3996d660950c49cc
2013-03-19fix race condition when using hardlinks to deliver into solverPetr Mladek1-1/+1
We need to use "touch --no-dereference" on the delivered files. Otherwise, it creates empty target file when you touch symlinks and delivering the real target file might fail. This caused many build failures when delivering: liblcms2.so -> liblcms2.so.2.0.4 liblcms2.so.2 -> liblcms2.so.2.0.4 liblcms2.so.2.0.4 Change-Id: Ibd61815c12e002b495e848a125a959b8524b0935 Reviewed-on: https://gerrit.libreoffice.org/2840 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-15remove trailing whitespaceBjoern Michaelsen1-1/+1
- as this is being quoted, this causes breakage Change-Id: I6834a3235ae2334a0d6f7df0f97dcde7cdc6a5d0 Reviewed-on: https://gerrit.libreoffice.org/2739 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
2013-03-12bump product version to 4.0.3.0+, reset number to 0Petr Mladek1-1/+1
Change-Id: Ibf9c9c5646bb8d98bfe7c39686df803968458b61
2013-02-27Fix build on MacThorsten Behrens1-1/+1
Without this codesigning is unconditionally tried, unconditionally breaking the build.
2013-02-19bump product version to 4.0.2.0+, reset number to 0Petr Mladek1-1/+1
Change-Id: I9121d7148d1f5343b3b61bfe4ddcbeb9a9253bed
2013-02-19fix dependencies of the obsolete stdlibs package on linuxPetr Mladek1-13/+30
The old version should get repalced by the ure package. It should also conflict with the new ure package. This commit adds support for %incompat epm tag. It produces conflicts in rpm and deb. It can be defined in setup_native/source/packinfo by linuxincompat. This commit also removes obsolete hack for debian dependencies. libreoffice-bundled conflict is mentioned in the desktop-integration package these day. The hack in epmfile.pm was not used because no package used "replace" tag. Change-Id: I5e9cb89a6108c22c61287fce1ffc6baf3f618d15 Reviewed-on: https://gerrit.libreoffice.org/2260 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-02-19No need to copy the gcc libraries anymoreFridrich Štrba2-79/+0
Change-Id: I6dbf44bb78f14ab71a48a9cd4e9ebba60bfc97d2 (cherry picked from commit 8ff09509d725ce18814d5d77794f227d0c72037b) Reviewed-on: https://gerrit.libreoffice.org/2254 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-02-15rhbz#908674: Adapt rtl::Allocator::construct to C++11Stephan Bergmann3-0/+16
...otherwise, at least with some --with-system-boost versions and C++11 compilers, like with Fedora's boost-1.50.0-4.fc18.x86_64 and gcc-c++-4.7.2-8.fc18.x86_64, using this to copy-construct an instance of boost::unordered::detail::ptr_node<std::pair<rtl::OUString,Bootstrap_Impl*>> in the call to p_bootstrap_map->insert(...) in rtl_bootstrap_args_open (sal/rtl/source/bootstrap.cxx) would memcopy the ptr_node and fail to call rtl_uString_acquire, leading to memory corruption later on when rtl_uString_release is called one time too often. It is not entirely clear to me whether this is a shortcoming of the given Boost version, but this patch solves the problem and brings rtl::Allocator::construct in line with the (changed) Allocator requirements of C++11 anyway. The problem potentially lurks with every use of rtl::Allocator, but only showed now begining with LO 4.0 where e5111574fd904b38a3980ca4ea3d21cfcb22dea6 "Revert 'sb140: sb140: #i116981# clean up memory upon exit'" re-introduced code into rtl_bootstrap_args_open that inserts into a boost::unordered_map that uses rtl::Allocator. (cherry picked from commit c91d353872b7d4e1a39192bff1444b46cab6e5eb) Conflicts: config_host/config_global.h.in ...solved by resorting to the old -DHAVE_CXX11_PERFECT_FORWARDING logic spread across various solenv/.../*.mk instead. Change-Id: I3be22f59a8eb49d31458480c27f3ce15803c7fd4 Reviewed-on: https://gerrit.libreoffice.org/2166 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2013-02-10Add support for codesigning on Mac OS XTor Lillqvist1-0/+37
Only sign the .app. Presumably that's enough here in the 4.0 branch. Change-Id: I7a25c6b7bfa2047b1cb6bcb913750b1b476124f6 Reviewed-on: https://gerrit.libreoffice.org/2031 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-01-24fdo#59798: fix SDK MSI version "LOdev 4.1 SDK.0.0.alpha0"Michael Stahl1-7/+7
... by adding POSTVERSIONEXTENSION after PRODUCTEXTENSION. (regression from e024a8d88dbca3a2d178ad88c069721a92156ddf) Change-Id: Ie130dd5be08247ae9202f98cd58a6922fed27f32 (cherry picked from commit e2d60ae0bf885a39bb392729797b0fc6ec3a5fe5) Reviewed-on: https://gerrit.libreoffice.org/1841 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
2013-01-24fdo#59798: MSI installer spurious space in version numberMichael Stahl1-1/+1
(regression from e024a8d88dbca3a2d178ad88c069721a92156ddf) Change-Id: I0a94f7265d310f0f5c48c747ffca49a7aeb05a01 (cherry picked from commit 3c0f360995741c16e93f49b1a1e771d0f4e40dc7) Reviewed-on: https://gerrit.libreoffice.org/1840 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
2013-01-22bump product version to 4.0.1.0+, release number to 0Petr Mladek1-3/+3
Change-Id: I6d2553a4f695ebf49154a852fadeb552bb3d2b66
2013-01-21Fix Mac build fallout from PRODUCTEXTENSION changeTor Lillqvist1-4/+2
PRODUCTEXTENSION used to be empty. (No idea for how long it had been empty.) And apparently some of the "installer" Perl code implicitly assumed PRODUCTEXTENSION was empty. At least, producing the langpack dmg for Mac started to fail when PRODUCTEXTENSION was no longer empty. (cherry picked from commit c7e3f88b1291c35e09d08d14f82eadf60f7063cd) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2013-01-21installer: remove SHORT_PRODUCTEXTENSIONMichael Stahl2-4/+4
Currently PRODUCTEXTENSION does not have a value, which is unfortunate because some places such as the soffice --help output and utl::DocInfoHelper::GetGeneratorString() which creates the meta:generator for ODF files (via Setup.xcu Product/ooSetupExtension) write an incomplete version number. Since there doesn't appear to be a point in having 2 variables here, remove SHORT_ one and use PRODUCTEXTENSION consistently. (cherry picked from commit e024a8d88dbca3a2d178ad88c069721a92156ddf) Conflicts: instsetoo_native/util/openoffice.lst Change-Id: I5aac25bcedd785a098cba612643ea68fe19c77f0 Reviewed-on: https://gerrit.libreoffice.org/1762 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-01-17fdo#59321 un-escape quotes in Windows Installer's idt filesAndras Timar1-0/+1
Change-Id: Iecd39e00ed61449a720354f95cbb695447797bff Reviewed-on: https://gerrit.libreoffice.org/1728 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-01-14add config path for commit bf85d5eb33ff33c9ff94336de9d9f67825296c10Noel Power2-1/+4
Change-Id: Ib8dfd276246bc6bd157a63c26184991a9993c3c5
2013-01-10Add configure switch that allows hardlink deliverTomas Chvatal1-0/+4
This switch just makes possible to configure in ln delivery instead of cp based one. The feature was already in the place, we just make it visible as configure option now. Change-Id: I778ef3b03e6b9a57057e66ff6307e7da46bcd935
2013-01-09bump product version to 4.0.0.1+, release number to 101Petr Mladek1-2/+2
Change-Id: I4f8d9399bff79bbf978e8505b74f5d837c84833c
2013-01-08require .NET 4.0Andras Timar1-1/+1
Change-Id: Ia6e3acf563a9c04bf9a2ff5f3f755eb4e92e771c
2013-01-08clean up of the code that defines the download file namesPetr Mladek1-21/+32
Change-Id: I3241801d49673cac33eb923fb986c6ceb2c39503
2013-01-08more easier and better sortable download namesPetr Mladek2-70/+44
+ get rid of "install_multi" + move "SDK" and "Test" from the main name to the name suffix; use same position as "helppack" and "langpack" + move the content type identification "arc/deb/rpm" just after the <arch> string + use "archive" instead of the unclear "arc" content identification The new names look like: LibreOffice_<version>_<os>_<arch>_<content> LibreOffice_<version>_<os>_<arch>_<content>_helppack_<lang> LibreOffice_<version>_<os>_<arch>_<content>_langpack_<lang> LibreOffice_<version>_<os>_<arch>_<content>_sdk LibreOffice_<version>_<os>_<arch>_<content>_test , where the string "_<content>" is one of "_archive", "_deb", "_rpm". This string is missing for .msi, and .dmg installers because the content is described by the filename suffix. Change-Id: Ifecf947ba32e3381ef284d433096f7b37a02e9f5
2013-01-07fix install test to work with "LibreOffice" installer namePetr Mladek1-3/+3
Change-Id: I0f2850d2e52f47e7e66e51596692f3ed27d19adb
2013-01-07use "LibreOffice" instead of "LibO" for final download file namesPetr Mladek1-5/+5
"LibreOffice" is the name of the product and we should promote it. This change has been proposed on the ESC call. Change-Id: I755ea5b2ec7b6357a7fd2c86ec8479737696042b
2013-01-07deliver qtz translations for .ui filesDavid Tardon1-3/+5
regression from 76091d814ca084ba66fcb9db8bc4565c47ee16a5 Change-Id: I70c27cd3f72c453a1b4c2fb65b6172c8c251a741 (cherry picked from commit 85e36d2baa54eb7b65cc680389eacb2b5884c100) Signed-off-by: David Tardon <dtardon@redhat.com>
2013-01-02only package .ui translations that can be producedDavid Tardon1-5/+29
That means that there is corresponding .po file for given language. As a slight optimization, do not even try to run uiex if _no_ translation would be produced. Change-Id: I901e88b20edfb55e4f8bc661bacf8218b603bdcb (cherry picked from commit 76091d814ca084ba66fcb9db8bc4565c47ee16a5) Signed-off-by: David Tardon <dtardon@redhat.com>
2013-01-01Bump copyright year to 2013Andras Timar1-1/+1
Change-Id: Iab660dcfffc2a511092398926338ed06f6408925
2012-12-29rethink external executable setupDavid Tardon5-47/+128
Change-Id: I5293fea9b5404b82e72761407d325c408a2e45ca (cherry picked from commit bbf2f413958e7be2bef34c62932fc76f83e7ed18) Signed-off-by: David Tardon <dtardon@redhat.com>
2012-12-28fix delivery of qtz "translations"David Tardon1-0/+14
Change-Id: I2f0ae1eff5bd009a7cb467b38c1743eff51dc563 (cherry picked from commit f45a07d6f4eefc75d983d7aca2b57d075749b4e7) Signed-off-by: David Tardon <dtardon@redhat.com>
2012-12-28simplify UI packagingDavid Tardon1-7/+4
Change-Id: Id829cd4f12cb4d3fc8cb08dc5b297ee3cfc7591b (cherry picked from commit 4faaf5579937e2e2fc91aef28ba4974020d2fa9f) Signed-off-by: David Tardon <dtardon@redhat.com>
2012-12-28create all translations for a .ui file in one uiex callDavid Tardon2-96/+40
This should help a lot with Windows release build times (i.e., move it from "glacially slow" category to just "slow"). Change-Id: I6d397eb5d1ec1779616c3eef8e51f9cf29d5acec (cherry picked from commit b209dec8bbc9be5471438837a4da64adfa350298) Signed-off-by: David Tardon <dtardon@redhat.com>
2012-12-28let uiex produce more translations in one runDavid Tardon1-1/+1
uiex differs from the other *ex tools in that translation for every language must be in a standalone file, named after the language code. So uiex should take an output _directory_ instead of a file. Change-Id: If3ed966147c6d11d1fe85c484463f1bca4eec172 (cherry picked from commit c27b2e377f612de2476ff0aa0ddc909ff214fcb2) Signed-off-by: David Tardon <dtardon@redhat.com>
2012-12-21bump product version to 4.0.0.0.beta2+, release number to 12Petr Mladek1-2/+2
Change-Id: I4fe0ed82970d4f0877a41716f886cc3edeaf8692
2012-12-17Remove --with-stlport from LO 4.0Stephan Bergmann7-22/+0
The STLport was only built for the benefit of old extensions on platforms that once used it themselves (Linux x86, Solaris x86 and SPARC, Windows). We deliberately break such old extensions for LO 4.0 by no longer shipping that backwards-compatiblity cludge. Keeps STLport listed in readlicense_oo/ because of o3tl/inc/o3tl/compat_functionality.hxx. Also removes GXX_INCLUDE_PATH, as that was only used by STLport (if at all?). (cherry picked from commit 77d3777c8934171a9557a96872d020cf12443fb9, minus the code that addressed Windows C4005 warnings -- which after all were due to unrelated changes for PCH rather than this commit) Conflicts: postprocess/prj/build.lst Change-Id: Ie138a219fbbc86fb5aaa7ea0b88cf349935d9829
2012-12-15fdo#58145 dmake rule for ulf localization was not converted to use po filesAndras Timar1-1/+1
Change-Id: I7a47994fb74d2b7aa3e2069b91d02d7993ba993b
2012-12-14Make KeyID (qtz) work againAndras Timar2-14/+3
Change-Id: I67b2ce4ae647150aeace72c542a5838940d2c058
2012-12-06bump product version to 4.0.0.0.beta1+, release number to 11Petr Mladek1-2/+2
Change-Id: If808aa6a21d81cee563ac07b83f3446e5d488f88
2012-12-06rm intermediate files that are input of helpindexer and should not be packagedAndras Timar1-0/+1
Change-Id: I8b3e526fd413bd3ced75bf1cd81f9be2540bf9e8
2012-12-06re-base on ALv2 code. Includes:Michael Meeks5-26/+82
Patches contributed by Ocke Janssen converted reportdesign. http://svn.apache.org/viewvc?view=revision&revision=1396797 http://svn.apache.org/viewvc?view=revision&revision=1394326 Patch contributed by Oliver Rainer-Wittmann sw34bf06: #i117783# - Writer's implementation of XPagePrintable - apply print settings to new printing routines http://svn.apache.org/viewvc?view=revision&revision=1172115
2012-12-05Bye bye ODMATor Lillqvist1-5/+0
SUSE has no interest in it any longer, and I doubt anybody else has either.
2012-12-04revert the huge performance regression in gbuild intoduced with ↵Bjoern Michaelsen1-0/+9
0a45deba2be4a77db7540bd050b25bd6c26d7513 - we should default to make -r - everything else grows exponentially with the number of targets - gbuild should now have sane noop builds again even on make 3.82
2012-12-04adding calc add-in for option pricingtino1-0/+1
Change-Id: Ica4b621a7ae7e5ab447192ae3fe7b8911295bef2 Reviewed-on: https://gerrit.libreoffice.org/1232 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-12-03make sure fast string operator+ is used only by LO codeLuboš Luňák1-2/+3
Change-Id: Iaa8fc379e4d032931c0f60a3e3525783d8d28964
2012-12-03Use -W4 instead of -Wall, and don't disable warnings that are off by defaultTor Lillqvist2-92/+4
2012-12-03Add -wd4986 here, tooTor Lillqvist1-1/+1
2012-12-03More -wd fixupsTor Lillqvist1-5/+6
2012-12-02gbuild: call gb_ExternalExecutable_collect_registrations...Michael Stahl1-1/+3
...after reading platform makefile because at least python uses platform dependent gb_PYTHON_PRECOMMAND. Change-Id: I894dfd56b4a96828556f657ae63c6f69eebdea0b
2012-12-02ditch unused makefileDavid Tardon3-82/+0
Change-Id: If859e46758c622f4841b8b0389abe2485f4af85a
2012-12-02move setting up of ext. executables out of gbuild.mkDavid Tardon7-64/+156
Change-Id: Icacd44abfa5bf5f75f0ee719b39fba6821976a8a
2012-12-02Don't disable warnings that supprted MSVC versions don't generateTor Lillqvist1-25/+0