summaryrefslogtreecommitdiff
path: root/scp2
AgeCommit message (Collapse)AuthorFilesLines
2019-11-07Partially revert commit 7f0ef81cec7e4f64c7fbfce04372d84871244b11Mike Kaganski4-4/+4
... specifically the bits that disabled installation of components which must have crept into the patch by mistake from another change. Change-Id: Ie67767699a61fd9bced5b7a0595e10e84731bc59 Reviewed-on: https://gerrit.libreoffice.org/82163 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-06-04Register spsupp*.dll during installationMike Kaganski5-4/+45
This registers SharePoint integration libraries using regsvr.exe. Both 32-bit and 64-bit libraries are registered; registration of SharePoint.OpenDocuments is unconditional (subject to ActiveX feature install state), substituting respective MSO component. This only works for 32-bit MSI, because in case of 64-bit MSI, only 64-bit SharePoint DLL is included; this makes the library ~useless in case of 64-bit MSI, because IE needs 32-bit component absent there. Proper solution will be created for master branch. Change-Id: Ic5bf9e7090acfaa17d47cb72b9ebfd483242f656 Reviewed-on: https://gerrit.libreoffice.org/72801 Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com>
2018-08-28Remove Extensions_MySQLConnector junkStephan Bergmann2-20/+0
...left over from 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1 "Moving mysqlc into connectivity as a library". (Apparently, for one, a module's Files that don't exist are ignored, so 8ecf5e1815b5459bc0bbcdfb398d3bd53b0c2861 "Build fix, make install: mysql-connector-ooo extension is gone" removing gid_File_Oxt_MySQLConnector but not gid_Module_Optional_Extensions_MySQLConnector referencing it didn't cause trouble; and for another, an empty module is ignored, so there were no extension-mysql-connector packages generated any more---but better clean up the junk anyway.) Reviewed-on: https://gerrit.libreoffice.org/59669 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 5988d888099d018ca1000bb17341c9529c538649) Change-Id: If598a968dfbbe9b5f16d735e8011e192cbd4178b
2018-06-01tdf#117729 add Frisian (fy) UI langaugeChristian Lohmaier1-0/+6
Change-Id: I46f75e969b1252a95118888507c116f44578dfbd Reviewed-on: https://gerrit.libreoffice.org/54699 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit f8fb04d0af7b1d21b8638e92922d0965e507c5d9) (cherry picked from commit 9bf385b15439f25b89fe7c53a967a0941440226e)
2018-05-31Add entries for Calc.ApplcationTor Lillqvist1-0/+15
Change-Id: Icee6f97abf9182621e43a0039b52c2f2e141fa01 (cherry picked from commit b7939ff897a173086643819451c7b2b4553c11c3)
2018-05-31Add CLSID for Writer.Application and LocalServer32 for thatTor Lillqvist1-0/+15
For Automation clients. Provided in extensions/source/ole/servprov.cxx for an instance of ooo.vba.word.Application. Change-Id: I277f461bf6206f3516b14fabe8b27dc4c06018b5 Reviewed-on: https://gerrit.libreoffice.org/55052 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit 4d9159fac836904b8cb4f3672291367b4c258173)
2018-05-14MSI: do not install LibreLogo by defaultAndras Timar1-1/+1
Change-Id: Ibde24b2045497aca4ea37845fc42c327d22d3d42
2018-04-26Install UCRT from MSUs, not using nested VC Redist installMike Kaganski3-34/+156
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>
2018-04-23scp2: also try VC141_CRT_*.msmMichael Stahl1-0/+19
Apparently the MSMs have been renamed in Visual Studio 2017.3 but only configure was adapted, not scp2. Not sure if these MSMs are still relevant given the new gid_File_Vcredist_Exe thing. Change-Id: I4fe27c8298b3a2024acc62d12ce8ea67e2eca80d Reviewed-on: https://gerrit.libreoffice.org/53319 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-04-12Revert "Add windows start menu entry for Safe Mode"Andras Timar1-23/+0
This reverts commit 1ffc0ddfef403bd7cae3e43a4af368a4db7cc9f7.
2018-03-19MSI cleanup: remove redundant conditionsMike Kaganski1-2/+2
VersionNT is now always greated than 600 (only needs checking in version checking action). ISSETUPDRIVEN and ISSCHEDULEREBOOT are specific to InstallShield and aren't relevant to LibreOffice installer. Change-Id: I6cb769c863e09f1568ae895a6cfbb0e5940c2486 Reviewed-on: https://gerrit.libreoffice.org/46434 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit cfbc934609aaa303d03fd73b58bde1370ea312dc)
2018-03-15Collabora Office OS X packagingAndras Timar1-0/+7
- added EULA (sla.r) in special OS X resource fork format - added volume icon which does not work ATM, TODO later - new dmg background image and adjusted .DS_Store - fixes to tolerate space in app bundle name Change-Id: Ia855d7d677136de951c2b9b31ee8d5583475dd41
2018-03-15don't package 'install' script because it's not for end usersAndras Timar1-8/+0
(cherry picked from commit 74d90488662c55fd5f31b203e02b228137b42076) (cherry picked from commit ccf572e5e4a0a2fe1c3f5b9a166e2d5e4277c83a) Change-Id: I64ea8d8722c9da252c6142a862e9363759d38ba3
2018-03-15OS X: remove LibreOffice readme+license from Collabora Office DMGAndras Timar1-9/+1
Change-Id: Ie62c6a98563261e3601be70ff5eff6603b625445 (cherry picked from commit 08f328e20e85d41793413df6ed653d033b499517) (cherry picked from commit 8988a747cb8937da96f4f2b5164b393fb988f6f5)
2018-01-17tdf#95024 Add user dictionary for hu dict packageLászló Németh2-1/+8
supporting old Hungarian orthography optionally, according to the official 3-year transitional period in schools. Change-Id: Ifbc5583c1e53bc4ac07e73a90e0dd02e159f83e6 Reviewed-on: https://gerrit.libreoffice.org/47398 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 6247c966942a0e43320a234302a67c1f92c2eea7) Reviewed-on: https://gerrit.libreoffice.org/48049 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2018-01-08tdf#108580: integrate vc_redist.exe into MSIMike Kaganski2-1/+33
... in InstallUISequense. Use --with-vcredist-dir to point to a directory with vc_redist.x64.exe and/or vc_redist.x86.exe. Use --without-vcredist-dir (or --with-vcredist-dir=no) if you don't want to ship it as part of installer and want to silence the configure warning. VCRedist 2015 version 14.0.24215.1 is available at https://www.microsoft.com/en-us/download/details.aspx?id=53840 Since VisualStudio 2015, VC redist merge module that we used before started to work differently: it installs the UCRT only on WinXP, but not on later OSes (Vista to 8.1) which may lack the UCRT (Win10 has it out of the box). The merge module only installs VCRuntime on those systems, which still leaves us with "api-ms-*.dll is missing" problem. (https://blogs.msdn.microsoft.com/vcblog/2015/03/03/introducing-the-universal-crt/ gives more information on VCRedist refactoring background.) Since commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a, we use a workaround described at the page mentioned above as "App-local deployment of the Universal CRT". We just copy all UCRT DLLs to LibreOffice/program. This has a drawback though, that our UCRT is not updated by Windows Update, so users would rely on LibreOffice updates in case of some vulnerabilities in UCRT (and they could even not realize they have that problem). MS recommends to install UCRT using EXEs they provide from their site. The EXEs install both VCRuntimes and UCRTs, along with required patches, for all Windows versions (Windows XP through Windows 10, where they only install VCRuntimes); the installed libraries are managed by system's update mechanism. But those EXEs cannot be used in MSI custom actions inside InstallExecuteSequence, because they use MSI themselves. So this patch integrates the vc_redist.xXX.exe into MSI binary table, and uses custom action to run the EXE after ExecuteAction in InstallUISequence. This will show the user a VCRedist install window after the main LibreOffice installation finishes; no user interaction is required (except for one additional UAC request), and errors are ignored. Since this installation takes care of both VCRuntime and UCRT, we can ultimately drop both the app-local workaround, and vcredist merge module (so VCRuntime would also be updated by system). The former is done here: this reverts commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a. This approach has its drawback: if one wants to use unattended installation (without UI; one example is deployment using ActiveDirectory GPO), then InstallUISequence is not run, and so VCRedist isn't installed. In this case, one should install VCRedist separately. Supposedly this should not be huge problem, because this is the case for many existing applications that need separate VCRedist deployment in these scenarios, and unattended installation is advanced stuff that requires prepared user. A notice would be required in release notes and FAQ, though. Change-Id: Ia6a16be60af8a08f41ea7c3dbd457d8f89006006 Reviewed-on: https://gerrit.libreoffice.org/46356 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 61b1d631331551b43bc7d619be33bfbfeff7cad6) Reviewed-on: https://gerrit.libreoffice.org/47603 Tested-by: Jenkins <ci@libreoffice.org>
2017-11-06QT5 rename from KF5Jan-Marek Glogowski2-2/+2
Move out of unx, as this will eventually compile on other OS platforms. At least currently it doesn't contain platform dependant code. Change-Id: Iea0bebf574201881ea158381fe7ba8af2a9a6488
2017-11-06KF5 seperate Qt5 detection from KF5Jan-Marek Glogowski2-2/+2
Splits the configure checks into a Qt5 and KF5 specific part. Change-Id: I0a616ba031e1f7fd0385219ac48179adb4bdaf14
2017-10-24Add Albanian (sq) dictionaryAron Budea3-0/+26
Change-Id: I18b166ae8e08b4509154c2ba035d3e9811e947ec Reviewed-on: https://gerrit.libreoffice.org/43707 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2017-09-03tdf#63913 fix Win explorer multi-select open unnamed docs bugNaeil ZOUEIDI5-22/+22
Multi-select explorer action on Windows defaults FILEOPEN 2 different ODF file type documents as template - e.g. opening two different type of files (ie : ODS & ODF) then doesn't keep the original filenames. So now changing the open command for the different file extensions to the same one "soffice.exe -o %1", will keep the names of the _2_ files as they originally are when they are opened together. Change-Id: I2cd5fcb046f294742e59f69b7bf2a897a6ce0c29 Reviewed-on: https://gerrit.libreoffice.org/36995 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-08-29remove some unused macro definitionsNoel Grandin1-8/+0
Change-Id: I253e5108161b932e3dc588b656e550bb9dc022b0 Reviewed-on: https://gerrit.libreoffice.org/41672 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-08-28tdf#106931 - LibreOffice 5.3 installer doesn't honor UI_LANGS propertyJuergen Funk1-2/+2
The patch 0a76a41ae7a2ebd53f80f01ea9e2bcff3026d155 disable the CustomAction "SelectLanguage" when the MSI-Property ADDLOCAL is set, This patch set the the CustomAction when the Property "UI_LANGS" is set, then the CustomAction execute Change-Id: I254a44909e32fb7969a6e9f71adf4659d376523c Reviewed-on: https://gerrit.libreoffice.org/39379 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2017-08-21updater: also write channel to version.ini outside of instdirMarkus Mohrhard1-0/+9
Change-Id: Ibb087fc9cd17e50accf78f805e0fec4f202334b1
2017-08-17use correct final language dir namesCaolán McNamara1-1/+4
Change-Id: Iafbdf4961a35809d3c6a778a3292b70456b55913 Reviewed-on: https://gerrit.libreoffice.org/41250 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-08-11Revert "Build with kde5, first stab"Katarina Behrens2-2/+2
this was meant to go to a feature branch *sigh it must be Friday
2017-08-11Build with kde5, first stabKatarina Behrens2-2/+2
this is largely based on jmux's work Change-Id: I5897f3ecb90f83a29e0824bfe7a0ea875347e360
2017-07-21migrate to boost::gettextCaolán McNamara15-239/+87
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl * all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string") * ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching MODULE .mo files * UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui goes from l10n target to normal one, so the res/lang.zips of UI files go away * translation via Translation::get(hrc-define-key, imbued-std::locale) * python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there to keep finding the .hrc file uniform) so magic numbers can go away there * java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation mechanism * en-US res files go away, their strings are now the .hrc keys in the source code * remaining .res files are replaced by .mo files * in .res/.ui-lang-zip files, the old scheme missing translations of strings results in inserting the english original so something can be found, now the standard fallback of using the english original from the source key is used, so partial translations shrink dramatically in size * extract .hrc strings with hrcex which backs onto xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap * extract .ui strings with uiex which backs onto xgettext --add-comments --no-wrap * qtz for gettext translations is generated at runtime as ascii-ified crc32 of content + "|" + msgid * [API CHANGE] remove deprecated binary .res resouce loader related uno apis com::sun::star::resource::OfficeResourceLoader com::sun::star::resource::XResourceBundleLoader com::sun::star::resource::XResourceBundle when translating strings via uno apis com.sun.star.resource.StringResourceWithLocation can continue to be used Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
2017-06-16Tubes is goneCaolán McNamara1-1/+0
Change-Id: I5622786c5192ea7a5225f3b9cd81a4b6a0dae594 Reviewed-on: https://gerrit.libreoffice.org/38877 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-06-13remove TDE integration (vclplug, address book, config backend)Michael Stahl6-66/+0
It has ~no users, can't even be built on modern Linuxes, and it annoys folks who want to refactor VCL. Per ESC decision from 2017-06-08, remove --enable-tde and --enable-tdeab. Change-Id: I51ce4786f29f8fcac2e2bb2a654c41fbfbbd8afd Reviewed-on: https://gerrit.libreoffice.org/38718 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-06-06scp2: package 64-bit MSVC runtimes for explorer extensionsMichael Stahl4-22/+11
... and add BUILD_X64 conditional. Change-Id: Id512368dfd9dece583ead5aae1924db96f8a2a40 Reviewed-on: https://gerrit.libreoffice.org/38366 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-06-02scp2: move package desktop_scripts_install to AutoInstallMichael Stahl1-32/+0
Change-Id: I96baefdb6511f4bd632a0044b26074834615bc57
2017-06-02scp2: oops, forgot to add some commasMichael Stahl1-2/+2
(regression from 203c12c7ce5f54971755fb6fb2f04ec36e7797c4) Change-Id: I2089300758025fc4ecc079c1435aa572e5d9c0ab
2017-06-02scp2: remove all ComponentConditions that test Windows versionsMichael Stahl8-61/+5
Windows 7 (6.01) has all the features we want. Change-Id: I96356b2decb26af526bceda8081875d418f17274
2017-06-02scp2: merge explorer extension modulesMichael Stahl3-9/+1
Don't need to check the Windows version any more. Change-Id: I774e68b6b3a07684e60532f9d76b9af6d2ea28cf
2017-06-02scp2: move fonts to AutoInstallMichael Stahl5-116/+15
Add new PACKAGE_FILELIST_FONT The DONT_DELETE style has no effect for files. The FONT_WARN_IF_EXISTS style has no effect. Change-Id: Id062ada0a680341c01827e457b1166d625afe8cc
2017-06-02scp2: replace PACKAGE_FILELIST_DIR macro with SDK_PACKAGE_FILELISTMichael Stahl3-10/+9
Change-Id: I3632c618e385d3f9963637c26d94b8395d5b8cb5
2017-06-02gbuild: AutoInstall: allow per-module Package templateMichael Stahl1-26/+26
Change-Id: I83404709ae7bd3f4683ea9dab8d3f0e0875bc10f
2017-06-01merge ofa res file into svt oneCaolán McNamara2-3/+0
Change-Id: I3f22301e4301ab90e4a1090f2c47cf2403422282 Reviewed-on: https://gerrit.libreoffice.org/38309 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-06-01tdf#90753 scp2: move image packages to AutoInstallMichael Stahl4-17/+4
Fixes regression from 73661c6f0f78964633a74f487d6bb7c0922d00dc Not sure why these need their own scp2 Module Change-Id: I26386a5105b8244eacfcb1760091e8806c55abd8
2017-05-28rdm#2247 enable Upper Sorbian for languagepack/UIChristian Lohmaier1-0/+6
Change-Id: Id497d8032668823c6db07eb179ad4484241b7285
2017-05-25fix packagingJochen Nitschke2-9/+0
after commit da543e4efbb53e25a60f8557a0b8cd307e46ebf4 convert starbasic wizards to .properties for translations Change-Id: Iccc7a39776781c85d1c2f3160ff03876ae6c5762 Reviewed-on: https://gerrit.libreoffice.org/38040 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-05-15tdf#100837: advertise app URL capabilitiesMike Kaganski6-0/+15
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 Lohmaier2-1/+10
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 Kaganski1-1/+1
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 McNamara2-0/+2
Change-Id: I38f734af566e954532c288434be84a8553e76b9c
2017-04-29tdf#107464 editeng ui files not packed in install setsCaolán McNamara1-0/+2
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 McNamara1-1/+0
Change-Id: Id9c7106d2674a661b16b7772f866b3d103bae327
2017-04-27remove wizards bitmaps from .src filesCaolán McNamara1-2/+0
Change-Id: I4e334ac88e1e060bc07af9b174b9b8fb1401fc80
2017-04-26remove extensions bitmaps from .src filesCaolán McNamara1-4/+0
resulting in the removal of a updchk .res file Change-Id: I7a6f3601f25763253ba34590a1970ca8a042db23
2017-04-25tdf#106359: register text/x-ms-iqy MediaType default extensionMike Kaganski2-0/+22
Change-Id: I63be77c4e148befa8f41086163ea2919b1e8baac Reviewed-on: https://gerrit.libreoffice.org/36942 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Jenkins <ci@libreoffice.org>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 13:42:36 +0000