summaryrefslogtreecommitdiff
path: root/instsetoo_native
AgeCommit message (Collapse)AuthorFilesLines
2017-04-26Enable MSP patchingAndras Timar1-1/+1
Change-Id: I1de9776e161161daf7349be304e05d5bb959f891
2017-02-27s/LibreOffice/CollaboraOffice/Andras Timar1-1/+1
Change-Id: I25537b15a806cd904f0d436d7144c59d66f13632
2017-02-20STARTCENTER_INFO_URL = https://collaboraoffice.com/Andras Timar1-1/+1
Change-Id: Id84259ff8bf27475d63c0ab31c4312bc78cb55d8 (cherry picked from commit 666337ce629737a73791e6fa4f0a7ac98541dc1f) (cherry picked from commit a156cd0b9d712485a2624edcda1584361c8913c0)
2017-02-20Collabora Office brandingAndras Timar4-15/+16
(cherry picked from commit c276d5ba1491dc237812cdf3d877a4ecec2ee1dc) (cherry picked from commit c085f9176bda7bad0234d0087ff87f27086fc333) Change-Id: I9e79c07aa3cbb70076d9bab07294062df4be02c6
2017-02-20Multilingual Mac OS X DMG for CollaboraAndras Timar1-2/+2
Change-Id: Icfa638141e99af3ba313cf235228fbab8b3594d2 (cherry picked from commit 561581cd39022e82a0bc961be7c2406dfb1b94f3) (cherry picked from commit 32e13ccac64777722a96df47aca868e263db94cd) (cherry picked from commit 229a7cdac952bbea8263bb24b93a2456fc1a1b51)
2017-02-20Collabora Office EULAAndras Timar1-1/+1
Conflicts: readlicense_oo/Package_files.mk Change-Id: Ia380db465f5094216cb36526f6cc178043376356 (cherry picked from commit 2e8f1c8598c34a5cf0779f23fe66091115fa0fc6) (cherry picked from commit 63f4de72939a506c04d7f1b274e9c8fa09c4bb25)
2017-02-19Collabora Office ARP dataAndras Timar3-15/+15
Change-Id: I83d28b9bc7985f34303d3c3343f976b5a87009e1 (cherry picked from commit 77212cb5799c17b84b1707a358c3860774ef8569) (cherry picked from commit b7047170df4e6375e37651eda9cc0f9a494fea9c)
2017-02-19Collabora Office versioningAndras Timar1-6/+6
Conflicts: configure.ac Conflicts: configure.ac instsetoo_native/util/openoffice.lst.in (cherry picked from commit dec4b25aaceeba671c0c3f7f81ef13e5b8e42e00) Change-Id: Iff7004808f9637f3dbc6393751246c3a82134487
2017-02-16tdf#103677 Windows installer iconsAndreas Kainz9-0/+0
Icons refreshed according Tango style Change-Id: Ibb86ea0a7153f0ac7331d278b2dcd8f8c64835e7 Reviewed-on: https://gerrit.libreoffice.org/32998 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit a296a69c984b17cfbcd249cf6bdc191d08dff2a6) Reviewed-on: https://gerrit.libreoffice.org/33943 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2016-10-14profilesafe: Adapted to UIArmin Le Grand1-2/+2
Adaptions to UI, added more modes what the user can do in SafeMode. Adapted locations to write pack information and added places where to enter SafeMode. Implemented basically all five possible user choices Change-Id: Ic5324a8f77ab434309e840949c3803e65a75c538 Reviewed-on: https://gerrit.libreoffice.org/29785 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
2016-10-13profilesafe: extended to three modesArmin Le Grand1-2/+14
Saving configuration is now extended to three basic modes, from just saving registrymodifiications to adding user-defined config stuff to saving all information in the user profile, additionally configuration information for Extensions is saved. Added configuration entries for this and tested saving/restoring. Change-Id: I79b09c37617803bf656826f76a7e3db79cda49ac Reviewed-on: https://gerrit.libreoffice.org/29770 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
2016-10-11profilesafe: Add values for SecureUserConfigfeature/profilesafemodeArmin Le Grand1-0/+3
Added default values for SecureUserConfig values to soffice.ini/rc which enable the mechanism, enable by default and set a maximum of three backups file in packed form. Added more handy flag for easy decision to add compressed/uncompressed. Change-Id: I5a624c09fec4e4278314e13fc5f693ac085d5e61
2016-08-17tdf#69066: use Restart Manager to restart processes during installationMike Kaganski7-0/+40
The goal is to allow installer to automatically close and restart closed applications, and thus diminish users frustration when they don't know how to close explorer.exe, or how to start it again and bring desktop back. Reference: https://msdn.microsoft.com/en-us/library/windows/desktop/aa370379 Notes: * A dialog MsiRMFilesInUse must be present in MSI. * It will only be used when operating system's Windows Installer version is >=4.0, and OS is Vista or newer. If system's Windows Installer is older, then current FilesInUse dialog will be used. * MSIRESTARTMANAGERCONTROL property has default value of 0, that enables installer to use the Restart Manager. It is explicitly set in MSI just in case. * Do not use Restart Manager and do reboot is selected by default. Change-Id: If9d8be7cb478d81db03485ee912991ae9d568ed8 Reviewed-on: https://gerrit.libreoffice.org/28171 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-08-05URI-encode spaces in PRODUCTNAME for UserInstallationTor Lillqvist1-1/+1
Failing to do this caused a mysterious uncaught exception in gengal, with no explanation printed. This turned out to be caused by the 'CONFIGURATION_LAYERS: missing ":"' exception thrown in configmgr, which was caused by the unencoded space confusing the parsing of the CONFIGURATION_LAYERS thing. Change-Id: I9c91819906c2e0dd434d9f96a04bc14c0e0408ed
2016-08-04Introduce --with-product-name superseding --with-macosx-app-nameTor Lillqvist1-1/+1
The new option thoroughly replaces the product name mentioned in the AC_INIT() call. Work in progress. Also take care of spaces in the product name in a more systematic fashion. This should affect mainly OS X where the final app bundle that is installed should use the product name as such, including spaces, if any. However, our build system does not cope that well with having an app bundle with spaces in it in instdir. So in instdir, and also in test-install, spaces are stripped away from the product name when used as part of the app bundle name. Change-Id: Ic16b5039f23c96a4f39387a1869faeb25e05aafb
2016-08-02Don't use spaces in the product names when packaging.Jan Holesovsky1-3/+5
Change-Id: I55f332117cc7530eb6d562846db379d95e628a22
2016-03-11User-Agent: disable reporting of languages.Michael Meeks1-1/+1
Nowadays we have them all, so it is big, non-useful data. Change-Id: Ia08b863852e6a0916f30e2ecdc14eea4fafe2ab0 Reviewed-on: https://gerrit.libreoffice.org/23143 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2016-01-05tdf#96636 - Text "Removing files" during installation is confusing..Cor Nouws1-1/+1
Change-Id: Id3f9e17bf68ad5ca2d9a7571aed49f5a3d81b932 Reviewed-on: https://gerrit.libreoffice.org/20970 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-11-28Revert "gengal: create an ini / rc file - to bootstrap services properly."Michael Stahl2-10/+0
This reverts commit 795c61e052671d4de6a3b9cf77f9c0ad117e064d. <sberg_> but what is 795c61e052671d4de6a3b9cf77f9c0ad117e064d supposed to help anyway? on all platforms, gengal should already get URE_BOOTSTRAP set, either via redirectrc, or via extendApplicationEnvironment() <mst_> sberg_: so ... you mean that gengal.rc is actually unnecessary, and that the problem was caused by a missing dep on Package_instsetoo_native_setup ? <sberg_> I'm pretty sure a missing gengal ini-file was a red herring Change-Id: I50ebc360e0e5c75c16f8407cbac6a54753fca272 Reviewed-on: https://gerrit.libreoffice.org/20226 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2015-11-26gengal: create an ini / rc file - to bootstrap services properly.Michael Meeks2-0/+10
Change-Id: Ib2042d6419dafcd62aaec95efb844cb09833c266
2015-11-23Update-check, expand to allow reporting of H/W and OS versions.Michael Meeks1-1/+1
Off by default. Expand config options to show the user agent used. Re-use this to show more useful info in Help->About too. Change-Id: I1044116ef9beeb341a537c0f4451dca54e198f67 Reviewed-on: https://gerrit.libreoffice.org/20098 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2015-10-16drop gconf integration as per ESC decisionBjoern Michaelsen1-26/+0
Conflicts: shell/source/backends/gconfbe/gconfbackend.cxx Change-Id: I609ec83ec59f5ae8d3a8c9c09649695bfcb03b87 Reviewed-on: https://gerrit.libreoffice.org/19408 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2015-10-08OOOVENDOR is redundant here, it is defined by configureAndras Timar1-1/+0
Change-Id: Ied46fd0bfaf010fc819e312a49e2fe3aa5656ee4 Reviewed-on: https://gerrit.libreoffice.org/19255 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2015-10-02Ignore grep return code for MSI buildsJan-Marek Glogowski1-1/+1
So "grep -v" returns != 0, if your input or output file is empty. which breaks the Jenkins build, because Jenkins runs scripts with -xe per default. The "strip comments" grep currently fails for the empty file instsetoo_native/inc_openoffice/windows/msi_templates/components.txt Change-Id: I53a477702dbcc3c00c4a23263c3b402cb936250a
2015-09-24sync splash-progressbar position for installets with instdirChristian Lohmaier2-5/+6
values for actual installer versions come from openoffice.lst, add a hint to the instdir-makefile Change-Id: I6eea5585dd776d4d6071af7b508a91a9c385cb3a
2015-09-02ditch gnome-vfs2 supportCaolán McNamara1-7/+0
Change-Id: I882c04fd3a255f55511b1884157de26e7574e6db Reviewed-on: https://gerrit.libreoffice.org/18262 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-01Support modification write-back to other than registrymodifications.xcuStephan Bergmann1-1/+1
...to eventually support writing to dconf (see TODO). Even when writing somewhere else, it may still be useful to read from the current "user:" location, so a new convention was introduced to CONFIGURATION_LAYERS types that support write-back: - A leading "!" indicates that the layer is indeed used for write-back (probably in addition to reading from it). For backwards compatibility (when users use own settings of CONFIGURATION_LAYERS, instead of depending on the value in the shipped fundamental ini-file), no prefix on the "user:" is now interpreted the same as a "!" prefix. - A leading "*" indicates that the layer is not used for write-back (but only for reading from it). Change-Id: I399cc7bfe927db50586834f9630c184aaa2153f2
2015-08-21Spurious spaceStephan Bergmann1-1/+1
Change-Id: I1ac90d4253230d55e289135da4e1837a3f2d42e9
2015-08-21Generalize CONFIGURATION_LAYERS "winreg:" notationStephan Bergmann1-1/+1
...after 097292feab4fc3c064983e1dd08ac4bebe1fe216 "Add HKEY_CURRENT_USER registry integration" added "winuserreg:". Even though changing from the exisiting "winreg:" to "winreg:LOCAL_MACHINE" should be compatible, as it only ends up in fundamental.ini included in the LO inst set, play it safe it keep treating "winreg" the same as "winreg:LOCAL_MACHINE". ("url" is a misnomer now in configmgr's Components ctor, and should eventually be renamed to something more accurate.) Change-Id: Ifbcf3284d904490891642599468470d03547f92a Reviewed-on: https://gerrit.libreoffice.org/17891 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2015-08-11gbuild/config stop using VERBOSE, use only verbose=tNorbert Thiebaud1-1/+1
configure.ac was setting VERBOSE=YES/NO when really we use verbose=t or verbose= Change-Id: I47aee8d177cb2d788a62ecdbbb9cc3695c2bb299 Reviewed-on: https://gerrit.libreoffice.org/17634 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-07-31tdf#93004 msi banner: avoid overlapping text with grey backgroundChristian Lohmaier1-0/+0
by reducing the width of the graphical element Change-Id: Ie100629e2602f8f9a3f0e4e1ba353178f219c9a0
2015-07-30Add missing build dependencies for *rc files.Jan Holesovsky1-0/+4
Change-Id: I0a876e9afa9a90f312d68611a8adf5a962da784d
2015-07-24update branding for 5.0Christian Lohmaier2-0/+0
about-dialog & windows installer imgs use non TDF-tagline and add Development build variant for splashscreen DS_Store for Mac dnd installer not adjusted yet Change-Id: I4ff449d9564214a80f88c752e54064b599e9948b
2015-07-14Add HKEY_CURRENT_USER registry integration.Michael Meeks1-1/+1
It seems rather odd that we dump this to a file and parse again to me. Change-Id: Ia32ba9ff3e7878d40032bd7d10fba2c143d11757 Reviewed-on: https://gerrit.libreoffice.org/17033 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2015-07-09New branding for the 5.0.Jan Holesovsky1-5/+5
Change-Id: Ic20314a65739d769adf3331a77f36be813da22a3
2015-07-08configmgr: support reading from a dconf layer (WIP)Stephan Bergmann1-1/+1
Work in progress to allow integration of LO with <https://wiki.gnome.org/Projects/FleetCommander>. During configuration, dconf support is implicitly enabled when available on the host (which is presumably only available on Linux). It is explicitly disabled for TDF Linux builds for now, though, to avoid accidental dependencies of the distributed installation sets on system dconf libraries. A dconf layer is represented in the CONFIGURATION_LAYERS bootstrap variable with type "dconf" and an empty URL. See the comment at the top of configmgr/source/readdconflayer.cxx for the encoding of component-data in dconf. All of this is still subject to change. Change-Id: I2d08d81c8ea43ba4a99040a8882ae75b91bcfdb9 Reviewed-on: https://gerrit.libreoffice.org/16848 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2015-07-02Move winreg layer past res layer, and also include it in instdir/ instsetStephan Bergmann1-1/+1
* Looks more logical to keep share/registry/'s xcscxu and res layers together. * Lets the winreg code actually get executed by developers using the instdir/ instset. (Though it doesn't enable it during in-build tests, which typically use their own CONFIGURATION_LAYERS settings.) Change-Id: I49dd3a16773047f7d4dc372c60a58ada1970970a
2015-06-29instsetoo_native: fix building installation setsMichael Stahl2-5/+5
... after 39b04ad7cb2e10f32e92d3c9bec57e35f64a3304 started using PRODUCTNAME but here it was LibreOffice_Dev for mysterious reasons whereas PRODUCTNAME is LibreOfficeDev so rename for consistency. Change-Id: Ia5f5a24f405923a7ea1641de65709fbf842df79c
2015-06-29Remove some hard coded references to "LibreOffice" as Productname.Martin Hollmichel1-1/+1
Change-Id: Ibd0a500d7ba31ec4c25bad64b39311d45e94dca3 Reviewed-on: https://gerrit.libreoffice.org/16590 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-06-15alternative solution to avoid adding a gnome-vfs dependency if disabledCaolán McNamara3-30/+9
i.e. "don't add gnomevfs requires to epm created rpms if GNOMEVFS is disabled" seeing as setup_native/source/packinfo/packinfo_office.txt references find-requires-gnome.sh and doesn't have conditional support revert the split and put the the conditional into find-requires-gnome.sh Change-Id: I34bd37c4fd252f2175ff055024293dea946b4881
2015-06-10don't add gnomevfs requires to epm created rpms if GNOMEVFS is disabledCaolán McNamara3-4/+30
Change-Id: I689783e176921ea03475d3e113426563bf20b9d7
2015-05-23tdf#91469: convert links in help/about to httpsJulien Nabet1-4/+4
Change-Id: I1274f75a49a999285488e99713782956e2287249 Reviewed-on: https://gerrit.libreoffice.org/15870 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-04-17instsetoo_native: also keep profile at 4 hereMiklos Vajna1-2/+2
Change-Id: I29f7efd065805b12199b8a6a3aadcf62cdcecee7
2015-04-16bump version to 5.0.0.0.alpha0+ - but keep profile at 4Christian Lohmaier1-1/+1
Change-Id: I30536ecd8a03a19a647d247e7c6ece3d6f1695c1
2015-04-10Windows installer: remove unused stringAndras Timar1-3/+0
Change-Id: I0a1163b54601932957b0217894173aeadbf34e6e Reviewed-on: https://gerrit.libreoffice.org/15223 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2015-04-10Don't try to install LibreOffice on XP, if it was built with SDK 8.x or higherAndras Timar6-5/+8
Change-Id: I79a357a51a3d98774745001d5f99b045ef964255 Reviewed-on: https://gerrit.libreoffice.org/15218 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2015-03-10libGLU actually is not required anymore for masterChristian Lohmaier1-1/+0
Change-Id: I543a561fc7fa1213c8e319f227b761f6328a6eaa
2015-03-10tdf#53861 - add libGLU.so.1 and libXinerama.so.1 to rpm/deb requirementsChristian Lohmaier1-0/+2
only used for upstream packages/when epm is used (any auto-dependency creation is disabled for those). Add two that might be missing in barebone installations Change-Id: I97c3af8cc8622c63ac831701e509097711822098
2015-02-03MSI packaging tweaks for Windows 64-bitAndras Timar1-0/+1
Change-Id: I69d52554b531dab6fc12ffe16e6ca91241fda3a5 Reviewed-on: https://gerrit.libreoffice.org/14283 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org>
2014-12-09Allow comments is .idt files, and comment that "Excecution" is _necessary_.Jan Holesovsky2-1/+2
Change-Id: I10d0f32fedd842023bf94b252bcb48bfc2264dd4