Commit Graph

937 Commits

Author SHA1 Message Date
d07cbe86f3 fdo#65541: Proper EPM %requires dependencies, at least for Linux
At least for Linux RPM, the packages built via EPM in module instset_native
(with --enable-epm) record intra-installation-set dependencies only by name but
without any version numbers, so that one can e.g. freely ask rpm to install a
(broken) combination of packages from LibreOffice_4.0.2_Linux_x86-64_rpm.tar.gz
and LibreOffice_4.0.3_Linux_x86-64_rpm.tar.gz.

The documentation for EPM (e.g., workdir/*/UnpackedTarball/epm/doc/epm-
manual.pdf) states that %requires lines can optionally indicate lower and upper
version numbers, so the easiest fix appears to be to augment all relevant
"requires =" lines in setup_native/source/packinfo/packinfo_*.txt with lower ==
upper == %PACKAGEVERSION.  (There appears to be some confusion in those files
between %PACKAGEVERSION and %ABOUTBOXPRODUCTVERSION, but those seem to always
get identical values in instsetoo_native/util/openoffice.lst.in.)

Change-Id: Iea68beb19f1699cc1eea3dc36fd2f11b8845e390
TODO: The freebsdrequires and solarisrequires lines are not updated.
Reviewed-on: https://gerrit.libreoffice.org/4344
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-06-24 12:54:47 +00:00
e452abddfe add dictionaries to ca-XV language pack
Change-Id: I1afb4388bbb811a7d296b86a4a8b77758964daaf
2013-05-14 06:46:18 +02:00
2c99bbe1b7 add Icelandic Hunspell dictionary and thesaurus
Change-Id: Ibf2cb81f57d123825990c7bde90586b894b9cdcc
Change-Id: I7ea382194476eeef7f83caa66c9115ed1da433b2
Reviewed-on: https://gerrit.libreoffice.org/3860
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-05-13 07:52:55 +00:00
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
4e69b35674 Missing dependency of librelogo on writer
...at least due to dependency of librelogo.xcd on writer.xcd, see
82c53d537a05dadf4d7fd7ea41292897bf2d47c7 "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
4c6721542a one time is enough ;)
Change-Id: I298433a242eded15b01a379e7b552d62c44d43f3
2013-03-18 18:28:31 +01:00
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
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
73510ca8b3 sync packinfo with scp2
Change-Id: Ie20dab628e089a97c16b91b080eda5e09bbbb46a
2013-03-12 10:21:02 +01:00
3545b0398e actually make new gid_Module_Script_Provider_For_Python being installed
Change-Id: I3440a45465fa79d3ace0f04fd6036734c9caf00d
2013-03-12 00:05:08 +01:00
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
a5783fe922 remove stale javafilters
Change-Id: Id0c413d64e6f6fa7ded3c5ff10e764bc2e40f006
2013-03-03 19:19:26 +01:00
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
c3429a0da6 remove RebuildShellIconCache CustomAction (it was Win 9x/NT/2K only)
Change-Id: Id856c2279520d9183c8b10967f5b56903d21963f
2013-03-02 20:09:25 +01:00
616c6924f1 s/the the/the/
Change-Id: Iadacffaad832c6ff06757e8567e24f929f24a4c3
2013-02-22 09:58:19 +02:00
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
3708fe8434 Kill the --without-system-stdlibs option
Change-Id: I54bff2c8593995829857d30b38b8626a8c1a1a4f
2013-02-19 10:05:23 +01:00
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
c13c500630 CustomActions should be statically linked with MSVCRT
Change-Id: I100b7ff7e3aa505098ce8b3333d1aa8faca50370
2013-02-17 12:25:44 +01:00
dbb60dd9ae fix exported DLL function names for all CustomActions
Change-Id: I1c15003acfb4d1c49c990a247629c70c4dcc3bd3
2013-02-13 12:12:21 +01:00
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
6842be374c It's better to use fclose on a not null handle
Change-Id: I609270e269a0905818d6a2b4f44cb9a034099346
2013-02-12 16:31:28 +01:00
33b838a449 stdcall and declspec(dllexport) don't play nicely together
Change-Id: I56da76771790cb6824ac3d01072d9143cb580741
2013-02-11 16:57:06 -05:00
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
e7014ca47b Fix Resource leak: ddf
Change-Id: I4361b4f4670a0437c8220d2e7f92f2ffbe0cc479
Reviewed-on: https://gerrit.libreoffice.org/2057
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-02-09 22:43:46 +00:00
4261757fc6 convert setup_native to gbuild and add to tail_build
Change-Id: Ie12338dada22c59d55d89ed9611bb1a958b04223
Reviewed-on: https://gerrit.libreoffice.org/2063
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
2013-02-09 20:41:19 +00:00
ebdd616580 Add option to set bundle identifier and use it when signing
Sign also all the dylibs and frameworks in the bundle.

Change-Id: I7f67b9d7eda0204b24e2ea2ef44a53fb8db0f8aa
2013-02-01 14:51:20 +02:00
0701e1ab56 remove CopyEditionData CustomAction
It is not entirely clear what this CustomAction was supposed to do, but
program\edition directory is not present in LibreOffice, therefore this
feature is useless.

Change-Id: Icfcd9c5f88da28e171329d951956baaa42908fd0
2013-01-30 15:25:07 +01:00
cf4ca99234 remove DotNetCheck CustomAction
We do not need to call a dll function for a simple version check.

Change-Id: If82b06a61f10dbfe3eb92b6fe495e6d800c57aff
2013-01-30 15:25:05 +01:00
d14c765b6e remove CopyExtensionData CustomAction
It copied *.oxt from [SourceDir]\extension to TARGETDIR\share\extension\install.
One might think that *.oxt files there get installed automagically at first start,
but no, it does not happen. This feature looks useless.

Change-Id: I5ce583f3b46f5e4e962449790bdce70f99aa135b
2013-01-30 15:25:04 +01:00
030124d836 remove CustomAction ExecutePostUninstallScript
I think this CustomAction is unnecessary, providing that we do
not use Star Division home-made PATCH technology. I have never
seen this CustomAction used in any OpenOffice.org/LibreOffice builds.

Change-Id: I62f3b5a3ef8a9686f018ca1af52689954262e830
2013-01-30 15:25:02 +01:00
bc20ba9cd6 convert SetAdminInstallProperty CustomAction to type 51
It does not make sense to call a dll function to set a single property to 1.

Change-Id: I4e3cb35d2d3b644805d1d7573c9bf1dc45befbd4
2013-01-30 15:25:00 +01:00
e0ea85f61a we don't build language packs on Windows
Change-Id: I672886764e9451a983b823ec3666f126b758bd1e
2013-01-30 15:24:57 +01:00
55fc2b96bb Revert "fix for fdo#39632 : Consolidate GetMsiProperty()"
This reverts commit 95ee7d9cd3a0b0f397def8e607759c81feb8c592.
2013-01-27 20:34:31 +01:00
2d70b928a9 Revert "chmod 644"
This reverts commit bf8e8e8bd03647632ed0b55c2b983a4d16cee40e.
2013-01-27 20:34:29 +01:00
7bc44705c0 still not enough boost_header
Change-Id: Ic0ee933fbee7368f0af2573ea33a5ce33f4043c4
2013-01-27 01:50:56 +01:00
bf8e8e8bd0 chmod 644
Change-Id: Idc06412b8be705ba0cd5695257fd961864e2ad6a
2013-01-23 12:30:42 +01:00
95ee7d9cd3 fix for fdo#39632 : Consolidate GetMsiProperty()
And did it also for GetMsiProp() and *MsiProperty()
Reworked some conditions related to that.

Change-Id: I1cd082361126db3d9aced3a878b19e7052514864
Reviewed-on: https://gerrit.libreoffice.org/1816
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
2013-01-23 11:26:08 +00:00
2ce7bc907f Update default dictionaries set for Lithuanian (related to fdo#59380)
Change-Id: I42a2032e03035b0e45a800c068879e9820471dfc
Reviewed-on: https://gerrit.libreoffice.org/1776
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
2013-01-22 19:01:07 +00:00
efddbb9409 fdo#59713 add Bosnian Hunspell dictionary
Change-Id: I84a561fe081040a56acd394b789e2ce1cb488457
2013-01-22 17:52:59 +01:00
b920a2a868 fdo#59370 Default dictionaries set for Russian UI
Change-Id: I38c5ae35291fb79f2a95f911ce2ff86234d5ee8a
2013-01-15 08:33:08 +01:00
44a715eebc fdo#59381 Default dictionaries set for Catalan UI
Change-Id: Ie207ed693847fc9791851e22eddb7b7e8ba76b41
2013-01-15 08:32:52 +01:00
0736a62dac fdo#59380 Default dictionaries set for Spanish UI
Change-Id: Idaa9afd9751c1272ea3dc1d621b8d40a8a7dbbd7
2013-01-15 08:32:37 +01:00
26c142ca5f Kill the ancient StarOffice "patch" concept
For Windows, superseded by Windows Installer patching (i.e., creating
.msp files), which is something completely different. (And quite hard
to get working... but still a saner approach, I think.)

For Linux, many distros use delta RPMs or similar, so no home-grown
LO-specific patching mechanism is needed.

Remove the -patch and -patchinc command-line options to
make_installer.pl and all code that was invoked only when using those.

Remove the PATCH and PATCH_ONLY flags in scp2.

Remove the patchmsi.dll Windows Installer custom action.

Change-Id: I09e949e601a969f88eff60067faa2352f4f89537
Reviewed-on: https://gerrit.libreoffice.org/1605
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-01-10 09:32:36 +00:00
d8385c2cfc Always default-select English dictionary
It was discovered that on a Russian Windows, by default only Russian and
German dictionaries would be installed, but no English dictionary.  This is
because since e2fac98819c00b4fb50f9de9d0f32d20092f3191 "fdo#53009: For msi
installer, only default-select a subset of dictionaries" only those dictionaries
mentioned in setup_native/source/packinfo/spellchecker_selection.txt were
default-selected, but it apparently was a misunderstanding that
spellcheker_selection.txt for many locales does not list "en" even though an
English dictionary should always be default-installed.

Quoting Andras Timar <atimar@suse.com>:  "AFAIK en-US localization with English
dictionaries is always installed in all 3 supported platforms by default.  On
Windows default install should always select en-US and English dictionaries.  If
it does not do so under certain circumstances, then it is a bug in my opinion.
We removed en-US entry from the spellchecker selection file for this very
reason.  It would have only bloated Mac and Linux langpacks."

So this fix simply makes sure that "en" is included in every line of the
generated spellchecker_selection.hxx that is used by
setup_native/source/win32/customactions/sellang/sellang.cxx to determine which
dictionaries to select by default.

Change-Id: I3db68585dc6269a7db2f6cbf6b79796dc09d05e8
2013-01-09 15:19:56 +01:00
c29098917a Get rid of (most uses of) GUI
GUI only takes values UNX or WNT, so it is fairly pointless. One can check
whether OS is WNT or not instead.

Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34
Reviewed-on: https://gerrit.libreoffice.org/1304
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-25 17:53:25 +00:00
a737ae58cc WaE: unreferenced local variable
Change-Id: If234ce4af0f988c135a90a98312e24e4d80ca92c
2012-12-25 13:32:22 +02:00
31f1a12ca5 LibreLogo should be an optional module
On Windows it is installed by default, but can be disabled in
the installer easily.

Change-Id: Ic820f08b51edf71eb09fd3533dc42b82bd06bb38
2012-12-12 00:10:26 +01:00
6d77e0cb15 Bug 57917 - --enable-ext-oooblogger does not work with Python 3
Remove the oooblogger extension. It is unmaintained and the original
author (caolan) wants it dead.

Change-Id: Iff89f5badbb74f465c57e068a9e1acbbc13bc235
2012-12-06 11:14:24 +02:00
7bf64a5af4 Turn PDF import from bundled extension to plain code
No need for dirty hacks linking in basegfx objects statically any more.

To avoid unnecessary confusion between the newly plain code and any instance of
the old extension still installed (per-user or shared), I renamed all relevant
UNO implementation identifiers from com.sun.star.comp.documents.* to
org.libreoffice.comp.documents.*.  Also, existing installations of the extension
are explicitly not migrated to new user profiles.

The xpdfimport executable is now in program/, its xpdfimport_err.pdf in
share/xpdfimport/.  To simplify finding the _err.pdf from xpdfimport, its full
pathname is now given as additional second argument to xpdfimport.  To find
xpdfimport executable from CppunitTest, CppunitTest creates a symlink from
solver's unittest/installation/program to solver's bin, so that
"$BRAND_BASE_DIR/program/xpdfimport" works there (as CppunitTest now sets
BRAND_BASE_DIR to solver's unittest/installation).

The sdext/source/pdfipmort/dialogs/ Basic stuff appeared to be unused (even
though it was included in the .oxt) and has been removed.

The --disable-ext-pdfimport configure switch is renamed to --disable-pdfimport.
Having it still conditional requires some pdf_Portable_Document_Format vs.
pdf_Portable_Document_Format_import foo in module filter.

Change-Id: Iee58c2f6187142a418decc9ea3a5df10eb7e0523
2012-11-24 23:21:37 +01:00