Skip to content
Permalink
e77f32591d
Switch branches/tags

Name already in use

A tag already exists with the provided branch name. Many Git commands accept both tag and branch names, so creating this branch may cause unexpected behavior. Are you sure you want to create this branch?
Go to file
Add *E* and *d* as placeholders to format the extra version.

Sometimes, the bee version requirement, to separate the extra version
with an underscore, contradicts the upstream versioning, which for
example uses a dash. 4.8-rc2 is the version of the second release
candidate of the Linux kernel 4.8. An underscore has to be used in the
bee file version though.

```
$ beeversion linux-4.8_rc2-95.x86_64
PKGNAME=linux
PKGEXTRANAME=
PKGEXTRANAME_UNDERSCORE=
PKGEXTRANAME_DASH=
PKGVERSION=( 4.8 4 4.8 )
PKGEXTRAVERSION=rc2
PKGEXTRAVERSION_UNDERSCORE=_rc2
PKGEXTRAVERSION_DASH=-rc2
PKGREVISION=95
PKGARCH=x86_64
PKGFULLNAME=linux
PKGFULLVERSION=4.8_rc2
PKGFULLPKG=linux-4.8_rc2-95
PKGALLPKG=linux-4.8_rc2-95.x86_64
PKGSUFFIX=
```

As can be seen, environment variables to output the extra version with a
dash (-) or with an underscore (_) are provided.

These options are missing as placeholders for the switch `format`. So,
add them.

*E* adds an underscore in front of the extra version, while *d* adds a
dash.

These are useful, as now, no additional logic has to be implemented in
scripts calling `beeversion`, to check if an extra version is present,
to determine if a separator needs to be added or not.

In case of the Linux kernel, 4.8-rc2 can be created with the switch
below.

```
> beeversion --format="%v%d" linux-4.8_rc2-95.x86_64
4.8-rc2
```
2 contributors

Users who have contributed to this file

@mariux @pmenzel
208 lines (183 sloc) 5.79 KB
/*
** beeversion - compare bee package versionnumbers
** Copyright (C) 2010-2016
** Marius Tolzmann <m@rius.berlin>
** David Fessler <dfessler@uni-potsdam.de>
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
** the Free Software Foundation; either version 3 of the License, or
** (at your option) any later version.
**
** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <stdio.h>
#include <string.h>
#include <assert.h>
#include "bee_version.h"
static void cut_and_print(char *string, char delimiter, char opt_short)
{
char *p, *s;
assert(string);
p = s = string;
printf("%s", string);
while((p=strchr(p, delimiter))) {
putchar(' ');
while(s < p)
putchar(*(s++));
p++;
s = (opt_short) ? p : string;
}
printf(" %s", s);
}
void print_format(char* s, struct beeversion *v, char *filter_pkgfullname)
{
char *p;
size_t len;
assert(s);
assert(v);
assert(v->pkgname);
assert(v->subname);
assert(v->version);
assert(v->extraversion);
assert(v->pkgrevision);
assert(v->arch);
assert(v->suffix);
p=s;
if(filter_pkgfullname) {
len = strlen(v->pkgname);
if(len > strlen(filter_pkgfullname))
return;
if(strncmp(v->pkgname, filter_pkgfullname, len))
return;
p = filter_pkgfullname+len;
if((!*p && *(v->subname)) || (*p && *p++ != '_'))
return;
if(strcmp(p, v->subname))
return;
}
for(p=s; *p; p++) {
if(*p == '%') {
switch(*(++p)) {
case '%':
printf("%%");
break;
case 'p':
printf("%s", v->pkgname);
break;
case 's':
if(*(v->suffix))
printf(".%s", v->suffix);
break;
case 'x':
printf("%s", v->subname);
break;
case 'v':
printf("%s", v->version);
break;
case 'e':
printf("%s", v->extraversion);
break;
case 'E':
printf("_%s", v->extraversion);
break;
case 'd':
printf("-%s", v->extraversion);
break;
case 'r':
printf("%s", v->pkgrevision);
break;
case 'a':
printf("%s", v->arch);
break;
case 'P':
printf("%s", v->pkgname);
if(*(v->subname))
printf("_%s", v->subname);
break;
case 'V':
printf("%s", v->version);
if(*(v->extraversion))
printf("_%s", v->extraversion);
break;
case 'F':
case 'A':
if(*(v->pkgname))
printf("%s", v->pkgname);
if(*(v->subname))
printf("_%s", v->subname);
if(*(v->version))
printf("-%s", v->version);
if(*(v->extraversion))
printf("_%s", v->extraversion);
if(*(v->pkgrevision))
printf("-%s", v->pkgrevision);
if(*p == 'A' && *(v->arch))
printf(".%s", v->arch);
break;
case '-':
case '_':
switch(*(p+1)) {
case 'x':
if (*(v->subname))
printf("%c%s", *p, v->subname);
p++;
continue;
case 'e':
if (*(v->extraversion))
printf("%c%s", *p, v->extraversion);
p++;
continue;
}
default:
printf("%%%c", *p);
break;
}
continue;
} /* if '%' */
if(*p == '@') {
switch(*(++p)) {
case 'v':
cut_and_print(v->version, '.', 0);
break;
case 'e':
cut_and_print(v->extraversion, '_', 0);
break;
case 'V':
cut_and_print(v->version, '.', 1);
break;
case 'E':
cut_and_print(v->extraversion, '_', 1);
break;
default:
printf("@%c", *p);
break;
}
continue;
} /* if '@' */
if(*p == '\\') {
switch(*(++p)) {
case 'n':
printf("\n");
break;
case 't':
printf("\t");
break;
case '0':
printf("%c", '\0');
break;
default:
printf("%c", *p);
break;
}
continue;
} /* if '\' */
printf("%c", *p);
} /* for *p */
}