Commit graph

1224 commits

Author SHA1 Message Date
Andras Timar
5b77c93b28 remove unused product variables from Windows installer
OLDPRODUCT2 - it was a workaround for OOo 1.9, obsolete
SAMEPRODUCTS - same product have the same ProductCode, so installer detect it
anyway under normal circumstances. It is possible that a tester/developer tries
to install the same version with different ProductCode over an existing installation
(e.g. dailyes or RCs). Then we are in trouble. However, SAMEPRODUCTS was not in use.
Moreover, Windows Installer uses only the first three fields of the product version.
So we cannot make difference between e.g. 4.0.3.1 and 4.0.3.2, and this is the new versioning
scheme.
BETAPRODUCTS - LibreOffice have never used different upgrade code (BETAUPGRADECODE) for betas.
OLDPRODUCTSPATCH, SAMEPRODUCTSPATCH, NEWPRODUCTSPATCH - related to old Star Division patching
mechanism, they were commented out anyway.
STUBPRODUCTS, STUBUPGRADECODE - these look useless

Change-Id: I77d67b72e18fa6b3ba4182b99e198c42f247cea4
2013-04-30 01:23:35 -07:00
Michael Stahl
3b65852f37 gbuild: add support for building against MSVC debug runtime
Mainly this means using /MDd instead of /MD and /MTd instead of /MT in
the CFLAGS, and also re-mapping of .lib files to ones with "d".

Change-Id: Ifc56b53a66d5eb522c1695a34d68b08cad1d8338
2013-04-15 15:26:32 +02:00
Caolán McNamara
b524fb866e build fails with any uppercase char in the source dir
Change-Id: I707a92791adbb60e5491291e89e38f1d57fa97cd
2013-04-03 09:07:33 +01:00
Zolnai Tamás
56a52889e6 Remove unneeded project and projectroot parameters
Plus avoid use of Export::sLanguages member outside
of the class.

Change-Id: I33702816fdb4980d690cfe8fcd8cc3fbd0df1dd8
2013-03-25 12:01:59 +01:00
Stephan Bergmann
4e69b35674 Missing dependency of librelogo on writer
...at least due to dependency of librelogo.xcd on writer.xcd, see
82c53d537a "Missing dependency."

Otherwise, having librelogo installed but not writer will cause an uncaught
RuntimeException from configmgr::Components::parseXcdFiles
(configmgr/source/components.cxx) early on in soffice.bin.

Change-Id: I97565fe5c790ed182bb27fd722c650acf8a8ee08
2013-03-21 15:59:10 +01:00
Rene Engelhard
4c6721542a one time is enough ;)
Change-Id: I298433a242eded15b01a379e7b552d62c44d43f3
2013-03-18 18:28:31 +01:00
Rene Engelhard
b0213e0bb4 readd packinfo_office.txt stuff for Pdfimport/Reporbuilder
... as otherwise it ends up in gid_Module_Root_Brand, NOT
in it's own module (which is intended)

Change-Id: Ic3951ccd7471793419b04f4f2fcfe90060c6d71f
2013-03-18 18:17:31 +01:00
David Ostrovsky
90a326c702 fdo#61950 move report builder from bundled extensions to plain code
For test sample report from fdo#61726 can be used.

Change-Id: Iacf8ddc4cf8ad0a408d72e18ecb7237476afeffe
Reviewed-on: https://gerrit.libreoffice.org/2718
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
2013-03-18 15:30:44 +00:00
Michael Meeks
79b0046ba0 remove legacy build.pl prj/build.lst files. 2013-03-14 17:05:51 +00:00
Andras Timar
73510ca8b3 sync packinfo with scp2
Change-Id: Ie20dab628e089a97c16b91b080eda5e09bbbb46a
2013-03-12 10:21:02 +01:00
Rene Engelhard
3545b0398e actually make new gid_Module_Script_Provider_For_Python being installed
Change-Id: I3440a45465fa79d3ace0f04fd6036734c9caf00d
2013-03-12 00:05:08 +01:00
Andras Timar
09fa9ff842 fdo#62103 only dict of the first lang code is packed into langpack
Therefore we packed Aragonese dictionary into Spanish and Catalan
langpacks, instead of Spanish and Catalan dictionaries.

Change-Id: I6b7606b8d8f4f30cded583b96d9f9b5f2ef64e9f
2013-03-11 08:51:51 +01:00
Andras Timar
a5783fe922 remove stale javafilters
Change-Id: Id0c413d64e6f6fa7ded3c5ff10e764bc2e40f006
2013-03-03 19:19:26 +01:00
Thomas Arnhold
f5ca04caca Related to fdo#60724: correct spelling
Using the autocorrect list of LibreOffice
extras/source/autotext/lang/en-US/acor/DocumentList.xml

Change-Id: I8b93969bc0742c2e95b8b7db3c4c37691e8d3657
Script: http://pastebin.ca/2327716
2013-03-03 17:14:16 +01:00
Andras Timar
c3429a0da6 remove RebuildShellIconCache CustomAction (it was Win 9x/NT/2K only)
Change-Id: Id856c2279520d9183c8b10967f5b56903d21963f
2013-03-02 20:09:25 +01:00
Jan Holesovsky
52efa22867 MinGW: Actually, this is usable only with MSVC.
Change-Id: Ida4715033f45f4857c8355b40878f9b05362a222
2013-03-01 10:53:40 +01:00
Jan Holesovsky
7820a13f61 MinGW: Build makecab.exe and friends only when WINEGCC is set.
Change-Id: I37ed3c2ef456c4a258101a9f1ea9568798a6ce80
2013-02-28 18:50:11 +01:00
Michael Stahl
b768611724 remove all d.lst
Change-Id: Icba4218c5f9fe89d183d25ea82a8eae52881f885
2013-02-28 18:40:06 +01:00
David Tardon
db36904f41 fix typo
Change-Id: I6c824dccee8c0af0edb2f6fce7d47079894f7af4
2013-02-28 05:25:13 +01:00
Matúš Kukan
da698e0b2a setup_native: add missing dependency on package
Also correct some package names. They were quite random, I wonder if
it was working and they are needed for something.

Change-Id: I5080f1f7eda967b602b6fac667018e11aec5a521
2013-02-27 18:55:15 +01:00
Andras Timar
c18e468125 setup_native: fix localization
Change-Id: I3a179076f7102958fd2d8f24af1288aa610835da
2013-02-26 10:10:01 +01:00
Tor Lillqvist
616c6924f1 s/the the/the/
Change-Id: Iadacffaad832c6ff06757e8567e24f929f24a4c3
2013-02-22 09:58:19 +02:00
Petr Mladek
2b3d675f0b fix dependencies of the obsolete stdlibs package on linux
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-20 16:04:00 +01:00
Fridrich Štrba
3708fe8434 Kill the --without-system-stdlibs option
Change-Id: I54bff2c8593995829857d30b38b8626a8c1a1a4f
2013-02-19 10:05:23 +01:00
Stefan Knorr
4e6fd3b2b7 Update Branding for 4.0 (.1)
(c) Maxim Darak, Mirek Mazel 2013

Change-Id: I30fdb3234152e746e8a2a565310ab1b22115315c
Reviewed-on: https://gerrit.libreoffice.org/2236
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-18 17:08:34 +00:00
Andras Timar
c13c500630 CustomActions should be statically linked with MSVCRT
Change-Id: I100b7ff7e3aa505098ce8b3333d1aa8faca50370
2013-02-17 12:25:44 +01:00
Andras Timar
5a9b1bcc39 CustomActions are not for MinGW, yet
Change-Id: Id17a596131b42a31fe007e2c4840798a387f3d04
2013-02-16 23:17:36 +01:00
David Ostrovsky
526e152bbe setup_native: no export on MinGW
Change-Id: Iebce2ee63fd16dea4139b152b97fce69b8491e18
2013-02-16 22:51:29 +01:00
Peter Foley
eecb368a6e fix circular dependency in setup_native
Change-Id: Ic096616e04e67a31bacc840ff25349491a5e56e7
2013-02-16 16:44:52 -05:00
Thorsten Behrens
ece304a932 Fix build for --enable-epm / --with-package-format=deb rpm case.
This was somewhat broken after the setup_native gbuild conversion.

Change-Id: I825dd5008348534718a5b43e6a3eb893fa75135b
2013-02-16 02:20:29 +01:00
Peter Foley
91a6fc6ee1 fix rpm build in setup_native
Change-Id: Id7cba31ac24f6a45077f5a41039b7b79ad668b95
2013-02-14 19:07:14 -05:00
Stephan Bergmann
acdaed35a7 Missing dependency
Change-Id: I73c77ea8f38794bf3d05ee247bdab5e4ddc57646
2013-02-14 16:39:29 +01:00
Peter Foley
e8f09adf5b fix setup_native localization for mac
Change-Id: Ifcd3a96e1e0d53bb7dabb3e8cda1846ca2d262be
2013-02-13 17:13:31 -05:00
Andras Timar
dbb60dd9ae fix exported DLL function names for all CustomActions
Change-Id: I1c15003acfb4d1c49c990a247629c70c4dcc3bd3
2013-02-13 12:12:21 +01:00
Andras Timar
eb6fa6be75 remove thesaurus indexer CustomAction
It was never integrated and used. If we made the effort to integrate it,
Windows installer would be a few megabytes smaller, because indexes of
thesauri would be generated in install time (instead of packaging
pre-generated indexes).

However, the cons are:
* untested
* presumably slows down instal process which is slow already
* adds complexity to installer which is too complex already
* indexes will not be there in case of administrative install (QA)
* bad experiences with CustomActions that manipulate the installed
  application (various, weird permission problems)

Change-Id: I3989b835b1250718bc03107a3807d091e7a9aa0e
2013-02-13 12:12:20 +01:00
Jan Holesovsky
283ad1f83f Fix typo to make --enable-online-update build again. 2013-02-12 17:33:13 +01:00
Julien Nabet
6842be374c It's better to use fclose on a not null handle
Change-Id: I609270e269a0905818d6a2b4f44cb9a034099346
2013-02-12 16:31:28 +01:00
Stephan Bergmann
f5c015bb55 More setup_native fixes for --enable-epm Linux/RPM post gbuild'ification
Change-Id: I27e0e68ebc27dd89c254793e670d0bf5f48fe57e
2013-02-12 11:21:44 +01:00
David Ostrovsky
8eaac1d731 don't duplicate code for msvc and gcc
Change-Id: I65f33f31fb31ad5b2373bbc08865ca5b358d7ce0
2013-02-12 08:34:39 +01:00
Peter Foley
684951f146 msvc needs instooofiltmsi too
Change-Id: I343bedcfb588bfd3fbfea572e7ce24c77c0b8178
2013-02-11 17:00:20 -05:00
Peter Foley
33b838a449 stdcall and declspec(dllexport) don't play nicely together
Change-Id: I56da76771790cb6824ac3d01072d9143cb580741
2013-02-11 16:57:06 -05:00
David Ostrovsky
ebb263856c Make instsetoo_native build again on mingw
Change-Id: I62d8ae0da7e98d4c2196b4d41e06ffe0b3a046f8
2013-02-11 21:22:22 +01:00
Stephan Bergmann
67fbad1d1d Make setup_native build again for --enable-epm Linux/RPM
Change-Id: Idf526227c90fd2614650770b172bb69b432a76c6
2013-02-11 17:49:26 +01:00
Andras Timar
aa2450cb51 advertised shotrcuts
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.

Change-Id: Ia35a753c83cb592137232428ab897a640e7ccc1f
2013-02-11 14:32:19 +01:00
David Ostrovsky
5f2cfb8dc5 Revert "replace '$<' with '$%' as it was meant here"
This reverts commit ef300e2dc3.
2013-02-10 13:45:06 +01:00
David Ostrovsky
a92ae7280e Revert "fix fake-db-1.0-0.noarch.rpm: swap target with prerequisite"
This reverts commit ef45fe7ff0.
2013-02-10 13:44:56 +01:00
David Ostrovsky
03b9ff533b Module_setup_native: include Package_ulf.mk
Change-Id: I023363a81af4909f3914354b082dfc2f0315e097
2013-02-10 11:51:02 +01:00
David Ostrovsky
ba811adbe9 Package_ulf.mk: remove superfluous mac dir
Change-Id: Ib91eec962105fffeae9d563c18ff9192a90137c0
2013-02-10 11:24:51 +01:00
David Ostrovsky
514d4bf561 wintools: fix uncomplete source file path
Change-Id: I1869dc0ac2356a0d9c18dd7958a291dcbdaf14f3
2013-02-10 10:33:17 +01:00
David Ostrovsky
ef300e2dc3 replace '$<' with '$%' as it was meant here
Change-Id: I760eff2a3a1cb28a1a4e47368b7919a0feacad18
2013-02-10 10:14:40 +01:00