summaryrefslogtreecommitdiffstats
path: root/solenv/bin
Commit message (Collapse)AuthorAgeFilesLines
* Fix build on MacThorsten Behrens2013-02-271-1/+1
| | | | | Without this codesigning is unconditionally tried, unconditionally breaking the build.
* fix dependencies of the obsolete stdlibs package on linuxPetr Mladek2013-02-191-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>
* No need to copy the gcc libraries anymoreFridrich Štrba2013-02-191-78/+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>
* Add support for codesigning on Mac OS XTor Lillqvist2013-02-101-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>
* fdo#59798: fix SDK MSI version "LOdev 4.1 SDK.0.0.alpha0"Michael Stahl2013-01-241-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>
* fdo#59798: MSI installer spurious space in version numberMichael Stahl2013-01-241-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>
* Fix Mac build fallout from PRODUCTEXTENSION changeTor Lillqvist2013-01-211-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>
* installer: remove SHORT_PRODUCTEXTENSIONMichael Stahl2013-01-212-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>
* fdo#59321 un-escape quotes in Windows Installer's idt filesAndras Timar2013-01-171-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>
* require .NET 4.0Andras Timar2013-01-081-1/+1
| | | | Change-Id: Ia6e3acf563a9c04bf9a2ff5f3f755eb4e92e771c
* clean up of the code that defines the download file namesPetr Mladek2013-01-081-21/+32
| | | | Change-Id: I3241801d49673cac33eb923fb986c6ceb2c39503
* more easier and better sortable download namesPetr Mladek2013-01-081-67/+41
| | | | | | | | | | | | | | | | | | | | | | | + 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
* use "LibreOffice" instead of "LibO" for final download file namesPetr Mladek2013-01-071-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
* Make KeyID (qtz) work againAndras Timar2012-12-141-13/+2
| | | | Change-Id: I67b2ce4ae647150aeace72c542a5838940d2c058
* do not redirect output in build.pl, i.e. dump build_error.log and other logsLuboš Luňák2012-12-011-28/+3
| | | | | | | | | | | | | | | Given that nowadays almost everything builds inside tail_build, this feature is somewhat pointless, as this almost everything is in that one tail_build log. Moreover: - stdout is never a tty, breaking compiler output colorization - for some obscure reason I do not get, this makes 'make python3.all' work with msvc2010, whereas previously the invocation of MSBuild.exe somehow prevented the rest of make rules from running. Plain 'make python3' that does not go via build.pl works though. No idea if the problem is in gbuild, build.pl, cygwin, make, MSBuild.exe or somewhere else, Change-Id: Ibe6e11109e2eefaa65646071c2db01871e5e751f Reviewed-on: https://gerrit.libreoffice.org/1216 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
* Shorten moreTor Lillqvist2012-11-291-0/+1
| | | | | | | | Avoid mysterios error message "Already existing unique directory: LOdev_progr_pytho-core-330_lib_plat-linux" by shortening "_plat-linux" to "_plx". Change-Id: Ib1594d9164a328f1ca7332f60bb27720746ed916
* sigh... apparently 6215da2dfb96ed6b36ef42bc1afa1ab43c803f3d missed a )Michael Stahl2012-11-271-1/+1
| | | | Change-Id: I3cfe61034b02d050c3b825ed83e68740760af8ae
* honor USE_INTERNAL_RIGHTS from scp2Christian Lohmaier2012-11-271-2/+1
| | | | | | | | | | Archive::Zip doensn't restore file permissions when unpacking, so stat'ing the extracted copy is useless. Change-Id: Ifdc586fbe76bc55af35f10c6ad9468ae69947f13 Reviewed-on: https://gerrit.libreoffice.org/1167 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
* Switch from python to python3Michael Stahl2012-11-271-1/+2
| | | | | | | Mac specific parts of patch by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Change-Id: I90ef17c6f5a678230539a80ab999fa5344e4fc8f
* python3: build LibreOfficePython.framework on MacOS XChristian Lohmaier2012-11-261-0/+1
| | | | Change-Id: I0815aa0f5b50166f626f721be56969c0afd655a8
* Ignoring dependencies on .hdl files is unsound when cppumaker changesStephan Bergmann2012-11-231-4/+0
| | | | | | ...as it will do in one of the following commits. Change-Id: Ic13c0d398943d34dffbc1a87efcac213d6699ca9
* Use unabbreviated git SHA1 for buildidStephan Bergmann2012-11-221-1/+1
| | | | Change-Id: I508b97ff41726d2efd8d518e504aef3ba3e8f9b4
* Use xcrun when available to run install_name_toolTor Lillqvist2012-11-221-1/+1
| | | | | | | | This hopefully should help in situations like Jonathan Aquilina's, where /usr/bin/install_name_tool does not correspond to the tool-chain used (but is from an earlier version of Xcode). Change-Id: I5b4ca9e5e163fb4a84967577d2146cdbe8344f03
* unlink file before copying over it, to avoid it getting truncated firstLuboš Luňák2012-11-211-0/+1
| | | | Change-Id: I60cd57a5ae54bbe72c29568c1bbec65da3719491
* remove qtz temporarily, until it works again reliablyAndras Timar2012-11-211-1/+1
| | | | Change-Id: I66b117a56d8d545e6d09bfacb897ade383818895
* Fix install-gdb-printers for Mac OS XStephan Bergmann2012-11-211-2/+2
| | | | Change-Id: I685d277806e757fc6247f34d4db7386955dab7b7
* solenv: installer: error.py legitimately occurs in urllibMichael Stahl2012-11-171-0/+1
| | | | Change-Id: I5a45d0f504ea05d80220d961006b1b1189cebdca
* Fix linkoo to work with MinGW again.Jan Holesovsky2012-11-151-3/+11
| | | | Change-Id: I26bcc8f2026872729f5f4658c46c3226df3749f7
* Resolves: fdo#57107 processing translatable child nodes twiceCaolán McNamara2012-11-141-3/+17
| | | | | | I'm rubbish with xslt. Change-Id: Idc92a602aca7dc2a96cf185b1904e1373435a8a9
* do not remove logging directory under handsPetr Mladek2012-11-141-1/+3
| | | | | | | | | | | | the installer is called several times for langpacks and helppacks in parallel; it has removed the whole toplevel logging directory and the logging failed better solution would be to remove only the lang-specific subdirectories; well, the installer removed only emptry directories in the past, see 2584a460b5e560fce8719879414311b16b2c63d9 Change-Id: I9dc9591346c7447677f46bca15085a3877e067ce
* re-base on ALv2 code. Includes:Michael Meeks2012-11-1235-536/+436
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patches contributed by Pedro Giffuni: Avoid some uses of non portable #!/bin/bash in shell scripts. http://svn.apache.org/viewvc?view=revision&revision=1235297 Reduce the dependencies on non standard GNU copy. http://svn.apache.org/viewvc?view=revision&revision=1238684 Correct /usr/bin/env path. http://svn.apache.org/viewvc?view=revision&revision=1235619 Complex Toolbar Controls Extension from the SDK Patches contributed by Ariel Constenla-Haile http://svn.apache.org/viewvc?view=revision&revision=1190390 i118615 - make epm more verbose http://svn.apache.org/viewvc?view=revision&revision=1204288 Patches contributed by Mathias Bauer (and others) gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 Patches contributed by Juergen Schmidt: jsc341: i117327: take care if no dependency node in current description exists, create one http://svn.apache.org/viewvc?view=revision&revision=1172101 jsc341: i117327: add extra extension dependency check http://svn.apache.org/viewvc?view=revision&revision=1172098 make initial branding changes http://svn.apache.org/viewvc?view=revision&revision=1231878 Patches contributed by Ingo Schmidt native373: #i117733# no linux jre installation on 64 bit systems http://svn.apache.org/viewvc?view=revision&revision=1167536 native373: ##164464# improve debian support http://svn.apache.org/viewvc?view=revision&revision=1167537 Patch contribtued by Armin Le-Grand: Changed various aspects concerning usages of old vendor names http://svn.apache.org/viewvc?view=revision&revision=1293313 fix for neon webdav, remove coinmp bits, improve odk script, cleanup & remove OS/2 conditionals, system ucpp fixes, remove OS/2 conditionals, restore our license filenames.
* binfilter.die.die.dieNorbert Thiebaud2012-11-091-1/+1
| | | | | | | Change-Id: Ia3c103e4343d309b997ed37e33a382ffdfbddac3 Reviewed-on: https://gerrit.libreoffice.org/1014 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
* concat-deps: tweak boost handling to depend on unpacked targetMichael Stahl2012-11-071-5/+5
| | | | Change-Id: Iae93f7a81959a5d9c23e9bddb65e6154655374e6
* concat-deps: on Windows, compare paths case-insensitivelyMichael Stahl2012-11-071-5/+7
| | | | Change-Id: I5e5d9b39cb0440644bf3ffb8dca4913dc123f672
* concat-deps: bin pointless duplicationMichael Stahl2012-11-071-8/+1
| | | | Change-Id: I8aedf930bc007bf83f8111db9a5565668142321e
* concat-deps: properly recognize colon that follows targetMichael Stahl2012-11-071-4/+20
| | | | | | | Should fix cases where for weirdly formatted input files the target was mangled erroneously. Change-Id: I28d94a6c714b5f893ac873f84fe2022e96cf1327
* Eat unneeded spaces at the beginning of .d files, they confuse concat-deps.Jan Holesovsky2012-11-071-0/+6
| | | | Change-Id: I541fb875d4d0bc46eb1bbb21793343c0283fd412
* linkoo can now link the en-US .ui filesCédric Bosdonnat2012-11-061-8/+84
| | | | Change-Id: I22b74096d01d56282771f01eb5e966980607632c
* detect even more memory mismanagement on glibcLionel Elie Mamane2012-11-051-0/+1
| | | | | | | | Change-Id: I3a06e5970638c755e89f8ffdf96b68d3c6cdbe61 Reviewed-on: https://gerrit.libreoffice.org/969 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
* Revert "detect even more memory mismanagement on glibc"Lionel Elie Mamane2012-11-021-13/+0
| | | | | | | Intended to push a whole series of things, but *not* this one. Was still under discussion at gerrit. This reverts commit fcee486849c2e5a07c0eef630beb427742f54d8e.
* detect even more memory mismanagement on glibcLionel Elie Mamane2012-11-021-0/+13
| | | | Change-Id: Idba21b12582e9ae7d240d9d3527f9ac5893252f7
* fix parallelism variables and let's have only --with-parallelism from now onMatúš Kukan2012-10-302-4/+3
| | | | | | | | | | | | | | | | | | Rationale: - it is advised to use max-jobs and num-cpus with the same value in wiki - max-jobs was used only for lcms2 and few gbuild modules outside of tail_build anyway. Also fixes: - really use CHECK_PARALLELISM when meant to - EXTMAXPROCESS is not defined in gbuild; use parent's jobservers in sub-make where possible Change-Id: I501de732d223ce0c935081bd1d73da611d16ee88 Reviewed-on: https://gerrit.libreoffice.org/930 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
* fix absolute path test in linkooLuboš Luňák2012-10-291-2/+2
| | | | Change-Id: I0ac41af09ac6582c3f75239f2163c895665cd572
* fix windows detection in linkooLuboš Luňák2012-10-291-4/+4
| | | | Change-Id: I18d1dbdc9d7ed6027969424a196532084537fe87
* gbuild: solve the UnpackedTarball header problem in concat-deps:Michael Stahl2012-10-291-15/+60
| | | | | | | | | | Mangle all included files in the UnpackedTarball directory in the generated dependency files to point to the target of the UnpackedTarball instead. This will cause all files that include them to be rebuilt on every unpack, which is sound and much easier to maintain than manually enumerating all internal header files somewhere. Change-Id: Iaaa9b27450549d26b40d32ae0f740c2d5ef0edc5
* ./g doesn't support -s option or log command any more, use git directlyLior Kaplan2012-10-291-1/+1
| | | | | | | Change-Id: Icb8fa341fe76abb03ba59cbc57e8b54dbb9acbec Reviewed-on: https://gerrit.libreoffice.org/935 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
* fix incorrect assert() usageLuboš Luňák2012-10-261-2/+4
| | | | | | In final (NDEBUG) builds assert expands to (more or less) nothing. Change-Id: Ie6d43cac381975880c9db2b4a01bd9ed30e2714b
* warn free build of dmake, concat-deps and lpsolveRené Kjellerup2012-10-261-2/+2
| | | | | | | | | | | | add error handling for fread, fwrite, and fscanf calls use "fputs" instead of "fprintf" to avoid warning that it couldn't varify the format string because it wasn't a string literal. Change-Id: I1137160d28461fbac69c8e05d32ba010da491c57 Reviewed-on: https://gerrit.libreoffice.org/903 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
* concat-deps: fix breakage introduced by eliding:Michael Stahl2012-10-241-3/+18
| | | | | | | | | | The call to elide_dependency in _process was broken because it checked the full line, which ends with " : " usually, breaking the build with LO customised GNU make on cygwin. (regression from 140281898f21f707582f395918e5234bdb67e435) Also handle empty lines following '\' better while at it. Change-Id: Iadc6349e5b6930945e46e244bcbee37a632e0d71
* Remove spurious find_substrStephan Bergmann2012-10-221-8/+0
| | | | Change-Id: I4b001e6fd963df2fad97aaf5885b0b38189e59d6