summaryrefslogtreecommitdiff
path: root/instsetoo_native
AgeCommit message (Collapse)AuthorFilesLines
2022-01-22Make installer compression tool configurableThorsten Behrens1-0/+1
So we can use pigz or other parallelizable tools if available. Shaves off noticeable build time when packaging install sets. - figure out if pigz is available (fallback to gzip otherwise) - pass compression tool down into make_installer - and handle as one of many global options there Change-Id: Ia9d1ea27a9f990874238b6f0be3e1fd30a662ec6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128469 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-10-29Split overly long line into multiple logically separate pieces for sanityTor Lillqvist1-1/+9
Change-Id: Ic23bfba8ff9f403e49bda89e4fffe73cf11fdd70 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124424 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2021-10-13tdf#143686 increase a radiobutton's area sizeRoman Kuznetsov1-1/+1
Change-Id: Ib8b6d8b47934a7a2cf68f8977f03ced5f80f6452 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123409 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov <antilibreoffice@gmail.com>
2021-08-04tdf#143686 Increase a width of the labelRoman Kuznetsov1-2/+2
Change-Id: I71d7994ad7ed4506c1514cf417a535caff20b05f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119869 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov <antilibreoffice@gmail.com>
2021-05-27Fix typosAndrea Gelmini1-1/+1
Change-Id: I9a4ba6b6369da0bac489718230880b04912bd1d7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116214 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2021-05-26remove obsolete/duplicated entries from openoffice.lst.inChristian Lohmaier2-22/+10
The xml configuration related stuff is no longer (since 2013, with 89ac3c4acae1f0ffe3e96933d3449749ddf86847) done in installer code, but by postprocess/CustomTarget_registry.mk openoffice.lst is only used for package generation itself, and by extension for the replacement of values used in scp2 (those are replaced by "replace_all_ziplistvariables_in_file" (for the ${NAME} style ones) in solenv/bin/modules/installer/scpzipfiles.pm and (for the <name> style) by replace_setup_variables in solenv/bin/modules/installer/scriptitems.pm the files that would be created by scp2 in case for an installation set (e.g versionrc, bootstraprc) are created by instsetoo_native/CustomTarget_setup.mk for plain instdir Change-Id: I761ea25aa98bbdcc310836257e288322fbfc437b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116128 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-04-20tdf#141760 Increase a label box in Windows installer dialogRoman Kuznetsov1-1/+1
Change-Id: I6a58e0977381c620a795b77df56c24dab37cc327 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114281 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
2021-04-07Updated README.md files to represent current code / use Markdown formatHossein1-5/+5
Previously, all of the README files have been renamed to README.md and now, the contents of these files were changed to use Markdown format. Other than format inconsistency, some README.md files lacked information about modules, or were out of date. By using LibreOffice / OpenOffice wiki and other documentation websites, these files were updated. Now every README.md file has a title, and some description. The top-level README.md file is changed to add links to the modules. The result of processing the Markdown format README.md files can be seen at: https://docs.libreoffice.org/ Change-Id: Ic3b0c3c064a2498d6a435253b041df010cd7797a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113424 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-03-24Using .md extension/Markdown syntax for modules READMEHossein1-0/+0
Renaming all README files for all top level modules to README.md, applying no content change at this stage to be able to track history of the files. These files should be edited to use correct Markdown syntax later. Change-Id: I542fa3f3d32072156f16eaad2211a397cc212665 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112977 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-01-27packaging: remove resolve_variables_in_downloadnameChristian Lohmaier1-3/+0
OOODOWNLOADNAME was set in the global section of openoffice.lst, so the code always did set the target path with set_download_filename. Thus remove the superfluous sub and then also the no longer used OOODOWNLOADNAME variables In the same vein: the "script that extracts a tarball that is appended to it" method is no longer in use since many years, delete that as well. Change-Id: I43481a3ec09e064ef77138e1cbfc1dba6854f2d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110017 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-01-22Percent-encode spaces also on Linux etc.Stephan Bergmann1-1/+1
...following up on 336a9ec1c4801ab57264b264ead90e5c14451230 "URI-encode spaces in PRODUCTNAME for UserInstallation" Change-Id: I73fadea567c8e26f6a337c094623fa83be1e2188 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109815 Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins
2021-01-07Support for signing when PRODUCTNAME contain spacesVasily Melenchuk1-11/+9
Anyway files are stored without spaces, so we should use same name. Additionally removed PRODUCTNAME_no_spaces variable, it's just a redundant alias. Change-Id: I5b88ac3b07d06969f7639a25603392c9d662d3f1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108405 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2020-12-21recommended gtk3 to gtk4 migration 'Enable diagnostic warnings'Caolán McNamara1-0/+2
Change-Id: I154be7df4af7e2e9804053e196e65e77a676c8ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108065 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-01Resolves tdf#137880 - Fix for Windows installer imageHeiko Tietze1-0/+0
Change-Id: I0d57fb54343059bc30d032ae7d4bdbbd3c4c5c70 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105131 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-10-12Resolves tdf#137187 - More dictionaries via extensions dialogHeiko Tietze2-7/+0
UNO command and linkbutton interaction replaced with the internal dialog DICT_REPO_URL removed, README adjusted Change-Id: I401737b538da229ac0d432007e7564105672ff40 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103769 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-08-19Spurious space at start of generated version ini fileStephan Bergmann1-1/+1
...since 7f1f1f53206c85fb0e2290e5fb2e20dcedfa2610 "tdf#118303 - Wrong converting of the Vendor-String" Change-Id: I192f8b9cfaba0863612c9099b926ea5828783bd6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100963 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-07-23tdf#134522 remove --with-build-version ./configure flagRene Engelhard1-2/+0
Noop. Use --with-extra-buildid Change-Id: I110514f6f58c1cd2ca635234a20cf560e6e3d6e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98923 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-06-11increase a radiobutton text area in Windows installer dialogRoman Kuznetsov1-2/+2
Change-Id: I3e2a2dbb7913bc0e35f0eb676f39afba53e1d0d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95970 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-05-15Resolves tdf#133024 - Position of text in splash screenHeiko Tietze2-2/+2
Moved to 170, see also a165bb8565539e2d0533362a99236829c23e9be8 Change-Id: I61f4c3ab4cfd069365e539b803c3c4d084166c10 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94287 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-05-14Resolves tdf#133024 - Position of text in splash screenHeiko Tietze2-6/+6
Moved to 160 Change-Id: I86cb1881161142e265e849b7490fda88b47a23bd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94188 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-05-06Move all public Java classes to libreoffice.jarSamuel Mehrbrodt1-1/+1
This moves the classes from juh.jar and ridl.jar to libreoffice.jar The goal is to have one single jar (and Java module, will be added later) which developers can include to work with LO. juh.jar and ridl.jar are kept as basically empty jars with libreoffice.jar on its classpath to keep backwards compatibility. This is a continuation of ae855bf48163ff64d94cfc34aff8e37abdb5518d and a preparation to have Java 9 module support. Change-Id: Ifbbfb97f60373d14256e62ae3122913bd17d5bbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91930 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-05-06tdf#130778 revert Windows installer legend imagesRizal Muttaqin4-0/+0
- Tiny update for about.svg file Change-Id: I8dc6c3275ab05932f8825c675bcbc693d683f275 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93518 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2020-05-03setuprc has to be a .PHONY target in order to get the current git hashAndras Timar1-0/+1
Change-Id: I7962966b9e0075715e419a375c74283e2a771e01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93367 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-05-01Update for tdf#130778: Windows installer banner and icons. about imagesRizal Muttaqin25-9/+2334
Change-Id: Id761f5c4de24fa600effb2a2311eb170d814eca2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93249 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2020-04-30Resolves tdf#130778 - Branding for 7.0Heiko Tietze2-0/+0
Remaining installer images added TDF tagline removed White background on all splash screens Change-Id: Iafde896fd3ed58957ec16ba43565c56e85db925c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93199 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-04-21Relates tdf#130778 - Branding for 7.0Heiko Tietze1-4/+4
Better splash screen images Start center image depending on initial size Change-Id: I18823e04537bb217eaa7610c71c8021907dbbb94 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92583 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-04-15Related tdf#130778: New images for splash screenHeiko Tietze1-3/+3
Taken from the proposal at the BZ ticket; hires missing Change-Id: I95e19d5acb6c1b580c51e2af8dac272b459cf20c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92263 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-03-16tdf#128281 Increase a checkbox height in Windows installerRoman Kuznetsov1-2/+2
Change-Id: Ic0bc2af1dd565dc9c24a74de8900da771f052a95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90402 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-03-14tdf#130460: clarify the option some moreMike Kaganski2-2/+2
Change-Id: I4f1de2d3b112c5a4d3ba795bd944aa21add037a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90396 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-02-20add macOS malloc debugging env varsNoel Grandin1-1/+5
which would have saved me some time when debugging a recent macOS issue. Change-Id: I370826501db14fc563b553428f480f50bde48f9e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89056 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-16GBUILD_TRACE, support for finding out where the build time is spentLuboš Luňák2-0/+26
See instructions in solenv/gbuild/Trace.mk . This generates a file than can be viewed e.g. in the Chromium tracing view. Change-Id: I5f90647c58ca729375525b6daed2d4918adc8188 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88754 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-02-04tdf#117331 Merge jurt and unoil into ridlSamuel Mehrbrodt1-1/+1
jurt.jar and unoil.jar are kept as effectively empty jars, each with a Class-Path: ridl.jar in their meta-inf/manifest.mf, so that 3rd-party code loading them (with or without also loading ridl.jar) will still have access to their content. Conceptually, the UNOIDL entities in unoil.jar (corresponding to module offapi) are not part of the URE, but are now made available by URE's ridl.jar. This should probably not cause problems in practice. At least for now, we seal exactly those packages in ridl.jar that were originally sealed in jurt.jar. Ideally, all of ridl.jar could be sealed now, but that would be mildly incompatible, as it would prevent 3rd-party code from introducing additional UNOIDL entities in the relevant namespaces (even if that is something we do not want 3rd-party code to do anyway). However, some JunitTest_jurt_* define classes in those sealed packages. In the past they got away with that by using gb_JunitTest_use_jar_classset,*,jurt. Instead they now need to gb_JunitTest_use_jar_classset,*,ridl and drop the gb_JunitTest_use_jar,*,ridl. But the former only makes available the classes that are specified in ridljar/Jar_ridl.mk with gb_Jar_add_sourcefiles, not the UNOIDL entities specified via gb_Jar_add_packagedirs. But the tests need the udkapi UNOIDL entities, so introduce gb_JunitTest_add_classpath to let the tests get them explicitly. (Curiously, JunitTest_jurt_uno and JnitTest_jurt_util use gb_JunitTest_use_jar_classset,*,jurt but don't seem to acutally need it; lets leave that for a follow-up clean up.) As a follow-up clean up, relevant files could be moved from jurt/ to ridljar/. Change-Id: I836f4e7bb47fb41f1306e3f223da90dba988eb9a Co-authored-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84946 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-03Set INSTALLLOCATION in one single placeMike Kaganski2-8/+0
It used to be set both in AppSearch action (using RegLocator table), and in MigrateInstallPath custom action. This would overwrite value of INSTALLLOCATION taken from user, and read on the previous step, with values taken on the next step. Only migrating the install location in one single place - in custom action MigrateInstallPath - makes the process controllable. Also it allows to easily see all the various places in registry we read. Change-Id: Ib7e04c26e71ba92c6a62a0511971bfb3bdb7db72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87867 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-01-19Remove a hardcoded product name from a translatable stringAdolfo Jayme Barrientos1-1/+1
Fix the string’s grammar while at it. Follow-up for commit 128dabf58a535d422eb27f8dc760c81e54c6b354. Mentioned on review but never addressed. Change-Id: Id05d8686aca6d719eab4ad47fa0502353d3d074b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87034 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-12-11tdf#128991 Make clear in the help installer Roman Kuznetsov2-3/+10
that it must be installed into the same directory as LibreOffice and some visual fix in layout Change-Id: I8048c332bf381137689bfa1695862cf7d118f0a8 Reviewed-on: https://gerrit.libreoffice.org/84582 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2019-11-30MSI: Disable creation of system restore points during installationMike Kaganski3-0/+3
We don't install low-level system components that have potential of ruining the system, which would be the reason to create the restore points. Some systems suffer from very long creation of the restore points, like in tdf#129087: ... MSI (s) (60:00) [09:18:54:201]: Calling SRSetRestorePoint API. dwRestorePtType: 1, dwEventType: 102, llSequenceNumber: 0, szDescription: "Removed LibreOffice 6.3 Help Pack (English (United Kingdom))". MSI (s) (60:00) [09:26:57:699]: The call to SRSetRestorePoint API succeeded. Returned status: 0, llSequenceNumber: 73. ... So let's just disable the generation of restore points, as per [1]. [1] https://docs.microsoft.com/en-us/windows/win32/msi/msifastinstall Change-Id: I452859d72284e0b2ea9a407e30a5e256a8c0a0f6 Reviewed-on: https://gerrit.libreoffice.org/84113 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-11-20tdf#127711 Fix msi-soffice.ini CrashDumpEnable-entryJuergen Funk1-0/+1
when the switch --disable-crashdump is set, then the switch "CrashDumpEnable" set to "false", was only in instdir/program/soffice.ini, but was not in soffice.ini in msi it was always true Change-Id: I2668c1425a776fdf5f0c4e4511c2216e8f418a5b Reviewed-on: https://gerrit.libreoffice.org/83171 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-11-11User interface languages: At least one is requiredSamuel Mehrbrodt1-1/+1
Reported here: https://twitter.com/erez/status/1193838467668697089 Change-Id: I96fdb82646e6b2e49b6032766195309a97da0fba Reviewed-on: https://gerrit.libreoffice.org/82439 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-10-02tdf#127711 - A runtime-switch for the MiniCrashDumpJuergen Funk1-0/+1
- in soffice.ini (sofficerc) the entry "CrashDumpEnable" default is "true" - when false then the Dump.ini and the dump-file are not written - when the switch --disable-crashdump is set, then the switch "CrashDumpEnable" set to "false" - when the entry "CrashDumpEnable" is missing, in this case is the default true, too - the checkbox under Options-General "Send crash reports to ..." is deactive and shows off (only view, not change the config) - when set the environment variable "CRASH_DUMP_ENABLE" to any char then the switch "CrashDumpEnable=false" are overrules with true and the Dump.ini and dump-file are write Change-Id: I34e7795640eb95d111e18b0ad46ec67b2c126b19 Reviewed-on: https://gerrit.libreoffice.org/79273 Tested-by: Jenkins Reviewed-by: Juergen Funk (CIB) <juergen.funk_ml@cib.de>
2019-09-21tdf#126944 - Update help installer fonts to Segoe UI 9 ptRoman Kuznetsov4-342/+323
Change-Id: I7c508ce7536d1c0d922be5069c059a7302d740b1 Reviewed-on: https://gerrit.libreoffice.org/77756 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-09-06WINDOWS_BUILD_SIGNING: check for explicit TRUE for signing msiChristian Lohmaier1-1/+1
it's one of those variables that are set to FALSE and not left empty... Change-Id: Ic26888e4e983db625b5943a2c094eacc84fe1331
2019-09-06split msi signing from creation to reduce number of singtool callsChristian Lohmaier1-0/+53
as with private key on crypto-smartcard you'd have to enter your pin over a hundred times while creating full-lang builds and that is not fun. This reduces it to * once for dll/exe (at least in case for mergelib is is less than 350 objects and that doesn't break commandline limits - previously it was set to only sign 20 objects at a time, forcing a pin-entry over 15 times) and * once for main installation set * once for SDK * once for all the helppacks (signing description previously also contained the language, this change drops that to just "<productname> <version> Helppack" and last three are not scattered timewise, but are done after all packaging is complete, so the build only waits twice for user-input. Change-Id: Ibb8bb233e967556f9654573ad30d0ed5883b533f Reviewed-on: https://gerrit.libreoffice.org/78649 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-09-01tdf#127240 Increase a height of checkbox's text in win installerRoman Kuznetsov1-1/+1
Change-Id: I0df5dc4cebb065c509df77b00f16597a28566345 Reviewed-on: https://gerrit.libreoffice.org/78355 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov <antilibreoffice@gmail.com>
2019-08-12Fix typosAndrea Gelmini3-5/+5
Change-Id: Ia51fa09db3db0c00432fc02ef9fe445444aa463b Reviewed-on: https://gerrit.libreoffice.org/77321 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-08-12Fix typosAndrea Gelmini1-2/+2
Change-Id: Icdc486d64283961dad4a1d29ae662d66143f674b Reviewed-on: https://gerrit.libreoffice.org/77320 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-08-06Fix some windows installer's dialog new fonts problemRoman Kuznetsov2-7/+7
Change-Id: Iabb1c04d27bba1a7b3b89be03d0af1ed15951ffc Reviewed-on: https://gerrit.libreoffice.org/77003 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-06-28Removed executable permission on bmp fileAndrea Gelmini1-0/+0
Change-Id: Ie869a02d1df0dc84ca59f3358f839d7e2925e17d Reviewed-on: https://gerrit.libreoffice.org/74789 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-06-27tdf#99891 Update installer fonts to match newer versions of WindowsRoman Kuznetsov6-374/+355
Change-Id: I6f607e44b92ae9958b6013f9292743a1c7b76d34 Reviewed-on: https://gerrit.libreoffice.org/74185 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov <antilibreoffice@gmail.com>
2018-12-24tdf#122302: Set status message when installing KB2999226Mike Kaganski1-1/+1
Change-Id: I414959f0f278792c5cac0c58746faa6b7773e494 Reviewed-on: https://gerrit.libreoffice.org/65593 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-12-17tdf#122134: use CurrentMajorVersionNumber to filter out Windows 10Mike Kaganski3-1/+3
On Windows 8.1, the one that is problematic to tell from Windows 10 (because the latter also exposes its version as 603 to the msiexec), the registry value doesn't exist at HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion but let's play safe and also check for "#6" value just in case. Reference: https://stackoverflow.com/questions/31072543/reliable-way-to-get-windows-version-from-registry Thanks to Mitchell <blazer64@gmail.com> for the idea! Change-Id: Ic907c4d992a7cb1d12e392686c19cd6fd6da3c7c Reviewed-on: https://gerrit.libreoffice.org/65231 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>