# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # $(eval $(call gb_InstallModule_InstallModule,scp2/windows)) $(eval $(call gb_InstallModule_define_if_set,scp2/windows,\ BUILD_X64 \ )) $(eval $(call gb_InstallModule_add_defs,scp2/windows,\ $(if $(WINDOWS_SDK_HOME),\ -DHAVE_WINDOWS_SDK \ ) \ )) $(eval $(call gb_InstallModule_add_scpfiles,scp2/windows,\ scp2/source/ooo/folder_ooo \ $(if $(MSM_PATH),scp2/source/ooo/vc_redist) \ $(if $(UCRT_REDISTDIR),scp2/source/ooo/ucrt) \ scp2/source/ooo/windowscustomaction_ooo \ )) $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/windows,\ scp2/source/base/folderitem_base \ scp2/source/base/registryitem_base \ scp2/source/calc/folderitem_calc \ scp2/source/calc/registryitem_calc \ scp2/source/draw/folderitem_draw \ scp2/source/draw/registryitem_draw \ scp2/source/impress/folderitem_impress \ scp2/source/impress/registryitem_impress \ scp2/source/math/folderitem_math \ scp2/source/math/registryitem_math \ scp2/source/ooo/folderitem_ooo \ scp2/source/ooo/registryitem_ooo \ scp2/source/writer/folderitem_writer \ scp2/source/writer/registryitem_writer \ )) # vim: set shiftwidth=4 tabstop=4 noexpandtab: ion value='distro/cib/libreoffice-5-3'>distro/cib/libreoffice-5-3 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/logerrit
AgeCommit message (Collapse)Author
2021-06-01logerrit: drop some subcommands in favour of Gerrit defaultsIlmari Lauhakangas
submit-wip and submit-private don't really add value Change-Id: I4e30b213f5d6317538aad73fcb68e14e7cbb5032 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116198 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-04-06fix logerrit on macNoel Grandin
where my initial commit seems not to have done the job. Change-Id: I437df21fc5164eace48c8a2dc093e2c3dcc37826 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113661 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-03-14Cygwin/MINGW also use '--date'Mike Kaganski
Change-Id: Icd0ad5e304d8479a56552dc8ff00b3bddab0ecf6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112466 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-03-11and fix logerrit on linux againNoel
after I broke it with commit 69959235c3094b811406f734e863a63fc61046c0 Date: Tue Mar 9 19:29:19 2021 +0200 adapt recent change to macOS Change-Id: Ib58e9903839143fdf6e84a04d532f70a8212f984 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112269 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-03-10adapt recent change to macOSNoel Grandin
... from commit e7a471a8fbac22877973af7e7be8c6a0701b4046 logerrit: do not submit if parent is older than a week Change-Id: Icd1ee7f66dbbcef90add9e4ddecfdb9bbc0900e4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112234 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-03-08logerrit: do not submit if parent is older than a weekXisco Fauli
Change-Id: Ieb20b3086082bd0a88e457b0ae922234ce737b8a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112009 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-07-30Add an optional Gerrit change ID to testfeatureJan-Marek Glogowski
This way it's possible to have all test runs in a single change, so it's easier to check different results. Change-Id: I1aa3a229f5ee3ba12dbd2c18328d34c8a4528c07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99688 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2020-05-27logerrit: Don't suggest to set oneself a username.Guilhem Moulin
Usernames (used for HTTP and SSH authentication) are now automatically provisioned from SSO (along with the primary email address and display name). Username/email collisions are fatal and need manual resolution, but for most users the registration step should be somewhat simpler. Also, update the documentation to reflect /settings/#SSHKeys from gerrit 3.0's UI. Change-Id: Ia634c2f92f42b4b698543d990534ac15215a4c96 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94931 Reviewed-by: Guilhem Moulin <guilhem@libreoffice.org> Tested-by: Jenkins
2020-03-02fix get_SHA_for_change in logerrit scriptNoel Grandin
after commit 02b5d09c0dab1621ce23f9a8df45fa1628be3ece tdf#105204 fix shellcheck warnings in logerrit the previous get_SHA_for_change returned a URL with a leading space, which was previously implicitly stripped. Adding quotes prevents that stripping, so we need to explicitly strip here Change-Id: I5b303f6ca5b1dc7d2a369afc2c52830b1b9586eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89816 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-28tdf#105204 fix shellcheck warnings in logerritIlmari Lauhakangas
- double quote to prevent globbing and word splitting - use read with -r - handle pushd and popd failures - escape arguments to ssh (thanks to Guilhem for the solution) Change-Id: I5fcbb0248779a4fe3c0e50a9597874bcbf8217e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89643 Reviewed-by: Guilhem Moulin <guilhem@libreoffice.org> Tested-by: Jenkins
2020-01-16logerrit: Upgrade URIs to https://Guilhem Moulin
Change-Id: I0dc259178e5df6334a13ab04850ec662499fe7d3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86821 Reviewed-by: Guilhem Moulin <guilhem@libreoffice.org> Tested-by: Jenkins
2020-01-16logerrit setup: refactor key-based SSH handlingGuilhem Moulin
* Don't select existing ~/.ssh/id_dsa.pub. Since 7.0 (released 2015-08-11) OpenSSH servers won't accept DSA user keys anyway, so users have likely rotated their legacy key material by now. * The pubkey to copy into gerrit is derived from the first existing file among ~/.ssh/id_ecdsa, ~/.ssh/id_ed25519, and ~/.ssh/id_rsa. These algorithms are ordered as found in PubkeyAcceptedKeyTypes' default value as of OpenSSH 8.1. (EC keys are only supported since Gerrit 1.14.) Generate an RSA key when ~/.ssh doesn't exist, as before, since it's still the default in ssh-keygen(1) from OpenSSH 8.1. * In the ssh_config(5) stanza, only include the IdentityFile when a the private key file exists. The private key material might reside somewhere else, for instance in a smartcard or in an external agent's key store; in both cases the ssh client can authenticate the user without direct access to the key material. While it's possible to set IdentityFile to a pubkey (with IdentitiesOnly={yes,no}) it's not documented and thus shouldn't be used. Change-Id: Id73a2798747ce5c394b0cf2d0dc40107a1f2c599 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86858 Reviewed-by: Guilhem Moulin <guilhem@libreoffice.org> Tested-by: Guilhem Moulin <guilhem@libreoffice.org>
2020-01-15logerrit: atomically create ~/.ssh with restrictive modeGuilhem Moulin
AFAICT `mkdir [-m mode]` is already defined in POSIX.1-1990. Change-Id: I159578eac16398f16d55578fbd818906b77cf373 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86852 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-06logerrit: support submitting private and wip changesIlmari Lauhakangas
Change-Id: I0ee3ac887e17b38b6a2c501bcf6a2132406f1d20 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86273 Reviewed-by: Guilhem Moulin <guilhem@libreoffice.org> Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-12-26Fix typoAndrea Gelmini
Change-Id: I80aae5ad98e7275bd266e1295e6988dc202649a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85840 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-09-06Fixing '....'Andrea Gelmini
Change-Id: Icf2a34500acc18b28f113c85366bf24edc6d20b9 Reviewed-on: https://gerrit.libreoffice.org/78695 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-03-05Fix typoAndrea Gelmini
Change-Id: Ie8919bff20c7b29a3fee7a25bba65550b3fd086d Reviewed-on: https://gerrit.libreoffice.org/68726 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2017-09-06Improve error message on ssh login failure.Shinnok
Also use the GERRITHOST variable instead of magic text. Change-Id: I3314be81017f64fca8aa756cca1715081ad01641 Reviewed-on: https://gerrit.libreoffice.org/41988 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2017-01-17tdf#105204 fix shellcheck warnings in logerritqarkai
Change shebang to bash since -p option is used in read command, use $(..) instead of `..`, double quote to prevent word splitting, handle cd failure. Change-Id: I2ae00bbd21754136610504f2ff6818b8d3695cc4 Reviewed-on: https://gerrit.libreoffice.org/33089 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-04-27logerrit: disarm the "resubmit" foot-gunMichael Stahl
Recently some new developers accidentally used "resubmit", intending to upload a new revision of their change, but it actually always creates a new gerrit change. 4e15809a78ea3c6062e20e439cf8df3d06cd8569 claims that "resubmit creates a new Change-Id for the current change and thus allow to submit changes for review on release branches that were already reviewed on master", but that is not actually required with gerrit versions that were in use in the recent years, gerrit is capable of tracking Change-Id per branch. Change-Id: I66eda4dbc6f4ff1e235105b3f55041cda88a6b60