emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-create: added -B (--built-with) to set "packaged-with" string obj.

Browse Source 
(cherry picked from commit 16cffb187990df161e4683ce3154abdd6ce2bbd4)
This commit is contained in:
Juan RP 2012-09-11 08:18:31 +02:00
parent 114fd914d8
commit b08d3ea89c
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bin/xbps-create/main.c
View File

@ -40,9 +40,6 @@
#include <xbps_api.h> #include <xbps_api.h>
#include "queue.h" #include "queue.h"
/*
* XXX: Add a flag to set "packaged-with" object in XBPS_PKGPROPS?
*/
#define _PROGNAME "xbps-create" #define _PROGNAME "xbps-create"
struct xentry { struct xentry {
@ -64,6 +61,7 @@ usage(void)
"usage: %s [options] [file1] [file2] ...\n\n" "usage: %s [options] [file1] [file2] ...\n\n"
" Options:\n" " Options:\n"
" -A, --architecture Package architecture (e.g: noarch, i686, etc).\n" " -A, --architecture Package architecture (e.g: noarch, i686, etc).\n"
" -B, --built-with Package builder string (e.g: xbps-src-30).\n"
" -C, --conflicts Conflicts (blank separated list,\n" " -C, --conflicts Conflicts (blank separated list,\n"
" e.g: 'foo>=2.0 blah<=2.0').\n" " e.g: 'foo>=2.0 blah<=2.0').\n"
" -D, --dependencies Dependencies (blank separated list,\n" " -D, --dependencies Dependencies (blank separated list,\n"
@ -465,6 +463,7 @@ main(int argc, char **argv)
{ {
struct option longopts[] = { struct option longopts[] = {
{ "architecture", required_argument, NULL, 'A' }, { "architecture", required_argument, NULL, 'A' },
{ "built-with", required_argument, NULL, 'B' },
{ "conflicts", required_argument, NULL, 'C' }, { "conflicts", required_argument, NULL, 'C' },
{ "dependencies", required_argument, NULL, 'D' }, { "dependencies", required_argument, NULL, 'D' },
{ "destdir", required_argument, NULL, 'd' }, { "destdir", required_argument, NULL, 'd' },
@ -484,7 +483,7 @@ main(int argc, char **argv)
}; };
struct archive *ar; struct archive *ar;
struct stat st; struct stat st;
const char *conflicts, *deps, *homepage, *license, *maint; const char *conflicts, *deps, *homepage, *license, *maint, *bwith;
const char *provides, *pkgver, *replaces, *desc, *ldesc; const char *provides, *pkgver, *replaces, *desc, *ldesc;
const char *arch, *config_files, *mutable_files, *version; const char *arch, *config_files, *mutable_files, *version;
char *pkgname, *binpkg, *tname, *p, cwd[PATH_MAX-1]; char *pkgname, *binpkg, *tname, *p, cwd[PATH_MAX-1];
@ -493,15 +492,18 @@ main(int argc, char **argv)
mode_t myumask; mode_t myumask;
arch = conflicts = deps = homepage = license = maint = NULL; arch = conflicts = deps = homepage = license = maint = NULL;
provides = pkgver = replaces = desc = ldesc = NULL; provides = pkgver = replaces = desc = ldesc = bwith = NULL;
config_files = mutable_files = NULL; config_files = mutable_files = NULL;
while ((c = getopt_long(argc, argv, while ((c = getopt_long(argc, argv,
"A:C:D:d:F:h:l:M:m:n:P:pR:S:s:V", longopts, &c)) != -1) { "A:B:C:D:d:F:h:l:M:m:n:P:pR:S:s:V", longopts, &c)) != -1) {
switch (c) { switch (c) {
case 'A': case 'A':
arch = optarg; arch = optarg;
break; break;
case 'B':
bwith = optarg;
break;
case 'C': case 'C':
conflicts = optarg; conflicts = optarg;
break; break;
@ -593,13 +595,20 @@ main(int argc, char **argv)
/* Optional properties */ /* Optional properties */
if (homepage) if (homepage)
prop_dictionary_set_cstring_nocopy(pkg_propsd, "homepage", homepage); prop_dictionary_set_cstring_nocopy(pkg_propsd,
"homepage", homepage);
if (license) if (license)
prop_dictionary_set_cstring_nocopy(pkg_propsd, "license", license); prop_dictionary_set_cstring_nocopy(pkg_propsd,
"license", license);
if (maint) if (maint)
prop_dictionary_set_cstring_nocopy(pkg_propsd, "maintainer", maint); prop_dictionary_set_cstring_nocopy(pkg_propsd,
"maintainer", maint);
if (ldesc) if (ldesc)
prop_dictionary_set_cstring_nocopy(pkg_propsd, "long_desc", ldesc); prop_dictionary_set_cstring_nocopy(pkg_propsd,
"long_desc", ldesc);
if (bwith)
prop_dictionary_set_cstring_nocopy(pkg_propsd,
"packaged-with", bwith);
if (preserve) if (preserve)
prop_dictionary_set_bool(pkg_propsd, "preserve", true); prop_dictionary_set_bool(pkg_propsd, "preserve", true);