summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)AuthorFilesLines
2013-07-04enable MSP creation and bump version number for 1st PTFAndras Timar2-3/+3
Change-Id: I3f86bdf65f9cc38d4ae8b51afe5264e118132b39
2013-06-03bump product version to 4.0-4, release number to 304Petr Mladek1-2/+2
Change-Id: Ica4dbb0099c03cbdf311f6e7ed173bd791e77c87
2013-05-24bump product version to 4.0-3, release number to 303Petr Mladek1-2/+2
Change-Id: I8f34926f8517932fc7fec983ef3053bffd82b603
2013-05-06[mono] build hack with copying assembly config files is needed only with monoPetr Mladek1-2/+2
Change-Id: Ie76a802bc890b00f0fa9358aeff65f86e35fd7a0
2013-05-02fdo#54087 link the correct resource file to npsoplugin.dllAndras Timar3-0/+13
I had to add a new function to gbuild system: set_nativeres, because the trick in extensions/Library_npsoplugin.mk did not work. It linked the default.res, and that made the plugin unusable under Windows. Also, one export was missing compared to LibreOffice 3.5. Change-Id: Ib91fa2a3b72b15912587f22becccb0aebc2aa390
2013-05-01Merge tag 'libreoffice-4.0.3.2' into suse-4.0Petr Mladek2-2/+2
Tag libreoffice-4.0.3.2 Conflicts: basic/qa/cppunit/test_vba.cxx basic/source/runtime/step2.cxx dictionaries helpcontent2 instsetoo_native/util/openoffice.lst libvisio/UnpackedTarball_visio.mk sc/source/ui/vba/vbaapplication.cxx sc/source/ui/vba/vbavalidation.cxx solenv/inc/minor.mk sw/qa/extras/ooxmlimport/ooxmlimport.cxx translations Change-Id: Ic1f06489175f3db92d6bbcebb9732fadc1c61fed
2013-04-30bump product version to 4.0.3.2, release number to 2Petr Mladek1-2/+2
Change-Id: Ifa6c055daa75355fad59126b7217c6af6998481f
2013-04-30[mono] mono-climaker.diff: add mono supportPetr Mladek1-0/+7
merged with buildfix-climaker-disabled.diff: add mono support merged with climaker-csharp-win.diff: add mono support merged with buildfix-use-climaker-in-unoil.diff: add mono support Conflicts: cli_ure/prj/d.lst cli_ure/source/bootstrap/makefile.mk cli_ure/source/climaker/makefile.mk cli_ure/unotypes/makefile.mk unoil/climaker/makefile.mk Change-Id: I4c0ec75954df7a34ed6f4173f84190ab10e62c4b
2013-04-30[mono] workaround for mono limitation where "al -link" does not accept pathPetr Mladek1-1/+7
Needed with mono-devel-2.6.7-0.9.1 on SLED11. Change-Id: I6869a92949f4c3eb6b9a74aa86cd580a062368d3
2013-04-30[mono] fix debug csflagsPetr Mladek1-5/+1
The mono compiler does not support the -o option; The whole condition was wery strange anyway. Change-Id: If247fc991f68c99c9f26e3a73c01e9f85002f204
2013-04-30[mono] define CliAssemblyTarget when building on UNIXPetr Mladek1-2/+2
Change-Id: I818b1913d98e8ed01b047d94065e5dec2b237fb3
2013-04-30[mono] backslash the path only when really using cygwinPetr Mladek1-1/+1
Change-Id: Ia51c83e3a39888f42461c55b927afcd4da0d1bf1
2013-04-30[mono] do not hardcode csc commandPetr Mladek1-1/+1
Change-Id: I7228e7227369c118405f693df1f6818478ff22d6
2013-04-30[mono] allow to use another C# compiler, e.g. gmcs instead of mcsPetr Mladek1-0/+6
Change-Id: If8a6efbfdd3a838496dc0680b68097498134ecf6
2013-04-30[mono] add CliExecutable gbuild targetPetr Mladek3-2/+195
Change-Id: Ie761cd2eefaac430c1532917403879285e19166f
2013-04-30Upgrade table cleanupAndras Timar1-7/+2
The goal was to migrate feature state from LibreOffice 3.6 (SUSE) to LibreOffice 4.0 (SUSE) during upgrade. Change-Id: I0d7b7511316a9799acb078ee2923a5cac2e40aa9
2013-04-17set version for SUSE 4.0-rc1Petr Mladek1-3/+3
+ version 4.0 + version suffix to -1 + micro version to 10 + buildid to 201 Change-Id: I4f741a38666a277ea332e7d65e9e0e72afbbe551
2013-04-16bump product version to 4.0.3.1+, release number to 1Petr Mladek1-2/+2
Change-Id: I72da57cfba66c0fabbe991c0a74466abfd669b37
2013-04-04[SUSE only] add EULAAndras Timar1-2/+9
Change-Id: I28b5e36d8e88dba2fa3a6f7cd66e25b3316ef42a
2013-04-03For Intel AppUp build hide the links in start centerAndras Timar1-0/+11
Change-Id: I74e6757741ba9d8c8c494018e4bf3e4f638aa3f6
2013-04-03fdo#54278 Only en-US help pack should contain en-US helpAndras Timar3-115/+20
Language of the installer and language of the installed help files are two separate things. It was not good that they were handled in the same array. Now all help packs has English + localized installer. Only en.US help pack isntalls en-US help. Also, maintaning the list of languages, that are not supported by Windows, is pointless. What Windows? Windows 8 supports a lot more than Windows XP. Change-Id: I075a18648796a42609329ead9e8e6a9da9c1fef3
2013-04-02drop the word 'PTF' from .msp nameAndras Timar1-1/+1
Change-Id: Ia7cc4351644013e2b94c8e8408b89ed66b0e18ff
2013-04-02advertised shotrcutsAndras Timar8-173/+1
The main goal of this patch was to simplify things. The LibreOffice version that goes to Intel AppUp use advertsied shourtcuts, because it is what Intel AppUp Center requires. We can reduce complexity a bit, if we use advertised shortcuts in normal builds, too. Conflicts: scp2/source/ooo/common_brand.scp setup_native/Package_misc.mk solenv/bin/modules/installer/globals.pm Change-Id: Ia35a753c83cb592137232428ab897a640e7ccc1f
2013-03-26bump product version to 4.0.2.2, release number to 2Petr Mladek1-2/+2
Change-Id: I1627dfa924759d0fe56754829243850193a5938a
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.2.1+, number to 1Petr Mladek1-2/+2
Change-Id: If78b76abc4c2dcf3445e74754760d4f74d34e943
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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-03 16:08:32 +0000