Commit Graph

660 Commits

Author SHA1 Message Date
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
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
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
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
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
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
2b4fd2c89a re-base on ALv2 code. Includes:
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.
2012-11-12 11:46:43 +00:00
b03278df1d Remove consecutive break and a break which follows a return
Change-Id: I8dec9eda857f7da452992bc785426449933acc59
2012-10-13 17:57:44 +02:00
bf7657fc2a Killing even the last remenants of rebase
Change-Id: I649275360a1d57aeec03d3cecdb02f5f7ccdd1e8
2012-10-09 11:05:25 +02:00
d2aa4ebb7a Revert inadvertent chmod
Change-Id: I0b1865719da2e3c5a669b30a635c333721c9c41d
2012-09-27 11:59:00 +02:00
8cb7464130 No dictionaries were preselected for en_US langpack
...as gm_Langpack_r_en_US was explicitly excluded from langs[] in
SelectLanguage, so addMatchingDictionaries was never called for it.  (This was
only evident in installation sets conaining only few langpacks, as the
"official" multi-lang installation set also contains en_GB etc., so appropriate
dictionaries were selected through those.)

Reworked the logic of chosing which langpacks to preselect (see the comment in
SelectLanguage); hope it still works as intended for the various cases (of which
the "official" multi-lang installation set is the only truly relevant one, for
now).

Change-Id: I31f531194c79e49c9c09e33454a7b0a82d9ff02f
2012-09-27 08:31:41 +02:00
a99ddfdc2f msi-encodinglist.txt was moved to different location
Change-Id: I05715d4afb205aa11eb0eb98c6734db02a6be8d8
2012-09-26 18:59:12 +02:00
e2b1a7e4e4 fdo#39791 do not steal .doc association from MS Word
I don't think it made sense to check OpenWithList at all. When we
found WordPad there, we registered the file type, even when it was
registered by MS Office.

Change-Id: I15a151051cadd329e8614388ceb84470ea28805a
2012-09-12 16:11:12 +02:00
e2fac98819 fdo#53009: For msi installer, only default-select a subset of dictionaries
Change-Id: I3ee3fb5e5142ce4956776467b2ffcb19ed3b10c2
2012-09-11 17:11:08 +02:00
8b3ab4b8a5 Some code simplification
Change-Id: I01eb2bf6fe03845787e8869a2f90bb2fced4f933
2012-09-11 17:11:08 +02:00
6dcb3d4ef4 Related fdo#51252: No more prereg, no more unopkg sync
Now that 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying
share/prereg/bundled to avoid startup crashes" removed the use of share/prereg,
there is no longer need to generate it in the first place (by calling "unopkg
sync" at build or installation time), and so no need for the "unopkg sync" sub-
command, either.  This also allows to simplify some of the jvmfwk code that was
only there so that "unopkg sync" (which can require a JVM) can work in "hostile"
environments (during build and installation).

Change-Id: I52657384f4561bf27948ba4f0f88f4498e90987f
2012-08-10 16:03:28 +02:00
013d1e01c3 Ensure correct import of msi tables using wildcard character
Change-Id: I3e1800d73250a8a630dd37329189b13cfae311e9
2012-08-02 12:07:10 +01:00
4c1c5aaa2d Avoid a crash.
Change-Id: I2ce8be599c9285bd0da039e1ff9c0649a118a8a1
2012-07-25 17:31:29 +02:00
5b9948108d get rid of dmake warning
Change-Id: Ie10a8d53357255f4f326f399b59a3d81ebc7d2a6
dmake:  Error executing ´o´: No such file or directory (Ignored)
2012-07-25 13:17:09 +01:00
19561b5971 Vim modeline.
Change-Id: I40d42ce2ee7f50f1b3a1b825e2672cc11c35390b
2012-07-25 12:58:57 +02:00
c5e73b26ed Vim modelines.
Change-Id: I9392de62dc8b69033ba3dee815617ac3f0ff0bc6
2012-07-25 12:51:43 +02:00
647c6886da When called with no input files, just write usage (as the Windows tool does).
Change-Id: I06ffe30b187db6db3cec38bb35af9da797ebca45
2012-07-25 12:51:43 +02:00
063afe5104 Check for the msi* build requirements in configure.in + update README.cross.
Change-Id: I0da3e604ebd0665c5405174957d852677195126b
2012-07-24 13:42:51 +02:00
65e2c77e76 Build the cross-msi-tools if winegcc is found
Change-Id: Idc58b314a0721507e80e7b0e6216f29090f1d347
2012-07-23 16:00:49 +02:00
4e7cfbfaed Eventually build the lanedo msi* tools soon
Change-Id: Ie8174ae4b7d2c02503f40fe1263076d924f2c9e2
2012-07-23 14:06:42 +02:00
0977c5121e Use lcab to generate cabinets for now.
lcab is expected in the sys. path.

Change-Id: Ie1cd8a45966bbd84ce84f2ad1d86da492eafa321
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2012-07-18 11:02:44 +02:00
ae0e379a44 Added functionality to msitran for transforms.
Transforms currently cannot be generated as Wine does not implement
MsiDatabaseGenerateTransform().

Change-Id: I03507e07f372871eed23ac932426d5708f765884
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2012-07-18 11:02:20 +02:00
a237b03f73 Skeleton code for msimsp
Change-Id: I23349edcf15731a9a33b9698bd77893003682e39
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2012-07-18 11:01:57 +02:00
9971648058 Skeleton code for msitran
Change-Id: Ic48abd66a04bfaafda846e514b096431e37488a8
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2012-07-18 11:01:33 +02:00