summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)AuthorFilesLines
2017-04-26Enable MSP patchingAndras Timar2-2/+2
Change-Id: I1de9776e161161daf7349be304e05d5bb959f891
2017-04-06tdf#106359: register .iqy in MSI and treat them as templatesMike Kaganski1-0/+1
Change-Id: I7ae94c7717fbea03d96c539e05eeb565bafefd9f Reviewed-on: https://gerrit.libreoffice.org/36188 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 0c547776340c3983a867890b34f4a931215f8f52) Reviewed-on: https://gerrit.libreoffice.org/36203 Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-03-10Fix build with latest Cygwin updatesJan-Marek Glogowski1-0/+1
Stop bash complaining about \0 bytes in input (cherry picked from commit 8800292351dcf1f538c47ac6acf834ac2633ce6b) Strip newlines from UCRT detecion using tr (cherry picked from commit 37baabe6436037de604bfbc2702bfb0bc156c41b) Remove stray CR from input (cherry picked from commit 77779166569da389de44075b3d03413b353046a4) Just get rid of CR when parsing .bat output (cherry picked from commit 019ea173701eae4b8c5ffd45bb0063fc0a688ce0) Change-Id: Ieef2f8eb98181f5a4ea6a5527bc36de9b88716b5 Reviewed-on: https://gerrit.libreoffice.org/35010 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit 86bb733f6a9af9af253afe896e315b463e592dc7)
2017-03-06macOS codesign: Use of unset variable is an errorAndras Timar1-0/+1
(cherry picked from commit b225be8c997ffa85926217efff3654bec8c538a2) Change-Id: I270b7ab66d502e767a62e7e98ec3cefe7b9646d5
2017-03-06Collabora Office OS X packagingAndras Timar2-8/+12
- 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 (cherry picked from commit 26d77ceefcb59a95fff71c730d798d6b59021fc0) Change-Id: I3f341bfcd5bea88681e57b314f6069be107c5c2b
2017-03-06Put also the LICENSE file in Resources on macOSTor Lillqvist1-1/+1
Follow-up: Fix gb_Extension_LICENSEFILE_DEFAULT. Change-Id: Ia4888050099e74b93af67c58e988b4ae9e2516a1 (cherry picked from commit 3c946d688627ba0c31bcb37dfed4e6e180608854) (cherry picked from commit c0c3575f7434712d294ccb0eaa7f49bf845437e0) Reviewed-on: https://gerrit.libreoffice.org/34758 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Khaled Hosny <khaledhosny@eglug.org> (cherry picked from commit 578c0236017833641d645a47dbaa7ae0e61e3a2d)
2017-02-24solenv(gcc-wrappers): remove trailing space of includepathMark Hung1-8/+12
Change-Id: Ic14140f197a2c5e1632fd27cfae38ca4eff9bd8c Reviewed-on: https://gerrit.libreoffice.org/34562 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit baf043318e83e768abe4ed7ae1c45bb75c0197e3) Reviewed-on: https://gerrit.libreoffice.org/34577 Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit a3f963ddbd5f5a4cd2575ec024a19ddea49bb88c)
2017-02-24Improve error handling and fix some problemsTor Lillqvist1-9/+22
Use the -e and -o pipefail bash option to make the script fail more reliably if some command inside a pipeline fails. Use the -u option to catch mistyped variable names. Move the signing of executables in the bundle's Contents/MacOS after signing bundled frameworks. (cherry picked from commit b06edd5a07f18b0999adc0084b8133eb6481f867) Change-Id: I21d441bcb2dbfc19b0cb5718b76402b1686d2239 Reviewed-on: https://gerrit.libreoffice.org/34549 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit 977e439e4d2ae4c95a6a8d948a98267941628a59)
2017-02-20hack to fix an MSP creation errorAndras Timar1-0/+2
Change-Id: Ifa833d3adfce5dcc247a8c6e2f972c0638e5c05c (cherry picked from commit ded9e51fda12d01e381a5353e6ee412ec89548ff) (cherry picked from commit 07d93f57b99c077d6b3062ddafea56e021122111)
2017-02-20Collabora Office brandingAndras Timar2-2/+2
(cherry picked from commit c276d5ba1491dc237812cdf3d877a4ecec2ee1dc) (cherry picked from commit c085f9176bda7bad0234d0087ff87f27086fc333) Change-Id: I9e79c07aa3cbb70076d9bab07294062df4be02c6
2017-02-20Collabora Office EULAAndras Timar1-1/+1
Conflicts: readlicense_oo/Package_files.mk Change-Id: Ia380db465f5094216cb36526f6cc178043376356 (cherry picked from commit 2e8f1c8598c34a5cf0779f23fe66091115fa0fc6) (cherry picked from commit 63f4de72939a506c04d7f1b274e9c8fa09c4bb25)
2017-02-18loplugin:vclwidgets check for assigning from VclPt<T> to T*Noel Grandin1-0/+1
Inspired by a recent bug report where we were assigning the result of VclPtr<T>::Create to a raw pointer. As a consequence, we also need to change various methods that were returning newly created Window subclasses via raw pointer, to instead return those via VclPtr Change-Id: I8118e0195a5b2b4780e646cfb0e151692e54ae2b Reviewed-on: https://gerrit.libreoffice.org/31318 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit e6ffb539ee232ea0c679928ff456c1cf97429f63)
2017-01-16Always exit with error if codesign failsTor Lillqvist1-5/+5
That sanity check was added in 615fae2f67028f3c5c51c70c77dbaa9b9f3856d6 but we lost it at some stage. The codesigning script has a very confusing history, in part caused by its use for two purposes, when building for the Mac App Store and when building for a TDF style distribution on a dmg disk image. Those who work with the former and those who work with the latter haven't necessarily checked that it doesn't break for the other case. Sorry. Change-Id: I79011302f60b1f6551328c8b80e00f5d3698504c (cherry picked from commit a6216119be2c32e9031c6bb9b7dfa07f0468d813) Reviewed-on: https://gerrit.libreoffice.org/33071 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2017-01-14workaround for codesigning on Mac baseline - do jnilibs firstChristian Lohmaier1-1/+9
as otherwise signing fails (LibreOffice.app: code object is not signed at all In subcomponent: path/to/foo.jnilib) Change-Id: I3e4691f2ada408d9e76d200a3291b044753ec85c (cherry picked from commit abdb32cbad1b85d2d47ad954aa55b468b078a05e) Reviewed-on: https://gerrit.libreoffice.org/33072 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2017-01-14CodesignRules.plist was removed in 615fae2f67028f3c5c51c70c77dbaa9b9f3856d6Tor Lillqvist1-5/+2
Change-Id: Ibde5189ecf09ec8dfaf3223683c5480974084865 (cherry picked from commit 3e7e4df5a47b8d94ab86a8d6d0df38b1f282f980) Reviewed-on: https://gerrit.libreoffice.org/33070 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2017-01-06gbuildtoide: builddir is not necessarily same as srcdirChristian Lohmaier1-3/+6
Change-Id: Ied9f9abcc75f2edcd518ac247907f573aa21f35e Reviewed-on: https://gerrit.libreoffice.org/32405 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-01-04gbuild: CppunitTest: export VCL_HIDE_WINDOWSMichael Stahl1-1/+1
This currently has no effect and so the CppunitTest_cppcanvas_emfplus pops up an annoying window. (regression from 181932b31ea9c07a9bec3677e73b67a9a6d4e3f2) Change-Id: I26314d98f10f6b39ca1c28821ccd0de6ba2a4358 (cherry picked from commit bde8054e1801ffd2e4bcdb7b4d6ba08f5ceddd6a) Reviewed-on: https://gerrit.libreoffice.org/32726 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2016-12-01gbuild: Prevent wrong use of gb_Helper_optional_for_hostMatúš Kukan3-1/+8
It's empty, unless gb_Side=build. This fixes commit 1193443b15b0e38cbfb41573b31acf9a8d90ce2c which removed icons used in our open dialog from image zip files. Also, include 985e93ecb44aef97995099d4fd5915afd3cab282 "fix cross-toolset: gb_Helper_optional_for_host can't contain 'newline'" Reviewed-on: https://gerrit.libreoffice.org/31419 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 52d409f0d657f314a53f945c9ffb5b8025bea034) Change-Id: I83efad36d8f40c460d09ee1bd1addd7fb26c177b Reviewed-on: https://gerrit.libreoffice.org/31463 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-11-22Revert "improvements to gbuildtoide"Michael Stahl2-74/+5
This reverts commit 294bfdfaada9ba85ddcf853650a8da9c10f25281. Unfortunately this shutil.copytree(self.srcdirnative, self.tempsrc) copies the entire SOURCEROOT into /tmp, with WORKDIR too if it's not an out-of-tree build, which is quite an excessive use of space, tmpfs or otherwise, and will no doubt make CI very happy.
2016-11-22improvements to gbuildtoideBjoern Michaelsen2-5/+74
- move supported module selection from the test directly into gbuild, it should not be possible now to have 'make gbuildtoide' failing, it should skip problematic parts - move from whitelisting to blacklisting bad modules - toplevel 'make gbuildtoide' should work now, so add test (limit to non-Windows for now, as Windows is stupid and slow) - remove spurious debug output in test Change-Id: I9838dd2fa091e5fb3e56f414f60164086e8f2076 Reviewed-on: https://gerrit.libreoffice.org/31072 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2016-11-22Exit gb_CppunitTest_localized loop on first failureStephan Bergmann2-2/+3
...instead of ignoring failures in every but the last iteration Change-Id: Ie80e78f75aaec5e9b1625c2e1ef740adf31fab1b
2016-11-22New loplugin:oslendianStephan Bergmann1-0/+3
...to catch new places where defined'ness of OSL_BIG/LITENDIAN would be checked without osl/endian.h being included; cf. e2f08f9def0869460ad38a1c2adb450778290f6e "connectivity, sc: add missing #include <osl/endian.h>" and 2b14fb3a4f92b928f0a5fc536c6a5f4a6e51a9b8 "cppcanvas, oox: add missing #include <osl/endian.h>". Change-Id: I167c8916a01391b7dacad7325153ccf35d3ba9dc
2016-11-22Sort lines lexicographicallyStephan Bergmann1-2/+2
Change-Id: I4dc6bebb41b0e1beee58631fdf92dea82ae38db7
2016-11-21add missing deps on ui filesDavid Tardon1-0/+10
Change-Id: I28bb2a33c02d8eadced584d3d3f2b62b2e847324
2016-11-21new loplugin datamembershadowNoel Grandin1-0/+1
Change-Id: Ib14319848bafd1fe7e0e663c434bbdeef5e98ecf Reviewed-on: https://gerrit.libreoffice.org/30963 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-11-20gbuild allow unitest to run once per lang in WITH_LANG_LISTNorbert Thiebaud1-1/+15
this is motivated by the new screenshot feature the initial proposed solution involved running make screenshot once per lang which took ~6 hours for --with-lang=ALL on tb68 a reasonnably big windows slavebot. with this patch, one can run make screenshot just once and get all the screenshot the elapsed time is 36 inutes on the same box/same config a 10x improvement. Change-Id: I4339caebf915c118aa455de2a7e56e1a4e413939 Reviewed-on: https://gerrit.libreoffice.org/30970 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2016-11-17Have a specific TARGETTYPE for CompilerTest after allStephan Bergmann2-1/+3
...instead of leaving it empty. (645583dfd374c8b02f3c0eeba6233a0bb5884d68 "New compilerplugins/clang unit tests": "Checking the input files is implicitly phony, as the compilation step doesn't generate any object files, and the link step does nothing because there is no gb_LinkTarget_set_targettype for CompilerTest.") In preparation for using compilerplugins/clang with clang-cl on Windows. Change-Id: Ica4f16a4b249537f78ce21fcbe7c4afea8214821
2016-11-16new loplugin finalprotectedNoel Grandin1-0/+1
look for final classes, and make sure they don't have protected members Change-Id: I1fa810659bba02b61a5160dbfd8e24185ec9abf4 Reviewed-on: https://gerrit.libreoffice.org/30895 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-11-15New compilerplugins/clang unit testsStephan Bergmann8-7/+91
...to check that loplugin produces warnings/errors as expected: * Clang has a -verify switch that makes it easy to write test input .cxx files that list in comments all the warnings/errors that are expected, and let Clang check those expectations instead of generating object code. See include/clang/Frontend/VerifyDiagnosticConsumer.h in the Clang source tree for documentation. * Introduce a CompilerTest gbuild class that uses the existing LinkTarget class as much as possible. Checking the input files is implicitly phony, as the compilation step doesn't generate any object files, and the link step does nothing because there is no gb_LinkTarget_set_targettype for CompilerTest. The setup at least works for Clang on Linux (will need adaptions for Clang on Windows; compilers other than Clang are not relevant for now given this is used to check compilerplugins). * Definition of gb_CFLAGS_WERROR in solenv/gbuild/platform/com_GCC_defs.mk needs to be lazy ('=' vs. ':=') so that CompilerTest can override it: The Clang -verify mode wants the input files to specify whether the loplugin diagnostics are warnings or errros, so they consistently need to be errors independent of --enable-werror configuration. * A first (example) test is in compilerplugins/clang/test/salbool.cxx. The corresponding gbuild CompilerTest instance is in solenv/CompilerTest_compilerplugins_clang.mk for now. The reason for that odd split across compilerplugins/ and solenv/ is that there is no compilerplugins/Modules_compilerplugins.mk file, so this setup is the easiest hack for now (to be cleaned up). (Another area that could be improved is that all test files need to be listed explicitly in the CompilerTest_*.mk file, instead of, say, using all .c/.cxx/.m/.mm files in a specified directory.) * The test is run somewhat late during a top-level 'make', after loplugin has already been used in compilation. But it can be run manually (e.g., 'make solenv') when making changes to loplugin during development. Change-Id: I01e12fb84887d264ac03ef2484807458c2075af4
2016-11-08typo fix: ressource -> resourceAndras Timar1-3/+3
Change-Id: Id8d1c01b17e711a057a9f3f20e1d0f955b2ea6c8 Reviewed-on: https://gerrit.libreoffice.org/30690 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2016-11-07Fix typos (also in the code)Andrea Gelmini1-1/+1
Change-Id: I45d45513b102f4fdcb55e8de20b95b37f66ea463 Reviewed-on: https://gerrit.libreoffice.org/30658 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2016-11-04Allow including/packaging help-specific imagesKatarina Behrens1-6/+24
from other than icon-themes folder Change-Id: Iba1808e642fde8d0370b59550c7bdac1a3e4ac79 Reviewed-on: https://gerrit.libreoffice.org/28513 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org> Reviewed-by: Olivier Hallot <olivier.hallot@edx.srv.br>
2016-11-03Disable gbuildtoide test on macOS, tooTor Lillqvist1-0/+2
Change-Id: I630fd447992ada459190acd1ee310bd2d38820b9
2016-11-02disable gbuildtoide test on Windows as CI builders are unstableBjoern Michaelsen1-0/+2
Change-Id: Ib5eb4fece2bae3e04089f2389198df800620e6f8 Reviewed-on: https://gerrit.libreoffice.org/30483 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-10-31also stubify generated object addersBjoern Michaelsen1-0/+2
- This should unbreak vcl when configured with KDE/TDE CustomTargets Change-Id: I239e97b90174f3daef39e4a806a126cafba9d8e0 Reviewed-on: https://gerrit.libreoffice.org/30436 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2016-10-31populate library path to gbuildtojson in testsBjoern Michaelsen2-0/+2
the test environment clears LD_LIBRARY_PATH as it seems to cause trouble for make in ASAN. "make gbuildtoide" only runs the gbuildtojson exe, so make sure it gets the LD_LIBRARY_PATH that was filtered out from the make that starts it. Change-Id: I69ee0024232092aebcd1e8e11b002d6f7eb55c84 Reviewed-on: https://gerrit.libreoffice.org/30433 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2016-10-26for now, use a limited subset for testing on windows as it is so slowBjoern Michaelsen1-0/+3
Change-Id: I06f77d8aa0a82bd3bb065095a64849d07d11c6a3 Reviewed-on: https://gerrit.libreoffice.org/30311 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2016-10-26add test for running gbuildtoide on non-build modulesBjoern Michaelsen7-41/+295
- do concat for json in C++, everything else seems fragile on Windows - have APPEND vars separately - check that gbuildtoide work on modules without a full build (modulo some blacklisted "creative" ones) Change-Id: I6fe267fee7d1b77d758072303729387dfeb8e6c8 Reviewed-on: https://gerrit.libreoffice.org/30293 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2016-10-26normalize existing emacs/vim mode-lines in python filesMichael Stahl1-1/+2
Bunch of these were setting C++ or Make modes and icky tabs... Also, reportedly Emacs can figure out to enable python-mode automatically. Change-Id: I50072488fb92cb4d27aa3f74f717a28ae3967543
2016-10-26gbuild: missing emacs mode-linesMichael Stahl8-3/+7
Change-Id: Id767a98be85a7f3f4abb28891d0a5cac2057b0e0
2016-10-26fix "TabError: inconsistent use of tabs and spaces in indentation"Michael Stahl1-1/+1
Change-Id: Iff27ff4a01dc8c20b01a6247554b6cc7195a2306
2016-10-26solenv: fix Windows buildMiklos Vajna1-1/+4
Traceback (most recent call last): File "C:cygwinhometdflodejenkinsworkspacelo_gerritConfigwindows_msc_dbgutil_32solenvqapythongbuildtoide.py", line 32, in test_gbuildtoide del(os.environ['LD_LIBRARY_PATH']) # built with ASAN; prevent that File "C:cygwinhometdflodejenkinsworkspacelo_gerritConfigwindows_msc_dbgutil_32instdirprogram\python-core-3.3.0libos.py", line 692, in __delitem__ raise KeyError(key) from None KeyError: 'LD_LIBRARY_PATH' Change-Id: I1575caf90cafffd71dd28fedc46b5e3570848be8 Reviewed-on: https://gerrit.libreoffice.org/30304 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Michael Stahl <mstahl@redhat.com>
2016-10-26solenv: don't run make with LD_LIBRARY_PATH setMichael Stahl1-0/+2
In a build with -fsanitize=address, this fails with: Change-Id: Ida0d4445d7f829545b493e9dd4c2c4ef33960850 make: symbol lookup error: instdir/program/libfreebl3.so: undefined symbol: __asan_option_detect_stack_use_after_return
2016-10-26i18nlangtag must presumably be dropped from Library_merged.mkStephan Bergmann1-1/+0
...after 475e4b477c6d7ae114c3ae51ba4872882af67a68 "Move i18nlangtag lib to URELIB"? Change-Id: I45c5d997ed30757157109c67f30b91c4073c6b0a
2016-10-25bail out on use of unknown install moduleDavid Tardon1-0/+2
Change-Id: Ic6ba34e1ea6aff49f308f41e5692e08edc5b77c2 Reviewed-on: https://gerrit.libreoffice.org/30270 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-10-24solenv: force gbuildtoide test to use the same "make" as the callerMichael Stahl4-4/+13
Possibly mis-matching make binaries could be the reason behind failures that have been observed on Jenkins: make[3]: Entering directory '/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/windows_msc_dbgutil_32/solenv/qa/python/selftest' make[3]: *** internal error: invalid --jobserver-fds string 'gmake_semaphore_5488'. Stop. Also, to enable this: Revert "Revert "prep WinResTarget for WNT in testdir"" This reverts commit 6e261cb19e5751eb0553ad0c5b357b1a5747518c. Change-Id: Idb858b5eeced91f19c9dd5600c4fdc5370b73cc5 Reviewed-on: https://gerrit.libreoffice.org/30226 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-10-23Fix typosAndrea Gelmini1-1/+1
Change-Id: Ib7b17f85c7b6a1937c3f6e1617ceec58074643b4 Reviewed-on: https://gerrit.libreoffice.org/30040 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2016-10-20Revert "prep WinResTarget for WNT in testdir"Giuseppe Castagno3-7/+4
Still random failures in Gerrit Windows builds. This reverts commit f5c54089b50718abf7c35aa81b150c509809d5c4. Change-Id: Iec48d2388691577ccd675b9a73941cedceebd527 Reviewed-on: https://gerrit.libreoffice.org/30103 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> Tested-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
2016-10-18prep WinResTarget for WNT in testdirBjoern Michaelsen3-4/+7
Change-Id: I04c050dca1212d247c9b11a996ba8f37c0a6492f Reviewed-on: https://gerrit.libreoffice.org/29825 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2016-10-16help packimages.pl be compatible with Perl versions before 5.12Douglas Mencken1-2/+2
configure.ac doesn’t check for the version of Perl at all so you can’t suppose that it is guaranteed to be 5.12 or beyond before this patch in the case you use perl < 5.12 at build time you would get Can't locate object method "newdir" via package "File::Temp" at solenv/bin/packimages.pl the commit 4e3dc8c141c2efd037c1f214b5edff071812b6a8 introduced such incompatibility Change-Id: Icd9281e0065ed67d69d07ac921b054deed052764 Reviewed-on: https://gerrit.libreoffice.org/29907 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>