summaryrefslogtreecommitdiff
path: root/scp2
AgeCommit message (Collapse)Author
2021-10-26Install UCRT from MSUs, not using nested VC Redist installMike Kaganski
Using nested install is bad because (1) MS advises against it (though it most possibly doesn't relate to our specific case, when we install the vc redist exe package in UI part, so actually only a single MSI session is active at any time); (2) because it adds some extra interactions (user sees something "unrelated" being installed, which raises concerns; additional admin authentication required); and (3) because it runs in InstallUISequence, thus only installing the UCRT when doing interactive installation (unattended installs, including GPO, need to install UCRT separately). This patch aims to incorporate the original UCRT MSU (Windows Update) packages (https://support.microsoft.com/en-us/help/2999226) available as a zip archive from https://www.microsoft.com/en-us/download/details.aspx?id=48234 - the same as used in VC redists for VS 2015 and 2017. This obsoletes the separate installation of the redist; since we also have the redist as merge module in our MSI, that is enough (and removes redundancy). The MSUs are installed using wusa.exe in a custom action (deferred, non-impersonating). As a small bonus, embedding MSUs instead of redist EXE allows us to shrink the size of installer a little (~10 MB). As deferred custom actions cannot access current installer database, we workaround this by using initial immediate impersonating action to extract the binaries into a temporary location. To ensure that the file gets removed upon completion (both successful and failed), we use an additional cleanup action. Commit 61b1d631331551b43bc7d619be33bfbfeff7cad6 is effectively reverted. This commit also includes changes from commits from master: 8faa1bc61fa8f09365d483364aea2b1c2751b587 1f8a3657216e44796cb94087450552aa977ebdae 378c1576d2890625ebbd18ec9ccff560eeb1619f Change-Id: I1529356fdcc67ff24b232c01ddf8bb3a31bb00bd Reviewed-on: https://gerrit.libreoffice.org/53332 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-12-14always install fc_local.conf on linuxDavid Tardon
... as it is now used for OpenSymbol too. Change-Id: I36628dcb9591c4098d8c360d2b8359bfc8d58dc8 Reviewed-on: https://gerrit.libreoffice.org/46429 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-12-11fix mac build wrt fontconfig conf fileCaolán McNamara
Change-Id: Ic13ea258773ad68ba295d29078eaf69365f951c9 Reviewed-on: https://gerrit.libreoffice.org/46086 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-12-01fix installset packaging after fc_local.conf moveChristian Lohmaier
Change-Id: I77de58c3dd532df895c7e7e172515df929859f25
2017-06-06scp2: package 64-bit MSVC runtimes for explorer extensionsMichael Stahl
Not a backport because master is a bit too refactored now. Change-Id: I1eccb99252fb66dc1fcc9cb5af978c61717ff629 Reviewed-on: https://gerrit.libreoffice.org/38365 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-05-29rdm#2247 enable Upper Sorbian for languagepack/UIChristian Lohmaier
Change-Id: Id497d8032668823c6db07eb179ad4484241b7285 (cherry picked from commit 826f1bca40a01f0a249d5b6cbb7c39c11638a060) Reviewed-on: https://gerrit.libreoffice.org/38113 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-05-15tdf#100837: advertise app URL capabilitiesMike Kaganski
This is required to be able to use handlers when invoked from Office Web Apps (on Win7+) Change-Id: I242111ad365f5cb350b78b75300ddbe8b708b357 Reviewed-on: https://gerrit.libreoffice.org/37624 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-05-12register helpimages target and package into lobasis-imagesChristian Lohmaier
Change-Id: I75f688c03890896852598b1a7e93dcd6fb8fedce Reviewed-on: https://gerrit.libreoffice.org/37512 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-05-02tdf#106359: missing leading dotMike Kaganski
Change-Id: Ibfcbeb0778d9000dad8097384d7f5c7d75be2252 Reviewed-on: https://gerrit.libreoffice.org/37152 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-04-29some other places uiconfig_editeng should appearCaolán McNamara
Change-Id: I38f734af566e954532c288434be84a8553e76b9c
2017-04-29tdf#107464 editeng ui files not packed in install setsCaolán McNamara
Change-Id: I8b4c2753e56c79348e42f8b9b56f19d7424dd70c Reviewed-on: https://gerrit.libreoffice.org/37104 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-04-27sdbcl is goneCaolán McNamara
Change-Id: Id9c7106d2674a661b16b7772f866b3d103bae327
2017-04-27remove wizards bitmaps from .src filesCaolán McNamara
Change-Id: I4e334ac88e1e060bc07af9b174b9b8fb1401fc80
2017-04-26remove extensions bitmaps from .src filesCaolán McNamara
resulting in the removal of a updchk .res file Change-Id: I7a6f3601f25763253ba34590a1970ca8a042db23
2017-04-25tdf#106359: register text/x-ms-iqy MediaType default extensionMike Kaganski
Change-Id: I63be77c4e148befa8f41086163ea2919b1e8baac Reviewed-on: https://gerrit.libreoffice.org/36942 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-04-21gbuild: Remove MSVC 2013 legacy codeDavid Ostrovsky
Uwinapi is discontinued. Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01 Reviewed-on: https://gerrit.libreoffice.org/23198 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org>
2017-04-14remove the old collaboration feature based on telepathyMarkus Mohrhard
Change-Id: I1f08d6ef43b76e7bae41ac33bb954f506ae7c485 Reviewed-on: https://gerrit.libreoffice.org/36542 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-04-06tdf#106359: register .iqy in MSI and treat them as templatesMike Kaganski
Change-Id: I7ae94c7717fbea03d96c539e05eeb565bafefd9f Reviewed-on: https://gerrit.libreoffice.org/36188 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-03-19scp2: Removed unused Directory itemsStephan Bergmann
Change-Id: Ib095e8eb9f9b79864f6a50557994f4d24f0bd2a4
2017-03-16Remove extra spaceStephan Bergmann
Change-Id: I147e6a79dff0047be0878ef755e47e2d408cec02
2017-03-16Revert "Don't package unoinfo in case of Mac OS X like app structure"Stephan Bergmann
This reverts commit 3a663f7a4580b97518aee4e0c797b549c67ef1a5. Whatever that commit was supposed to be good for, not packaging unoinfo on macOS breaks functionality, see e.g. <https://bugs.documentfoundation.org/show_bug.cgi?id=106292#c10> comment 10 to "XMessageBox#execute() in Java fails to draw a window on macOS Sierra".
2017-03-14No need for --disable-activex and --disable-atl any longerTor Lillqvist
Change-Id: I7ac4f32cb01bfcc3a2c06e69280c2150d408ec6b Reviewed-on: https://gerrit.libreoffice.org/35174 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2017-03-06Remove one more MinGW leftoverStephan Bergmann
i.e., WNT=OS implies MSVC Change-Id: I87b02dcbfe74405326b60f49bceaf99de7c56b83 Reviewed-on: https://gerrit.libreoffice.org/34920 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-02-15Support MSVC 15.0David Ostrovsky
New compiler changes quite some stuff: * Compiler detection done based on different registry key * .NET SDK detection done based on different registry key * Msbuild installation directory changed * Merge modules installation directory changed * SDK number in registry doesn't match the directory name: (registry key: 10.0.14393, directory name: 10.0.14393.0) * Compiler, include and library location directories changed * Architecture specific directory changed: x64 instead of amd64 * Compiler own include directory must be added with -I option * To force usage of SDK 10 (8.1 is selected per default) new switch WindowsTargetPlatformVersion is passed to msbuild, to avoid patching VC project files with this line: <WindowsTargetPlatformVersion><SDK>/WindowsTargetPlatformVersion> Known issues: * Firebird is broken: http://paste.openstack.org/show/594333 Change-Id: I148d7932aff43bbbd07bd493504df974726234c2 Reviewed-on: https://gerrit.libreoffice.org/31279 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Ostrovsky <david@ostrovsky.org>
2017-02-13AutoInstall oox filter data packages to ooo moduleMatúš Kukan
Change-Id: Ib7b0773ee2b347d81d3f8894ea3063c6d6f18d90 Reviewed-on: https://gerrit.libreoffice.org/34168 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-02-10Remove MinGW supportStephan Bergmann
In OOo times, there'd originally been efforts to allow building on Windows with MinGW. Later, in LO times, this has been shifted to an attempt of cross- compiling for Windows on Linux. That attempt can be considered abandoned, and the relevant code rotting. Due to this heritage, there are now three kinds of MinGW-specific code in LO: * Code from the original OOo native Windows effort that is no longer relevant for the LO cross-compilation effort, but has never been removed properly. * Code from the original OOo native Windows effort that is re-purposed for the LO cross-compilation effort. * Code that has been added specifially for the LO cross-compilation effort. All three kinds of code are removed. (An unrelated, remaining use of MinGW is for --enable-build-unowinreg, utilizing --with-mingw-cross-compiler, MINGWCXX, and MINGWSTRIP.) Change-Id: I49daad8669b4cbe49fa923050c4a4a6ff7dda568 Reviewed-on: https://gerrit.libreoffice.org/34127 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-02-02drop bundled ooo2gd (Google Docs) extensionDavid Tardon
LibreOffice has had direct support for Google Drive since (I think) 5.1, via libcmis. Change-Id: I7587923b3fd7dd505124b790066cdaa99a858af1 Reviewed-on: https://gerrit.libreoffice.org/33822 Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2017-01-27SafeMode: Add Backup config to installationSamuel Mehrbrodt
has been only active in instdir so far Change-Id: I1028d1acb2186347448a1f86aaa864c3ba88f75d Reviewed-on: https://gerrit.libreoffice.org/33584 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-01-27Put crash directory config in soffice.ini, instead of own ini fileSamuel Mehrbrodt
Change-Id: I3a7aa394792c47c6c5a3a553174d177e66ade617 Reviewed-on: https://gerrit.libreoffice.org/33582 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-01-24Crashdump: Make crash directory configurableSamuel Mehrbrodt
Change-Id: I8106ec674080ede7072581dab2e6700040de5828 Reviewed-on: https://gerrit.libreoffice.org/33032 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-01-13Remove unused ini propertiesSamuel Mehrbrodt
Change-Id: Iea95f5975968f73e2e4aea34246c83f384341592 Reviewed-on: https://gerrit.libreoffice.org/33000 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-01-09tdf#90753 scp2: move firebirdsdbc packages to AutoInstallMichael Stahl
Change-Id: Ifabb9fa65115fcc1728fa16e142ef008834eedda
2017-01-07Clean up stale merge modulesDavid Ostrovsky
Change-Id: I2489238d5295650a3c51581a037185440f641005 Reviewed-on: https://gerrit.libreoffice.org/32797 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2016-12-25scp2: Bin not used definesMatúš Kukan
Change-Id: I4d2fe64fb8635bb87c9eb3b3f5b98227811cea03
2016-12-25tdf#90753: AutoInstall libreofficekit_selectionhandles packageMatúš Kukan
Change-Id: I9998f3dcd6725a49aa2c083eac0de1f970b167e0
2016-12-24tdf#90753: AutoInstall shell_senddoc packageMatúš Kukan
Change-Id: I6cc638c460a8baa2cd9d29c3b82418b6ecfb630d Reviewed-on: https://gerrit.libreoffice.org/32397 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Matúš Kukan <matus@libreoffice.org>
2016-12-24tdf#90753: AutoInstall xpdfimport_err.pdf as filelistMatúš Kukan
Change-Id: Icfebcbf3cb738cb376a5ee97cd21a27a25c0bf35 Reviewed-on: https://gerrit.libreoffice.org/32396 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Matúš Kukan <matus@libreoffice.org>
2016-12-24tdf#90753: AutoInstall postgresql-sdbc.ini as filelistMatúš Kukan
Change-Id: I908b549a14c702ce2c33de704b06d016036ccecb Reviewed-on: https://gerrit.libreoffice.org/32394 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Matúš Kukan <matus@libreoffice.org>
2016-12-12gid_File_Bin_Gnome_Open_Url was removedMatúš Kukan
..in eaa7f30102df4df01171e5daf83cdddae1bb0cda Change-Id: I149ee4087dffe54fd63bacd3bb5aba67159fac72
2016-12-02scp2: Bin not defined gids and not used definesMatúš Kukan
And a little cleanup. Change-Id: Id066b4d37e217b8ab21ea162c23a999566a9e190
2016-12-02tdf#90753: AutoInstall readlicense_oo packagesMatúš Kukan
Change-Id: I5bd3a5f6168b20c925f5713085fcb0918bcccc8e
2016-12-02tdf#90753: AutoInstall setup_native packagesMatúš Kukan
Change-Id: Iecf059b974b996fceb57b04197c7dac9b7c8dd47
2016-12-01tdf#90753: AutoInstall gengal with filelist featureMatúš Kukan
Change-Id: Ic72fb18eccb54b24f4205d997585cee753965b10
2016-11-30tdf#90753: AutoInstall more packagesMatúš Kukan
Change-Id: If8a52f652f7ab890826372b6d081ee19c69fb5ec Reviewed-on: https://gerrit.libreoffice.org/31371 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-11-30tdf#90753: Autoinstall sdk packagesMatúš Kukan
Change-Id: I54de722335d443813cb4526716c0101a049db03f Reviewed-on: https://gerrit.libreoffice.org/31370 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-11-30Remove Noto Emoji fontAkshay Deep
Conflicts: Makefile.fetch download.lst external/more_fonts/Module_more_fonts.mk scp2/source/ooo/file_font_ooo.scp scp2/source/ooo/module_hidden_ooo.scp Change-Id: Ic43807cde11fff21d78bece6874783ba154655a2 Reviewed-on: https://gerrit.libreoffice.org/31390 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2016-11-29EMOJI CONTROL: Add EmojiOne font for Emoji SupportAkshay Deep
Noto Emoji does not provide glyphs for all emojis in the toolbar Change-Id: If3f3ea6e12f0b8824cb95e3db78c3c7aced4de8b Reviewed-on: https://gerrit.libreoffice.org/31215 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2016-11-26tdf#90753: Move extras packages to AutoInstallMatúš Kukan
Change-Id: I3e1504bb8a68a6142ab4035b2cb81c03d9af9227
2016-11-25tdf#90753: Move brand packages to AutoInstallMatúš Kukan
gid_Brand_File_Bin_Soffice_Bin_Manifest was removed in 26bddf3e80865d847f52e649ab60f97269177a3e Change-Id: Iff5314e8c3c6191556c082bc30938dd177b254fc
2016-11-25scp2: ICU was moved to AutoInstallMatúš Kukan
..in e759269e373fa02d3e8566d1edc9fb9526de6640 Change-Id: I670cd35f64f1784b4150a8c3ab310bd1c88e6ed0
generated by cgit (git 2.34.1) at 2024-06-19 09:55:55 +0000