summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)Author
2018-02-09clang-format: improve error message when CI failsMiklos Vajna
Don't just tell the problem but hint how to fix it. Change-Id: I9d079ee7d4ed61266e22a3fa21efe10366724645 Reviewed-on: https://gerrit.libreoffice.org/49471 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-02-09Remove dead Executable_genlangStephan Bergmann
...originally introduce with 999c68f12f1d95b16a97294949a0e6ba6d3ba259 "genLang project (awareness)", but apparently never took off. Change-Id: I6f61271a75d96750dea63de596b7745c2f589b83 Reviewed-on: https://gerrit.libreoffice.org/49389 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-02-08Adapt solenv/flatpak-manifest.in to apache-ant-1.10.2Stephan Bergmann
...that apparently made the URL for apache-ant-1.10.1 become 404. (Again, the sha512 for the new version is as given at <http://ant.apache.org/bindownload.cgi>.) (Asked at <http://mail-archives.apache.org/mod_mbox/ant-user/201802.mbox/ %3C039da509-898d-53f5-4c35-ecfa6b6bef18%40redhat.com%3E> "Stable link to apache-ant-*-bin.tar.xz?" whether there's any better link that I could use, to avoid having to constantly track the latest revision of Ant here.) Change-Id: Ic13732d172ade9337f006d4495f066fdd52302a1
2018-02-08fix oss-fuzz buildCaolán McNamara
Change-Id: I9ca03f1b39906cc416e77fe74a07bda04388f166
2018-02-08xmlsecurity: fold Library_xsec_fw into Library_xmlsecurityMiklos Vajna
That little amount of code hardly justifies a separate library. Change-Id: Idbb039f38258bc12759fcf6d29328e1afe7443ab Reviewed-on: https://gerrit.libreoffice.org/49391 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-02-07solenv: adapt native-code.py to recent xmlsecurity changesMiklos Vajna
/tmp/native-code-95f2b3.o:native-code.cxx:lo_get_factory_map::map: error: undefined reference to 'xmlsecurity_component_getFactory' clang++: error: linker command failed with exit code 1 (use -v to see invocation) ../Bootstrap/Makefile.shared:61: recipe for target 'obj/local/armeabi-v7a/liblo-native-code.so' failed make[2]: *** [obj/local/armeabi-v7a/liblo-native-code.so] Error 1 /home/vmiklos/git/libreoffice/master-android/android/CustomTarget_lo_android.mk:17: recipe for target '/home/vmiklos/git/libreoffice/master-android/workdir/CustomTarget/android/source/done' failed Change-Id: Idd63986122216c0fb1822ea7a3fbec00d00b444b
2018-02-04xmlsecurity: create DocumentDigitalSignatures instances with a constructorMiklos Vajna
Change-Id: I9780438c3b7f8206fad3bfe29e93d1fcf535b811 Reviewed-on: https://gerrit.libreoffice.org/49199 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-02-04gbuild-to-json: unblacklist extensionsMike Kaganski
Change-Id: I6accb1b363804a2935c92d471f7baff31771b5a0 Reviewed-on: https://gerrit.libreoffice.org/49202 Reviewed-by: jan iversen <jani@libreoffice.org> Tested-by: jan iversen <jani@libreoffice.org>
2018-02-01Fix typosAndrea Gelmini
Change-Id: I5cfa53bbe82fc3611770fdbe3b58d593f7a7c89f Reviewed-on: https://gerrit.libreoffice.org/49100 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2018-02-01deps w/ hardlinks: don't create it as foo_ only to move it to fooChristian Lohmaier
this breaks with CCACHE_HARDLINK=1 on close-enough rebuilds, as there will be "foo" from previous run (hardlinked to ccache-dir), and foo_ will be hardlink to the same file, resulting in mv to barf out since foo_ and foo are the same file (and -f/force doesn't help in this case) Change-Id: Iaefcec05b34dad88f49477693e2157c1ca0623ac Reviewed-on: https://gerrit.libreoffice.org/42586 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-01-30Don't let PythonTest_solenv_python fail due to Emacs lock files in SRCDIRStephan Bergmann
Emacs has a habit of placing lock files next to files being edited, which are actually dangling symlinks not pointing at actual files, but where the symlink content itself encodes some information about who locked the file. When such a lock file happens to be present in the source tree during `make PythonTest_solenv_python`, the latter fails because shutil.copytree by default copies files pointed at by symlinks, instead of the symlinks themselves, and causes an error if that fails. An alternative fix would be to call shutil.copytree with symlinks=true (copy symlinks, not the files pointed at) or ignore_dangling_symlinks=true (don't fail if a dangling symlink can't be copied). But for now just don't copy any of those additional files that Emacs likes to place next to edited files (and which are also all ignored in our .gitignore). Change-Id: Ib731a5395fe8d40767878c17b1fb422b914bb329 Reviewed-on: https://gerrit.libreoffice.org/48898 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-01-24Natvis: update SfxItemSet visualizer (m_pItems is now unique_ptr)Mike Kaganski
Change-Id: I862f6399a9a065ef725211b44f77400927db9a8f Reviewed-on: https://gerrit.libreoffice.org/48496 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-01-24Adapt solenv/flatpak-manifest.inStephan Bergmann
...to e1026e267b4b1b0b0bd645c6bc212d6fa71544f8 "pdfium: update to 3312" Change-Id: I319b00d13d8657849967e08e605d6428f30c5c2e
2018-01-24Globally disable -Wcast-function-type new with upcoming GCC 8Stephan Bergmann
...which unhelpfully even warns on reinterpret_cast, so causes failures like > [CXX] sal/osl/unx/signal.cxx > sal/osl/unx/signal.cxx: In function ‘bool onInitSignal()’: > sal/osl/unx/signal.cxx:267:50: error: cast between incompatible function types from ‘void (*)(int, siginfo_t*, void*)’ to ‘{anonymous}::Handler1’ {aka ‘void (*)(int)’} [-Werror=cast-function-type] > oact.sa_sigaction); > ^ And since all incompatible (but deliberate) casts between function types across our code base should already be written as reinterpret_cast, we shouldn't lose much by just disabling this new warning globally. Change-Id: If15e9606e8fdc676b61012e31d7369653951ceca Reviewed-on: https://gerrit.libreoffice.org/48431 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-01-23new loplugin: pointerboolNoel Grandin
look for possibly bogus implicit conversions to bool when passing (normally pointer) args to bool params. this plugin comes in the wake of a couple of bugs caused by refactoring, where some of the call sites were not currently updated. Of the changes, the following are real bugs: desktop/../dp_persmap.cxx StartInputFieldDlg in sw/../fldmgr.cxx which occurred as a result of commit 39d719a80d8c87856c84e3ecd569d45fa6f8a30e Date: Tue May 3 11:39:37 2016 +0200 tdf#99529 sw: don't pop up input field dialog before inserting field CSerializationURLEncoded::encode_and_append in forms/../serialization_urlencoded.cxx XclExpCFImpl::XclExpCFImpl in sc/../xecontent.cxx I have no idea how to properly fix this, just made a guess. SwDocTest::test64kPageDescs in sw/qa/core/uwriter.cxx which looks like a simple copy/paste error. Change-Id: I795ebd5ef485a1d36863dc27fe13832989f5a441 Reviewed-on: https://gerrit.libreoffice.org/48291 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-01-22gbuild: always compile as C++17 with MSVC 2017Michael Stahl
The current update MSVC 2017.5 supports fancy new C++ features, but unfortunately in its default C++14 mode it falls over and dies with an internal compiler error as soon as it sees the WeakImplHelper variadic template. In order to work around the ICE, build everything as C++17, which somehow doesn't crash. This causes loads of deprecation warnings about obsolete std::this and badly designed std::that, almost all of them from boost headers, which are well known for following every best practice in the C++ book. Liberally sprinkle macros around to suppress the warnings for now, like we already do with the other million warnings from boost headers. Change-Id: Ia6b6ef5e457b5fe3c8cfe361ba5da39376bb7c4c Reviewed-on: https://gerrit.libreoffice.org/48225 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-01-22update flatpak-manifestDavid Tardon
Change-Id: If97c2f8826cbbd83821d9211040f1857e1a1e17f
2018-01-22boost: upgrade to release 1.66.0Michael Stahl
This claims to support Visual Studio 2017.4, but not the current 2017.5. * remove boost.auto_link.patch; it does not apply; not sure why we need this if we can just define BOOST_ALL_NO_LIB (see commit 7f2e168421c3cd928a31a52a8b5afe97e931d3ba) * remove some hunks from clang-cl.patch.0 that look fixed upstream * add a global workaround for spurious GCC warning: oox/source/drawingml/shape.cxx:921:54: error: ‘oShadowColor.boost::optional_detail::tc_optional_base<int>::m_storage’ may be used uninitialized in this function [-Werror=maybe-uninitialized] aFormat.Color = *oShadowColor; Change-Id: I1eb1d8b66554a84a7d7269f1faaa98695fe2f501 Reviewed-on: https://gerrit.libreoffice.org/48187 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-01-19gbuild: disable gb_COLOR on WNT for nowMichael Stahl
The Cygwin terminal swallows colorful error messages, which is unhelpful. Change-Id: I2005994eb76fdba1dc49efc2988e38ac460d6724
2018-01-19new loplugin:emptyifNoel Grandin
Change-Id: I1092115a0ceb3a5e6680a4b724b129f98a892c42 Reviewed-on: https://gerrit.libreoffice.org/48128 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-01-19Fix typosAndrea Gelmini
Change-Id: Icadf5cb88024b8889d49dc9c5210d0de8deaed3b Reviewed-on: https://gerrit.libreoffice.org/48172 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2018-01-18android: use unified headers and llvm-c++ STL (x86) with NDK 16Christian Lohmaier
gnustl (and others) are to be removed in future versions of the ndk also bump gradle and build-tools to current versions along with it arm unfortunately crashes with llvm-c++, so keep with gnustl for now/fix that later Change-Id: Ic794c3293b599b77ec48096bf3283a99c09cbb79 Reviewed-on: https://gerrit.libreoffice.org/45163 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-01-18clang-format: allow just listing formatted filesMiklos Vajna
Without running clang-format on them. Also format one file at a time, so we don't run into command line length limits as the number of formatted files grows. Change-Id: Ie559d566db784e04965678f056dcb81cefe95378 Reviewed-on: https://gerrit.libreoffice.org/48085 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-01-14Fix typosAndrea Gelmini
Change-Id: Icc5fc590a6a90e30afa5f61028d4dd0279fbe120 Reviewed-on: https://gerrit.libreoffice.org/47861 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2018-01-14Save full file path to pot filesGabor Kelemen
As requested here: http://nabble.documentfoundation.org/libreoffice-l10n-Pootle-source-file-paths-not-available-anymore-td4229127.html This adds the full source file path in case of .hrc and .ui files to the generated pot, relatie to srcdir. So instead of personalization.hrc:31 we can have cui/inc/personalization.hrc:31 for better context for translators. Since this is only in comment this will not change the translated status of strings. TODO: the other file formats we use are not affected by this. Change-Id: Id436d66698c93e07c46bf9c20601c5b480eadd0b Reviewed-on: https://gerrit.libreoffice.org/46591 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2018-01-12Enable loplugin:cstylecast for some more casesStephan Bergmann
...mostly of C-style casts among arithmetic types, and automatically rewrite those into either static_cast or a functional cast (which should have identical semantics, but where the latter probably looks better for simple cases like casting a literal to a specific type, as in "sal_Int32(0)" vs. "static_cast<sal_Int32>(0)"). The main benefit of reducing the amount of C-style casts across the code base further is so that other plugins (that have not been taught about the complex semantics of C-style cast) can pick those up (cf. the various recent "loplugin:redundantcast" commits, which address those findings after this improved loplugin:cstylecast has been run). Also, I found some places where a C-style cast has probably been applied only to the first part of a larger expression in error (because it's easy to forget parentheses in cases like "(sal_uInt16)VOPT_CLIPMARKS+1"); I'll follow up on those individually. The improved loplugin:cstylecast is careful to output either "(performs: static_cast)" or "(performs: functional cast)", so that compilerplugins/clang/test/cstylecast.cxx can check that the plugin would automatically rewrite to one or the other form. To allow fully-automatic rewriting, this also required loplugin:unnecessaryparen to become a rewriting plugin, at least for the parens-around-cast case (where "((foo)bar)" first gets rewritten to "(static_cast<foo>(bar))", then to "static_cast<foo>(bar)". Rewriting could probably be added to other cases of loplugin:unnecessaryparen in the future, too. (The final version of this patch would even have been able to cope with 361dd2576a09fbda83f3ce9a26ecb590c38f74e3 "Replace some C-style casts in ugly macros with static_cast", so that manual change would not have been necessary after all.) Change-Id: Icd7e319cc38eb58262fcbf7643d177ac9ea0220a Reviewed-on: https://gerrit.libreoffice.org/47798 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-01-12Support `make SdiTarget_...`Stephan Bergmann
Change-Id: I23dc4511a6f9f962adc8436ceb1a5b24823fb8e5 Reviewed-on: https://gerrit.libreoffice.org/47788 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-01-10gbuild: print a better error message when adding non-existing ModuleMichael Stahl
A confusing message "Corrupted module target stack!" is printed because: "If an included makefile cannot be found in any of these directories, a warning message is generated, but it is not an immediately fatal error; processing of the makefile containing the include continues. Once it has finished reading makefiles, make will try to remake any that are out of date or don’t exist." Change-Id: Ia728c0283885fe839dbf8dd8ae2a885230f23836 Reviewed-on: https://gerrit.libreoffice.org/47701 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2018-01-09upload libpagemaker 0.0.4David Tardon
Change-Id: Idc4b7eaa3331ee3831f7d27ca66663e23c30b8c9 Reviewed-on: https://gerrit.libreoffice.org/47615 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2018-01-08Let flatpak-builder build .Debug extensionStephan Bergmann
Includes a revert of 58891d589bd8da700f135b098dd50833277c65dc "Add distro-pack- install-strip target to be used by dev-tools' flatpak/build.sh". Change-Id: Ie2ba18bc13471b46e8d5f41868bae5aee17ff25f Reviewed-on: https://gerrit.libreoffice.org/47599 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-01-08gcc-wrappers: always pass -debug to linkerMichael Stahl
... like gbuild does; this causes a PDB file to be created, which is required by BinScope. Stops complaints about firebird's DLLs, which are apparently the only DLLs linked with gcc-wrapper. Change-Id: Ibe0e8053e0556748b1562b5f50f08480b2f2f89b
2018-01-08gcc-wrappers: recognise -ggdb.* in addition to -g as debug flagMichael Stahl
Firebird uses -ggdb. This causes it to have 2 PDB files, however this isn't sufficient to make BinScope happy, more investigation needed. Change-Id: I5286964586eaffea36790ab7a7ca2df75d85f068
2018-01-08gbuild: MSVC: invoke MSASM with /safesehMichael Stahl
BinScope complains that the sblo.dll lacks SAFESEH flag. Change-Id: If2b4b6592eac37542c3e2745d90a8e432b8da2e2
2018-01-06upload libabw 0.1.2David Tardon
Change-Id: I972ff9e0dbb73f6a38c886e1acd03cc4d62da2ec Reviewed-on: https://gerrit.libreoffice.org/47251 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2018-01-05upload libe-book 0.1.3David Tardon
Change-Id: I8862e7f4d2dcb007295028b9ec7be04e58ebafd3 Reviewed-on: https://gerrit.libreoffice.org/47264 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2018-01-05remove dead eeitemid.hxxNoel Grandin
and inline the couple of constants still in use from it Change-Id: Icb9f5690b5649140bc0503a8917e6a0f764e3d9c Reviewed-on: https://gerrit.libreoffice.org/47404 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-01-04sw: move some globals in fetab.cxx into SwFEShellMichael Stahl
It looks like the main point of these being globals is so that they can be cleared from various places when tables or table frames are destroyed. Add a SwDoc parameter to ClearFEShellTabCols() and just iterate over all shells. Change-Id: I75ad6b695ee1bfa76b9a05c606b07a3574c70ac4
2018-01-04basegfx: extract svg path import/export test to own fileTomaž Vajngerl
Change-Id: If9925540feb54e5a101c76f8d4cebaa305ac4c75 Reviewed-on: https://gerrit.libreoffice.org/47299 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2018-01-04remove SfxUsrAnyItem typedefNoel Grandin
and rename SfxUsrAnyItem class to SfxUnoAnyItem, the choice being made by leaving the most popular one behind Change-Id: If3818ee0966a50e3036d7e2db951910b6282c91f Reviewed-on: https://gerrit.libreoffice.org/47313 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-01-03Turn on clang-format for these filesMiklos Vajna
I (tried to) keep these files consistent locally with astyle in the past, switching to clang-format makes sure that the recent problem with introducing inconsistencies with automatic loplugin rewrites doesn't happen again. Change-Id: If49c96b6e9e6ed50beb69c70e37125dff5607f76 Reviewed-on: https://gerrit.libreoffice.org/47332 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-01-03Add JVM support to FlatpakStephan Bergmann
...fixing <https://github.com/flathub/org.libreoffice.LibreOffice/issues/5> "Add JRE-based components". It appeared to be easiest to install the Ant build-time dependency to /run/build/libreoffice/ant, instead of making it into a flatpak-builder module of its own. (The sha512 is as given at <http://ant.apache.org/bindownload.cgi>.) To avoid further dependencies, configure --without-export-validation and --without-junit, only affecting build-time checks (and the amount of checks thus affected by a plain `make` should be small). Change-Id: I5b67c37f168533f9dc7ade11c7c4e2c42814b942 Reviewed-on: https://gerrit.libreoffice.org/47322 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-01-03Adapt solenv/flatpak-manifest.in to recent download.lst changesStephan Bergmann
...and recently added fonts Change-Id: I2eedcb1b8af28b15b93c912bd0cc2d08d5c4db0d Reviewed-on: https://gerrit.libreoffice.org/47321 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-01-03solenv: fix typo in native-code.pyMiklos Vajna
Change-Id: I191c0586a5bf9b3be1811ff783cb80dd13638c53
2018-01-02ofz#4864 SvgTools::create required via html importCaolán McNamara
Change-Id: I2c7378e5226c1ce45a89b97ddce93bc0e6e96a33 Reviewed-on: https://gerrit.libreoffice.org/47257 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-12-24Improve Natvis display of SwNodeMike Kaganski
Change-Id: Ib1d4b8ed69ab60e9d7fccc6627051500d62c4a49 Reviewed-on: https://gerrit.libreoffice.org/47049 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-12-21solenv: support PYTHON_TEST_NAME for python testsMiklos Vajna
This is similar to CPPUNIT_TEST_NAME for CppunitTests, i.e. allows running a single module/class/method only, instead of all modules added by gb_PythonTest_add_modules. Example: make PythonTest_sw_python PYTHON_TEST_NAME="text_portion_enumeration_test.TextPortionEnumerationTest.test_empty2" Change-Id: Ibed5729bc29a5112216bce211455d6c6a0837b30 Reviewed-on: https://gerrit.libreoffice.org/46907 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-12-21new loplugin: convertlongNoel Grandin
merge the droplong and convertuintptr into one new plugin. Limit the analysis to looking at var decl's, since that seems to be safest proposition, even if that too needs some careful analysis. Change-Id: Id005baaf05cfb157ce44a06a1c81f08559a07d1f Reviewed-on: https://gerrit.libreoffice.org/46851 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-12-20inline typedefs in connectivity/StdTypeDefsNoel Grandin
Change-Id: I614833ed2418ff99057c7d496ddb64f06e8395db Reviewed-on: https://gerrit.libreoffice.org/46809 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
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-15clang-format: restore lost warning on touching formatted file without checkMiklos Vajna
Consistently only assign something to $clang_format if it's a good version, and also consistently return undef if we found no good version. Change-Id: Iadbbb56a5c15dfaeec5c80e3cc8fcc78b787c04b Reviewed-on: https://gerrit.libreoffice.org/46489 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>