Commit Graph

1058 Commits

Author SHA1 Message Date
9a6d5f15af fdo#65975: do not put MSVC 64bit runtimes in solver/bin
Apparently causes problems for some people.

Unfortunately the scp2 entries are "non-standard" so i've had to add
another variable to let the installer find it.

Change-Id: I7a01160369ed8dc401625c06760008341afcee67
2013-06-27 14:07:45 +02:00
d0db313465 do not try to install helppacks that were not built
Change-Id: I0156c38e71fe46ea599a8366b953d429dfa424bb
2013-06-20 06:35:11 +02:00
d72e170d6a prefer filelist from GeneratedPackage over Package
This broke incremental builds on MacOS X in the past, where
Package/python3.filelist was created for some reason, so the installer
did not install the Python framework.

Change-Id: I290da24d6385eaf514cd9f7db92b1a959902dcae
2013-06-18 13:41:03 +02:00
b8e09de4e0 allow to install files from workdir
Change-Id: Id711489ac631291fc11fe7698e5a0a4719db99d7
2013-06-07 15:14:27 +02:00
cc1c3d183b added some more documentation
(cherry picked from commit 15bffb385486de2f0fd285e8d81860e85138dce6)

Conflicts:
	instsetoo_native/util/openoffice.lst.README

Change-Id: Icdfbab74f437aa1179d24c251ecf74a79e4e522d
2013-05-23 09:36:03 +01:00
8186a4a1e4 Check for ODK in BUILD_TYPE
Change-Id: Ia3c5cf74dc88dbb741ea1eac7bbdf0b41617ded9
2013-05-17 13:44:02 +03:00
553084d484 only create all-langs installer for windows
We produce standalone -langpack packages elsewhere. This should get the
size of the main dmg for MacOS X back to normal.

Change-Id: Ifd0cb1f9e31fe211c15636ddb6653e3672570819
2013-05-13 18:32:11 +02:00
717c9643bd More gb_PROGRAMDIRNAME clean up
Change-Id: I5af86e15bcb8958a680e7309f13d7a865f29d7a9
2013-05-10 14:06:47 +02:00
ed665f24ff copy pyuno files to instdir
Change-Id: I62fa315b942c5b2383ee83c644ecbcbca3d6c40f
2013-05-05 15:47:54 +02:00
e64e85b221 copy more rc files to instdir
Change-Id: Ia4cc2b8e504f46734ea7bfaade60bf27509cce32
2013-05-05 15:02:50 +02:00
b08a5ac83b copy more rdb files into instdir
Change-Id: I92fe5833fb7e4c869d1bf1b14b257394ce1b820b
2013-05-05 14:22:34 +02:00
553e0c7658 clean up include paths for installer
Change-Id: I03524cb562560921ea053ff81d6647664c912079
2013-05-05 13:35:57 +02:00
0fd330ec4d gbuild: add Package equiv. for copying whole dirs
This is in preparation for using doxygen to generate IDL docs. Because
the file names generated by doxygen are essentially random, it is not
possible to use a Package to deliver them. And we really do not want to
go back to using Zip, as unpacking slows the installation down.

Change-Id: I5f4aa6bf10c6aab30a5b1870e04dca723c123317
Reviewed-on: https://gerrit.libreoffice.org/3774
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-05-04 14:42:07 +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
88a943b051 generate versionrc for instdir
Change-Id: I5f2cdcd8a17ca250413bda066acaeab24118f9d6
2013-04-28 16:34:25 +02:00
ecc07f080f copy rc files to instdir
Change-Id: I5a4433595ac19930a40132c5749a8c0150c90aae
2013-04-28 16:34:25 +02:00
db1b0ca015 copy rdbs to instdir
Change-Id: I1855e72efc1a034d28ca2326ad8b239e2671cea7
2013-04-28 16:34:24 +02:00
0346f008e7 gbuild: add ure-link to instdir
Change-Id: I1279ea7cdd9828598179154815a85e2a4ce7e567
2013-04-28 16:34:24 +02:00
6ae02e9c61 gbuild: generate ooenv for instdir
Change-Id: I1d2ab70a1557376f056b236c4785e013275bbb92
2013-04-28 16:34:24 +02:00
fdb6b39d68 fix installing for --enable-mergelibs
Use gid_File_Lib_Oox instead of auto_File_Lib_vcl which is not defined
in that case.
No idea what the code is about though.

Change-Id: I675268a3490dd1421ecf1a82ede0db527d176744
2013-04-16 11:50:24 +02:00
48f0386111 instsetoo_native: gid_File_Lib_Vcl is now auto_File_Lib_vcl
Change-Id: Ie5404a378cc3bffdc3ba7a858814f3490fb82e3e
2013-04-15 14:53:27 +02:00
f99df8b7ac Fix for LibreOfficeDev naming scheme
Change-Id: I77dd5b38e729310d58c92aa4aaf82228d2fe781b
2013-04-15 10:51:04 +02:00
1f89a76dcc Install SDK in Windows dev-install, too
Change-Id: Ic26237c2ecdc0728be6acb6d15e2d258bf093c74
2013-04-12 11:57:28 +02:00
ca7cbe24cc use only major version for the system installation path on Windows (fdo#62303)
It means the LO-4.1.x will get installed into "LibreOffice 4"
instead of "LibreOffice 4.1"

Change-Id: Ideae670437fda9847d4ee3a86c4cab079d8da07a
2013-04-11 14:16:24 +02:00
9d54f0e1de add gbuild class PackageSet
This is intended for bundling filelists of multiple Packages together,
to simplify the scp2 configuration.

Change-Id: I6f700f691b37375a09a5400166aac80a8bb2a2b4
Reviewed-on: https://gerrit.libreoffice.org/3230
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-11 03:39:36 +00:00
3e8016ddc5 use filelist install method for udkapi and offapi
... so we can drop ZipUnoApi again.

Change-Id: Id5925b8c101cd7cb70614a9a26f328dec92db8fa
Reviewed-on: https://gerrit.libreoffice.org/3152
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-05 23:35:45 +00:00
e9b947a666 allow to put files listed in file into installation
With this in place, we can replace most of our Zips by Packages.
Extensions and Dictionaries are on the radar as well.

To move an installed file from zip to filelist, do:
1. Convert the Zip_foo.mk to Package_foo.mk :
   - change destination paths of all files to the same ones they have in
     the installation (you can find that in scp2)
   - use gb_Package_set_outdir to place the files under $INSTDIR, where
     they are expected.
2. Change the scp2 record:
   - change filename to <package-name>.filelist
   - replace ARCHIVE by FILELIST in Styles
   - change Dir to FILELIST_DIR.

Change-Id: Ie17d0765406081b03dcd44a6a23cf517f2067dd3
Reviewed-on: https://gerrit.libreoffice.org/3149
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-05 23:34:13 +00:00
911989ae03 add $OUTDIR/pck to search path for SDK product
... so it is possible to drop the copying-to-bin hack in ZipPackage.mk
and ZipUnoApi.mk .

Change-Id: Ic506e25a21003fca491d0902b5d8f282775da229
2013-03-31 20:39:20 +02:00
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
c1f8861c12 fixes for renaming LOdev builds to LibreOfficeDev
Follow-up to 16826147188bd78d67b97863226f903cc24add71 .
2013-03-03 13:59:34 +01:00
ee0dd36715 remove minor.mk
Hopefully all stays the same except for vcl/unx/gtk/a11y/atkutil.cxx.

Change-Id: I49108007ee6d045f045de86c8654efc7ca5fd3d0
Reviewed-on: https://gerrit.libreoffice.org/2491
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
2013-03-02 16:02:39 +00:00
1682614718 rename LOdev builds to LibreOfficeDev
It is similar change that we did for the release builds.

Also fixes make-dev install on Windows.

Change-Id: I7d9a4bc2e7b14e79516acdfb90c709dbde1378ab
2013-03-01 16:48:29 +01:00
4038f2467c fix: BUILDDIR is not always SRCDIR
Change-Id: I6028fe295e467aa448d8503097be0c80a42908ed
2013-02-27 23:24:41 -06:00
87c57d871c move instsetoo_native to gbuild
Change-Id: Ie4deddc426356636b76ad4fc27552c6d3a1dd815
Reviewed-on: https://gerrit.libreoffice.org/2429
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2013-02-27 14:52:42 +00:00
b4e8f99a25 instsetoo_native: fix helppack generation
Change-Id: I30778847b23aabccba2275d518eba7f57ffcefd5
2013-02-26 11:05:35 +01:00
a5e5dc9c62 instsetoo_native: fix localization
Change-Id: I8cb1baecb7034511b8dfcecefc58de2fb3f59061
2013-02-26 10:10:00 +01:00
1d84e9d1d3 instsetoo_native: convert to gbuild
Removes:
 * instsetoo_native/util/update.xml
      - gen_update_info.pl can be removed ?

      On Windows the binary artifacts are created now in:
      workdir/*/installation/LibreOffice_Dev/native/install/en-US/*.msi

Change-Id: I1c82ea9cb9d297cdd0e4f4b9b44606259eeeed49
Reviewed-on: https://gerrit.libreoffice.org/2242
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
2013-02-24 17:26:19 +00:00
616c6924f1 s/the the/the/
Change-Id: Iadacffaad832c6ff06757e8567e24f929f24a4c3
2013-02-22 09:58:19 +02: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
8d12a195b1 use correct default values for the splash progressbar
they are not longer forced from configure

Change-Id: I8ea37b7233138de2900caf231762eefec0ba6563
2013-02-01 18:04:45 +01: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
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
8d16259c34 Consolidated branding in configure
Removed individual options (intro* and startcenter* + images) in favor of a folder with graceful fallback.
Grouped progress bar intro settings in a text file into the branding folder

Change-Id: Ib56b80e43c474a944ac79c0a842d66487e9f91d5
Reviewed-on: https://gerrit.libreoffice.org/1704
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
2013-01-30 11:12:11 +00:00
e024a8d88d installer: remove SHORT_PRODUCTEXTENSION
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.

Change-Id: I5aac25bcedd785a098cba612643ea68fe19c77f0
2013-01-18 23:46:34 +01:00
9a5183ddad installer: remove SERVICETAG remnants of product registration
Change-Id: Ic87bb4666bcc4b28476dbfe2193a8330413547cf
2013-01-18 23:46:34 +01:00
33b05d5de7 there is no standalone URE installation
..I hope :-). URE is part of normal installation.
- removes script from scp2 and unused stuff from instsetoo_native.
- removes also OxygenOffice mentioned in openoffice.lst.

Change-Id: I1673c06aa84ae0eb2adda2df78a50a5c5d0761c1
2013-01-16 14:29:24 +01:00
47a95b1f16 Generate also the ABOUTBOXPRODUCTVERSIONSUFFIX from the AC_INIT
Change-Id: I9b7ce03daac7ae223cba1b8741042431aabe7f59
2013-01-16 12:28:48 +02:00
c59d371060 Remove unused variables
POSTVERSIONEXTENSIONUNIX and LONG_PRODUCTEXTENSION are not used anywhere

Change-Id: Id1f2db293fff134075b6658b738dc3be8d17a279
2013-01-16 12:28:48 +02:00
cb50efb8cb Ignore and distclean generated files
(Modelling .gitignore-per-directory instead of a single one in the root dir
after exisiting config/.gitignore.  No idea which approach is better.)

Change-Id: I0ae90103ada4bfff48e90afcf3903bd3ba909314
2013-01-14 11:05:50 +01:00