summaryrefslogtreecommitdiff
path: root/solenv/bin
AgeCommit message (Collapse)AuthorFilesLines
2021-12-21Filter optional component implementations by nameJan-Marek Glogowski2-5/+26
Instead of trying to make up BUILD_TYPE items to match complex build conditions and then patch the component file with it, filter the component files based on the unique implementation name and an <optional/> tag. Currently these optional implementations are grouped in external files with an identifier. Originally the optional implementations were automatically iden- tified by adding them to any external file, but this behavior is too easy to get wrong. Even better: if need arrises, one can now easily implement a feature to add implementation names directly using gbuild calls, instead of grouped files. The basic mechanism is to collect all optional implementations, remove the needed ones from that list and then filter-out all implementations not needed (AKA the rest of the list). It's no problem to have the same optional implementations selected in multiple files. This is especially used by the vcl.common component in a later patch. For gbuild this adds gb_Library_add_componentimpl. The component parameter for the call is explicitly omitted, so you must call gb_Library_set_componentfile before selecting any optional implementations. The strict naming is also enforced by appending the identifier to the component file name. This replaces commit 65c0887bca2909b2046eb5aa4aaace0cc320c3f2 ("Allow for conditional parts of component files"). Change-Id: I0261cadce8bdfebb6b3ec96669ec378a5c1d9699 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126891 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins
2021-12-14Allow for conditional parts of component filesStephan Bergmann1-0/+11
1c9a40299d328c78c035ca63ccdf22c5c669a03b "gbuild: create services.rdb from built components" had moved parts of svx/util/svx.component and sw/util/sw.component into additional, conditionally included component files (and which this commit moves back into the original component files). But that lead to multiple <component> elements for a single library in service rdb files, which was unfortunate for several reasons: For one, while the code in cppuhelper/source/servicemanager.cxx happened to support that, it was not guaranteed to support it, so this relied on an implementation detail of that code. And for another, for that to work, all the component files for a library had to provide identical environment, loader, and prefix (if any) attributes, but which was not verified and thus was brittle. Instead, introduce a CONDITION attribute for the <implementation> elements in the source component files, which decides whether or not such <implementation> elements are passed through (after dropping the CONDITION attribute) into the processed component files (in workdir/ComponentTarget/). (The attribute is spelled all-uppercase to make it more obvious that it is special syntax that is not simply passed through to the output component file.) For now, such a CONDITION attribute must have a value that matches BUILD_TYPE:x for some feature x in $(BUILD_TYPE), but the syntax can be extended if the need arises. (gb_Library_set_componentfiles is thus no longer needed and has been removed again.) Change-Id: I360cf4cc0f3a2a738113d430891500715a8fe3a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126560 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-12-06gbuild: create services.rdb from built componentsJan-Marek Glogowski2-0/+36
... and introduce the --enable-services-rdb-from-build option. Currently the build handles global build options redundant in a few places: * in Repository*mk + modules - the "real" build dependencies * the full services.rdb generation * the static UNO constructor map generation Also the component files don't reflect the really built components and so the RDB services generation must handle the whole options to select the correct components. So this optionally replaces the latter two by generating the list of components and it's constructors from the build itself. As a consequence, component files must now be split, so they reflect the real components in the libraries, otherwise the static constructor list will have missing symbols. IMHO this is more natural, as it happens in the same place already handling these build options for the sourcecode. This also adds a convenience helper to add multiple component files: gb_Library_set_componentfiles This is WIP and currently just works for the stripped WASM build, which introduces many more split component files in later patches. It also explicitly filters the gb_Rdb__URECOMPONENTS and the CppunitTest related components from the services.rdb. Maybe there is a good way to do this properly. Change-Id: I1b38a6f2c1e5221f18d7e5e756c30263b555d962 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126185 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2021-12-06concat-deps: ignore /./ segments in input pathsJan-Marek Glogowski1-0/+9
concat-deps detects relative path segments (AKA /../) and removes these in cancel_relative(...) to save space (by removing the preceding path segment from the output path). But that logic doesn't account for preceding /./ segments, resulting in paths to non-existing files. This then resulted in mysterious, unneeded compiling of seemingly unchanged files for my incremental cross-toolset builds. I actually assumed some error in my complex gbuild static changes, which are already driving me crazy... "make -d" showed these wrong paths, but inspecting the ".d" for the actual files (from gcc output), they were ok; took me a while to realize the problem were LO's concat-dep files for libraries. But instead of complicating cancel_relative(), this just jumps over /./ segments in the input path. cancel_relative() works on the &cursor_out copy anyway. Change-Id: I2a8ecd04fdfa790859668d690a102cfb156aa649 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126345 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2021-12-03ofz#41602 fix more build failureCaolán McNamara1-1/+1
[LNK] Executable/fodsfuzzer workdir/LinkTarget/StaticLibrary/libfuzzer_calc.a(native-calc.o):native-calc.cxx:lo_get_constructor_map::map: error: undefined reference to 'com_sun_star_comp_framework_SoundHandler_get_implementation' clang-14: error: linker command failed with exit code 1 (use -v to see invocation) Change-Id: Id22e52491bf95eff7b72ac1fc9e2c63f3dfb30b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126332 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-11-17tdf#145711: filename may be 1-character, and must not contain path separatorMike Kaganski2-4/+5
Surfaced after 6ea7ca45782a7e1b46e18e994534ec0a7c71951b Change-Id: I4975f51a7a0ca73eccfd17338abc122254b57113 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125338 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-11-10add generate-flatpak-manifest.sh to generate FlatPak manifestMichael Stahl1-0/+20
Duplication of external tarballs in flatpak-manifest.in is a maintenance nightmare. The only difference between the current flatpak-manifest.in and the one generated from: make -s cmd cmd='${SRCDIR}/solenv/bin/generate-flatpak-manifest.sh master' > org.libreoffice.LibreOffice.json ... is that the current one contains an outdated reference to zxing-cpp-1.1.1.tar.gz which was upgraded to zxing-cpp-1.2.0.tar.gz in download.lst. Change-Id: I98ab9346244f2c0d788da391928fcb4ffebbe23f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124891 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-11-08hdiutil flatten/unflatten was removed in macOS 11Andras Timar1-1/+1
Change-Id: If5a1a70f8a7428d81668704f93fa7a1f45058b68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124825 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2021-11-04Change git.freedesktop.org -> git.libreoffice.orgHossein2-3/+3
Replace git.freedesktop.org with git.libreoffice.org in the docs gernerating scripts. The output will be visible at the https://docs.libreoffice.org or the local docs folder. This completes the "Use LO repo for mkdocs git link" patch e62c4241093409583c913165ddc1e4c300c6218c Change-Id: Id38d86821cd1c4edb16edd760087c8361e221de3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124674 Tested-by: Jenkins Tested-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
2021-10-30upgrade libjpeg-turbo to 2.1.1Caolán McNamara1-0/+5
simd enabled for x86_64 and x86, arm/aarch64 might be worth exploring too Change-Id: Ic2726ee8c6b6e59ca983b977ee2731f5b78b97d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123898 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-10-26Use LO repo for mkdocs git linksHossein2-8/+8
* Use git.libreoffice.org instead of cgit.freedesktop.org for the git links generated by mkdocs scripts Change-Id: Iac6e9ea1b73dcd0155786798c0ec162865299ada Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124186 Tested-by: Jenkins Tested-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
2021-10-04We need com_sun_star_animations_AnimatePhysics_get_implementationTor Lillqvist1-0/+2
Fix crash in iOS app reported at https://github.com/CollaboraOnline/online/issues/3321 . Change-Id: I1b5fedb0d5db84cc3f6a75b52c29a39ebe7a6ed9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123046 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123047 Tested-by: Jenkins
2021-10-03TODO: remove missing .po support when writerfilter .po files existCaolán McNamara1-18/+0
Change-Id: I8f20845fcb1fbd598cf1c1c8c8ff20b3e9c37bfc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123012 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-28com_sun_star_comp_svx_CharacterSpacingToolBoxControl is duplicatedCaolán McNamara1-1/+0
com_sun_star_comp_svx_CharacterSpacingToolBoxControl_get_implementation is already listed under svx/util/svx.component Change-Id: I55fd0e2aff051b62b33d5b257ced8e934c9053d9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122770 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2021-09-28More constructors needed for the DISABLE_DYNLOADING caseTor Lillqvist1-0/+9
Fixes https://github.com/CollaboraOnline/online/issues/3293. Change-Id: I3c0eaedf47321f0e81be4ac52c66f8e55381ac32 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122720 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122755
2021-09-24disable these for fuzzing as well as !HAVE_FEATURE_DBCONNECTIVITYCaolán McNamara1-28/+28
Change-Id: I90d9680590c9f9e36fdafaca9c98955a03654da7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122589 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-24need connectivity_dbase_ODriver if HAVE_FEATURE_DBCONNECTIVITY is trueCaolán McNamara1-0/+2
to get calc to attempt to import a dbase file Change-Id: I22cc0b69f785f1194feabff2eb88b86cde6eb6b9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122474 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-09-24need OSDBCDriverManager if HAVE_FEATURE_DBCONNECTIVITY is trueCaolán McNamara1-0/+2
to get calc to attempt to import a dbase file Change-Id: I177b41504cb42e5ba3ced799698d5f77305102d7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122456 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-08-20Make some scripts more portableIlmari Lauhakangas4-4/+4
Change-Id: Ia89059eea51ca396a7c74143625ac9a6706de198 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120773 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
2021-08-07Create destination directory also for non-empty sourcepath directoryEike Rathke1-1/+1
Do not attempt to copy anything. This can happen with instdir/share/extensions being populated from some build (e.g. by dictionaries) but no extension to be installed. The result was ERROR: Can't copy file: /build/core/instdir/share/extensions -> /build/usr/opt/core/lib/libreoffice/share/extensions Is a directory at /build/core/solenv/bin/modules/installer/worker.pm line 350. and the copy() created the destination as 0-length file instead. The recent changes not copying extensions/packages.txt anymore and related may have triggered this: 6c487d2d7e8aa5cdef55cbd7bc78058184671d82 Fix and simplify "any bundled extensions installed" check 626050e86b7d5ca0c3bfc265cc33ce8e9d1bf195 gb_Package_Package must specify a directory f267340d300da6318435ed1b2ae48b9f4275e2c4 Remove unused $(LIBO_SHARE_FOLDER)/extensions/package.txt Change-Id: I93c1b0867bf234255fdef9d31c447b9b20011e17 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120164 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
2021-08-05Pass context and resource string down to boost::locale separatelyNoel Grandin1-1/+2
because this is often on a hot path, and we can avoid the splitting and joining of strings like this. Change-Id: Ia36047209368ca53431178c2e8723a18cfe8260a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119220 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-07-26add gbuild support for ObjC/C++ sources from tarballsLuboš Luňák1-0/+10
Change-Id: I49632bf9dedf9603449fb5bc9e6a819586258b05 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119355 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-06-28[API CHANGE] drop ShapeContextHandler service and interfaceNoel Grandin1-1/+0
There is zero chance an extension is using this, because it is so intimately tired together with the oox and writerfilter interactions. I'm removing this so I can expose the ShapeContextHandler and then override it's implementation in a more fashion without jumping through UNO hoops. Change-Id: I79ef30247f4642303dfdb92bbf8f6e6226234829 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117996 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-10update add-modelines to the TEMPLATE.SOURCECODE.HEADER patternCaolán McNamara1-2/+2
to match commit f75cd22118a58c8a8827723c890885a500562465 Date: Tue Nov 8 14:51:20 2016 +0200 Add fill-column: 100 to the Emacs mode line and commit 6a0081642633eb406059295b90fd0c9b0cd1130f Date: Wed May 18 20:00:00 2016 +0200 add Vim C-indent options to C/C++ template modeline changes to TEMPLATE.SOURCECODE.HEADER Change-Id: Ic323cd7dcce9ece23325a23160b0936819bb634b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116962 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-06-04Add missing FilterOptionsDialog constructor for androidmerttumer1-0/+1
Change-Id: I8bdd44e1b2f45a6d62e6b7220762da62787e04fa Signed-off-by: merttumer <mert.tumer@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114830 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116295
2021-05-27installer-code: remove some unused or pointless subsChristian Lohmaier11-460/+11
of course just the very tip of the iceberg, but you gotta start somewhere… Change-Id: I24ef6a51ec70c70418368da54595637283055d84 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116255 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-05-19mac packaging: don't throw away codesign output for langpacksChristian Lohmaier1-4/+5
The change to use backticks to capture the output was already done for the main package in 6c4cb4e7e0afce2989c9fe596fd74a35eece6206, this change now also fixes it for the langpacks Change-Id: I26dcfb56342b9c3fc7b9c93f7d586c5c899b7232 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115808 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-05-05WASM: add initial support for Emscripten cross buildJan-Marek Glogowski1-0/+9
- configure with: - --host=wasm64-local-emscripten - had to make a few externals optional, so adding: - --disable-nss - --disable-cmis - --disable-curl Change-Id: I48d1c73d2675ad2e2beaf2c341578199efbd24ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111130 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-05-01update native-code.py with services for vba scripts in CalcTomaž Vajngerl1-3/+38
Change-Id: I54eb60d3be2717c17daa6b7634ccee3e099cbb7d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114932 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-04-23native-code: Only include pdfimport ctors if PDF import enabledMichael Weghorn1-5/+5
commit 3dba2e4a325fa0fdfbbedb0ffc1fcf678bfcbc94 Date: Thu Mar 25 12:23:43 2021 +0200 Include the pdfimport library constructor in the mobile apps if enabled had unconditionally included the constructors, so e.g. a '--disable-pdfimport' Android build would fail due to missing symbols. Change-Id: Icbf92dd226ef9a3104c37610ee56416c8205b7a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114533 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Jenkins
2021-04-14Fix problems with LibreOffice document generation (local and portal)Hossein2-21/+42
* Fixed problems with LibreOffice local document generation script (mkdocs.sh) by interpreting backslash escapes when generating module links using "echo -e" and using double quotes around Markdown generated text. The result is placed at docs/ folder. * Fixed problems with LibreOffice portal document generation script (mkdocs_portal.sh and mkonedoc.sh) by doing above fixes and also adding code from the local document generation script. The result is placed at https://docs.libreoffice.org/ * Only the README.md files are processed, and not README* or readme.txt* * Fixed redmine #3515 "Remove non-necessary subfolders from docs.libreoffice.org" by excluding these 10 folders: "autom4te.cache dictionaries docs helpcompiler helpcontent2 include instdir lo translations workdir" Change-Id: Id230872b8583a575bfeb6fc77cc9f96d5982908f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113773 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-04-07tdf#141531 liblo-native-code: Add ODatabaseContext_get_implementationMichael Weghorn1-0/+1
Add 'com_sun_star_comp_dba_ODatabaseContext_get_implementation' to liblo-native-code, needed to open mail merge files with data source since commit e64dc07ca8300a997d6d3eebfc3e198ae55d290d Date: Mon Mar 29 11:52:05 2021 +0300 tdf#139906 Show warning message when data source is not avaible. Change-Id: I6fdd500f9c3b9cc54310e78df694eba7103ff0b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113717 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2021-03-31python3-ify hrcex & uiex (creation of pot files)Christian Lohmaier3-12/+13
Change-Id: I824c9ed536a1e852d6bd157fbd7d4766327b7bcd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113319 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-03-25Include the pdfimport library constructor in the mobile apps if enabledTor Lillqvist1-0/+6
This is part of implementing https://github.com/CollaboraOnline/online/issues/1824 . Change-Id: I68dacc2de0dc1f09da03fa213d5cff56a2343c77 Signed-off-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113079 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113095
2021-03-25tdf#124173: Enable thesauruses in the iOS appTor Lillqvist1-1/+1
Build our lnth library and the external mythes library. Install thesauruses for the app's Xcode project to pick up and include in the app bundle. Look for them in the place where they will end up. To get thesauruses you need to configure with --with-myspell-dicts. Change-Id: I2d850ca3c821c5c764cb061340a265440d04e41b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113066 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113073 Tested-by: Tor Lillqvist <tml@collabora.com>
2021-03-17tdf#124909: Use the myspell dictionary for Swiss German on iOSTor Lillqvist1-1/+1
The iOS system German dictionary is not good for Swiss German. (And it doesn't even claim to be, it says it is for de_DE.) The system German dictionary accepts 'ß' but that is not used in Swiss German, 'ss' is always used instead. Build the spell library for iOS, too, and don't assume that the system de_DE dictionary would be usable for de_CH and de_LI. Copy those dictionaries for inclusion in the iOS app bundle. Change-Id: I0f8020812221024756c792bddc16a707de35b827 Signed-off-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112603 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112635
2021-03-12move hatchwindow to toolkitCaolán McNamara1-2/+1
because it wants to use toolkit headers Change-Id: If92b174bd4971b88f288f93c1beaed6f2103a83c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112348 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-01-28tdf#139781 Handle also "icon-name" property nameMaxim Monastirsky1-1/+1
Change-Id: Iaf2c8521588bdf58daa3166b1efa27979eca2e1b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110048 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
2021-01-27packaging: remove resolve_variables_in_downloadnameChristian Lohmaier3-99/+5
OOODOWNLOADNAME was set in the global section of openoffice.lst, so the code always did set the target path with set_download_filename. Thus remove the superfluous sub and then also the no longer used OOODOWNLOADNAME variables In the same vein: the "script that extracts a tarball that is appended to it" method is no longer in use since many years, delete that as well. Change-Id: I43481a3ec09e064ef77138e1cbfc1dba6854f2d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110017 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-01-25fix packaging of mac builds targeting apple siliconeChristian Lohmaier3-3/+7
the scpactions are what assemble the dmg (add the license & readme folders, the background image and the .DS_Store for alignment/the layout). Adding the AARCH64 statement is necessary to add the architecture to the filename. Change-Id: I0095b8d631cdaa7ce4333fde15dd17d4faf44e8f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109818 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-01-25mac packaging: capture output of signing callChristian Lohmaier1-4/+3
by replacing system() call with backticks operator, since now the macosx-codesign-app-bundle script doesn't redirect the output to temp-files anymore (see e2fcbac50549ca96b092d64bd14a37cee6b12e0a) That way the output can be added to the log in case of failure. Change-Id: I954cbb2ed28cfe0f7e1e8ebc8f21aeb1711a4d9a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109816 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-01-20Simplify error handlingTor Lillqvist1-42/+9
There were a couple of weird things in this script. Firstly, the script redirected stdout and stderr from each invocation of codesign separately into a log file. (Several differently named log files.) But those log files were never displayed. Secondly, the script did "set -e" at the start. Thus, if a codesign invocation returned non-zero (error) exit status, any code to check the exit status and possibly display the log file would not be executed anyway. Simplify thusly: Don't pass --verbose to codesign. Then if nothing goes wrong, it is silent. That is The Unix Philosophy, right? Don't redirect codesign stdout and stderr to a log file (that would be removed if codesign didn't fail). Just let any error message of warning from codesign go to the script's stderr or stdout. If codesign fails, just exit. Error messages will have been written to stderr already. No log files to display or remove. Don't use set -e. Instead if a codesign invocation fails, just exit. The intent is that in the normal case, this script will be totally silent. Change-Id: Ic6081c418e4c564be768e30bf52b8196ee59f061 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109696 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2021-01-18mac: don't put script files into Contents/MacOS or framework-bin directoryChristian Lohmaier1-2/+3
Signing them as executable code would require external attributes, and those in turn break packaging into hfs+ dmg when building on apfs with Big Sur. It is not a new thing - the old Code Signing in Depth technote https://developer.apple.com/library/archive/technotes/tn2206/_index.html already reads: "Store Python, Perl, shell, and other script files and other non-Mach-O executables in your app's Contents/Resources directory. While it's possible to sign such executables and store them in Contents/MacOS, this is not recommended. […] Put another way, a properly-signed app that has all of its files in the correct places will not contain any signatures stored as extended attributes." The patch does exactly that for LO and the shipped python framework and adds symlinks for the moved files. Same applies for the Language pack applescript and the tarball - those are also moved into Contents/Resources Change-Id: Iab21e77b73f941248ca89c6e80703fdf67a1057c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109537 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-01-15prep to replace stock button labelsCaolán McNamara1-0/+4
a) as per https://developer.gnome.org/gtk3/stable/gtk3-Stock-Items.html use-stock=gtk-ok is deprecated and plain "OK", "Cancel" are indicated instead. b) to avoid adding thousands of extra labels to translate we'll convert use-stock buttons to use the translatable strings, but give them all the same "stock" translation context. Our translation rules don't like duplicates in the output .po's so strip "stock" contents from the translation collection rules in uiex and add a single set per .po in l10ntools/source/localize.cxx c) a script to rewrite the .uis to the new rules the previously use-stock labels won't appear translated until there has been a round trip of extraction, translations and import of translations Change-Id: Ibe4d0d27f2abbf5aa3df9c63af1561cd01d9fddd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108812 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-12-23tdf#135504: Install application metadata in /usr/share/metainfoChris Mayo2-2/+2
Current path /usr/share/appdata is deprecated [1]. [1] https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location Change-Id: Ibd837240ad329c005a840f9ae2e0f4f13f139b59 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106025 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-12-15remove extra space in version number in rpm/deb package infoAndras Timar1-1/+1
e.g. Instead of "Base module for LibreOffice 7.0 .3.1" we will get "Base module for LibreOffice 7.0.3.1". Change-Id: I9ce56b33f835a9527f777cfb9c0e466232e6f24f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105449 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-12-07move various notebookbar widgets into vclCaolán McNamara1-4/+0
and we can drop their factories then Change-Id: I1e261886dd7700710ba628da4bbeeba65efa1531 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107134 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-12-04move ManagedMenuButton to vclCaolán McNamara1-1/+0
Change-Id: Ie2dd1635a5f5f677d286011a14b734af7435612a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107231 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-30Adapt buck build to jars merged into libreoffice.jarRene Engelhard1-1/+2
Since ae855bf48163ff64d94cfc34aff8e37abdb5518d and 35518c92365cc183ba6cce2a4d284a130c0ca13f the ridl,jurt und unoil jars were merged into libreoffice.jar. Adapt the buck build correspondingly. Preserve the publishing of merged jars for now with dummy content and consider to remove them in future releases. Test Plan: 1. To replace version number with upcoming release version: $ solenv/bin/version.py 7.1.0 2. To install the API to local Maven repository: $ VERBOSE=1 buck build api_install 3. To deploy the API to Maven Central: $ VERBOSE=1 buck build api_deploy Change-Id: Id1b2135682ab962c901b944f3c26aeead9a4b19b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93724 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-11-23Check first if there is such a "bin" directory before attempting to use itTor Lillqvist1-4/+6
In the test-install target in Makefile.in we remove the "bin" folder of the LibreOfficePython framework. Change-Id: Idf3d440c4f9465f21b5dcae60d4fc5ac21965dd8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106284 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106398 Tested-by: Jenkins
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 00:51:18 +0000