summaryrefslogtreecommitdiff
path: root/scp2
AgeCommit message (Collapse)Author
2017-12-18tdf#108580: integrate vc_redist.exe into MSIMike Kaganski
... 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>
2017-12-15MSI cleanup: remove redundant conditionsMike Kaganski
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>
2017-12-14Fix typosAndrea Gelmini
Change-Id: I09e511f35d32b25683811f3a39c833779f3b61fe Reviewed-on: https://gerrit.libreoffice.org/46370 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-11-06QT5 rename from KF5Jan-Marek Glogowski
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 Glogowski
Splits the configure checks into a Qt5 and KF5 specific part. Change-Id: I0a616ba031e1f7fd0385219ac48179adb4bdaf14
2017-10-24Add Albanian (sq) dictionaryAron Budea
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 ZOUEIDI
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 Grandin
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 Funk
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 Mohrhard
Change-Id: Ibb087fc9cd17e50accf78f805e0fec4f202334b1
2017-08-17use correct final language dir namesCaolán McNamara
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 Behrens
this was meant to go to a feature branch *sigh it must be Friday
2017-08-11Build with kde5, first stabKatarina Behrens
this is largely based on jmux's work Change-Id: I5897f3ecb90f83a29e0824bfe7a0ea875347e360
2017-07-21migrate to boost::gettextCaolán McNamara
* 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 McNamara
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 Stahl
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 Stahl
... 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 Stahl
Change-Id: I96baefdb6511f4bd632a0044b26074834615bc57
2017-06-02scp2: oops, forgot to add some commasMichael Stahl
(regression from 203c12c7ce5f54971755fb6fb2f04ec36e7797c4) Change-Id: I2089300758025fc4ecc079c1435aa572e5d9c0ab
2017-06-02scp2: remove all ComponentConditions that test Windows versionsMichael Stahl
Windows 7 (6.01) has all the features we want. Change-Id: I96356b2decb26af526bceda8081875d418f17274
2017-06-02scp2: merge explorer extension modulesMichael Stahl
Don't need to check the Windows version any more. Change-Id: I774e68b6b3a07684e60532f9d76b9af6d2ea28cf
2017-06-02scp2: move fonts to AutoInstallMichael Stahl
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 Stahl
Change-Id: I3632c618e385d3f9963637c26d94b8395d5b8cb5
2017-06-02gbuild: AutoInstall: allow per-module Package templateMichael Stahl
Change-Id: I83404709ae7bd3f4683ea9dab8d3f0e0875bc10f
2017-06-01merge ofa res file into svt oneCaolán McNamara
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 Stahl
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 Lohmaier
Change-Id: Id497d8032668823c6db07eb179ad4484241b7285
2017-05-25fix packagingJochen Nitschke
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 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>
generated by cgit (git 2.34.1) at 2025-01-30 10:26:56 +0000