From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ECD1E139694 for ; Wed, 22 Mar 2017 12:51:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1E597E0E62; Wed, 22 Mar 2017 12:51:57 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E41E9E0E5F for ; Wed, 22 Mar 2017 12:51:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E27DE340BEA for ; Wed, 22 Mar 2017 12:51:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 386FA710E for ; Wed, 22 Mar 2017 12:51:43 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1490184007.12fa38a1fa44ed435631968f1a82bd24fc0e5dbc.dolsen@gentoo> Subject: [gentoo-commits] proj/gentoolkit:master commit in: man/, bin/, / X-VCS-Repository: proj/gentoolkit X-VCS-Files: bin/ebump man/ebump.1 setup.py X-VCS-Directories: bin/ man/ / X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 12fa38a1fa44ed435631968f1a82bd24fc0e5dbc X-VCS-Branch: master Date: Wed, 22 Mar 2017 12:51:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7961bdb0-93c5-48d7-b089-03549257d6c2 X-Archives-Hash: 000477c259948ab57fbb78f117794502 commit: 12fa38a1fa44ed435631968f1a82bd24fc0e5dbc Author: Brian Dolbec gentoo org> AuthorDate: Wed Mar 22 11:56:59 2017 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Wed Mar 22 12:00:07 2017 +0000 URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=12fa38a1 ebump: Add to setup.py, minor update to man page Update script to use VERSION like the other scripts bin/ebump | 7 ++++--- man/ebump.1 | 42 +++++++++++++++++++++--------------------- setup.py | 2 ++ 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/bin/ebump b/bin/ebump index b129f85..a0d4d56 100755 --- a/bin/ebump +++ b/bin/ebump @@ -3,7 +3,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -__version__="0.1.1" __author__="Karl Trygve Kalleberg" __email__="" __description__="Ebuild version bumping tool" @@ -13,6 +12,8 @@ __description__="Ebuild version bumping tool" # a given ebuild and auxiliary files in the Portage tree. It is only # useful for Gentoo developers with CVS commit access. +VERSION="git" + die() { echo $1 >&2 exit -1 @@ -25,7 +26,7 @@ einfo() { } print_version() { - echo "${__description__}, v${__version__}" + echo "${__description__}, v${VERSION}" echo "Copyright (c) 2004 ${__author__} ${__email__}" echo "Copyright 1999-2010 Gentoo Foundation" echo "Distributed under the terms of the GNU General Public License v2" @@ -33,7 +34,7 @@ print_version() { print_usage() { echo "Usage: ebump foo<.ebuild>" - echo "Ebuild version bumping tool, v${__version__}" + echo "Ebuild version bumping tool, v${VERSION}" echo " -V|--version show version info" echo " -v|--verbose increase verbosity" echo " -q|--quiet turn off output" diff --git a/man/ebump.1 b/man/ebump.1 index b1e473d..1754cf9 100644 --- a/man/ebump.1 +++ b/man/ebump.1 @@ -1,12 +1,12 @@ -.TH "ebump" "1" "0.1.1" "Gentoolkit" "Gentoo Administration" +.TH "EBUMP" "1" "March 2017" "GENTOOLKIT" "Gentoo Administration" .SH "NAME" -.LP +.LP ebump \- Gentoo: Ebuild revision bumper .SH "SYNTAX" -.LP +.LP ebump [\fIoption\fP] <\fIpackage-name[-version]\fP> -.SH "DESCRIPTION" +.SH "DESCRIPTION" .LP \fIebump\fR bumps the revision of a particular ebuild, and all auxiliary @@ -15,36 +15,36 @@ files in the files/ directory that have a matching version suffix. .LP By default, the all new revision files will be added to the VCS. -.LP +.LP You must stand in the directory of the ebuild to be bumped. .SH "OPTIONS" -.LP +.LP \fB\-C\fR .br \fB--no-vcs\fB -.IP +.IP Do not add new files to VCS. -.LP +.LP \fB\-V\fR .br \fB--version\fB -.IP +.IP Display version information and exit. -.LP +.LP \fB\-v\fR .br \fB--verbose\fB -.IP +.IP Increase verbosity level. May be used more than once. -.LP +.LP \fB\-q\fR .br \fB--quiet\fB -.IP +.IP Do not output any non-essential information. .LP @@ -61,19 +61,19 @@ don't bump auxfiles (files/*) .IP do not update ChangeLog (via echangelog) -.LP +.LP \fB\-m\fR <\fIChangeLog text\fR> -.br +.br \fB\--message\fR <\fIChangeLog text\fR> -.IP +.IP Specifies the message to add to the ChangeLog, instead of the standard placeholder. -.LP +.LP \fB\-d\fR .br \fB\--delete-old\fR -.IP +.IP Delete old revision and old auxiliary files from VCS. This is \fIdangerous\fR and should only be used if you know exactly what you are doing, because @@ -111,16 +111,16 @@ From these files, \fIebump\fR will load the settings .br \fB~/.gentoo/gentool-env\fR .IR -From this file, \fIebump\fR will load the env vars \fBAUTHORNAME\fR and +From this file, \fIebump\fR will load the env vars \fBAUTHORNAME\fR and \fBAUTHOREMAIL\fR, which are used to generate proper ChangeLog entries. .SH "SEE ALSO" -.LP +.LP The rest of the utilities in \fIapp-portage/gentoolkit-dev\fR, such as \fIechangelog(1)\fR and \fIekeyword(1)\fR. .SH "AUTHORS" -.LP +.LP Karl Trygve Kalleberg .br Christian Ruppert diff --git a/setup.py b/setup.py index 024b612..d16a56b 100755 --- a/setup.py +++ b/setup.py @@ -30,6 +30,7 @@ except ImportError: # Bash files that need `VERSION=""` subbed, relative to this dir: bash_scripts = [(os.path.join(cwd, path), 'VERSION=') for path in ( + 'bin/ebump', 'bin/euse', 'bin/revdep-rebuild.sh' )] @@ -49,6 +50,7 @@ python_scripts = [(os.path.join(cwd, path), '__version__ = ') for path in ( )] manpages = [(os.path.join(cwd, path[0]), path[1]) for path in ( + ('man/ebump.1', 'EBUMP'), ('man/eclean.1', 'ECLEAN'), ('man/enalyze.1', 'ENALYZE'), ('man/epkginfo.1', 'EPKGINFO'),