Handle grub-pe2elf and grub-mkfont for cases when build != host.
* Makefile.am (build-grub-mkfont): Don't include gnulib. (build-grub-gen-asciih): Likewise. (build-grub-gen-widthspec): Likewise. * Makefile.util.def (grub-pe2elf): Remove. * config.h.in [GRUB_BUILD]: Use build rather than host constants. * configure.ac: Separate tests for build. Move ./build-grub-pe2elf to grub-core. Fix typo. * grub-core/Makefile.am (build-grub-pe2elf): New target. * grub-core/kern/emu/misc.c (xasprintf): Don't compile if GRUB_BUILD is defined. * include/grub/types.h [GRUB_BUILD]: Use build rather than host constants. * util/grub-mkfont.c [GRUB_BUILD]: Simplify not to rely on argp. * util/grub-pe2elf.c: Simplify not to rely on getopt. * util/misc.c (program_name) [GRUB_BUILD]: Define to static string.
This commit is contained in:
Vladimir 'phcoder' Serbinenko
parent
984cfd8a79
commit
7b780018f5
11 changed files with 174 additions and 102 deletions
|
|
@ -31,10 +31,14 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifndef GRUB_BUILD
|
||||
#define _GNU_SOURCE 1
|
||||
#include <argp.h>
|
||||
#endif
|
||||
#include <assert.h>
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
#include <ft2build.h>
|
||||
#include FT_FREETYPE_H
|
||||
#include FT_TRUETYPE_TAGS_H
|
||||
|
|
@ -47,7 +51,9 @@
|
|||
#define FT_ERROR_END_LIST };
|
||||
#include FT_ERRORS_H
|
||||
|
||||
#ifndef GRUB_BUILD
|
||||
#include "progname.h"
|
||||
#endif
|
||||
|
||||
#define GRUB_FONT_DEFAULT_SIZE 16
|
||||
|
||||
|
|
@ -919,13 +925,10 @@ write_font_pf2 (struct grub_font_info *font_info, char *output_file)
|
|||
fclose (file);
|
||||
}
|
||||
|
||||
#ifndef GRUB_BUILD
|
||||
static struct argp_option options[] = {
|
||||
{"output", 'o', N_("FILE"), 0, N_("save output in FILE [required]"), 0},
|
||||
/* TRANSLATORS: bitmaps are images like e.g. in JPEG. */
|
||||
{"width-spec", 0x103, 0, 0,
|
||||
/* TRANSLATORS: this refers to creating a file containing the width of
|
||||
every glyph but not the glyphs themselves. */
|
||||
N_("create width summary file"), 0},
|
||||
{"index", 'i', N_("NUM"), 0,
|
||||
/* TRANSLATORS: some font files may have multiple faces (fonts).
|
||||
This option is used to chose among them, the first face being '0'.
|
||||
|
|
@ -953,6 +956,23 @@ static struct argp_option options[] = {
|
|||
{"verbose", 'v', 0, 0, N_("print verbose messages."), 0},
|
||||
{ 0, 0, 0, 0, 0, 0 }
|
||||
};
|
||||
#define my_argp_parse argp_parse
|
||||
#define MY_ARGP_KEY_ARG ARGP_KEY_ARG
|
||||
#define my_error_t error_t
|
||||
#define MY_ARGP_ERR_UNKNOWN ARGP_ERR_UNKNOWN
|
||||
|
||||
#else
|
||||
|
||||
#define my_error_t int
|
||||
#define MY_ARGP_ERR_UNKNOWN -1
|
||||
#define MY_ARGP_KEY_ARG -1
|
||||
#define my_argp_parse(a, argc, argv, b, c, st) my_argp_parse_real(argc, argv, st)
|
||||
struct my_argp_state
|
||||
{
|
||||
void *input;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
struct arguments
|
||||
{
|
||||
|
|
@ -966,8 +986,15 @@ struct arguments
|
|||
enum file_formats file_format;
|
||||
};
|
||||
|
||||
static error_t
|
||||
argp_parser (int key, char *arg, struct argp_state *state)
|
||||
static int
|
||||
has_argument (int v)
|
||||
{
|
||||
return v =='o' || v == 'i' || v == 'r' || v == 'n' || v == 's'
|
||||
|| v == 'd' || v == 'c';
|
||||
}
|
||||
|
||||
static my_error_t
|
||||
argp_parser (int key, char *arg, struct my_argp_state *state)
|
||||
{
|
||||
/* Get the input argument from argp_parse, which we
|
||||
know is a pointer to our arguments structure. */
|
||||
|
|
@ -1055,22 +1082,66 @@ argp_parser (int key, char *arg, struct argp_state *state)
|
|||
font_verbosity++;
|
||||
break;
|
||||
|
||||
case ARGP_KEY_ARG:
|
||||
case MY_ARGP_KEY_ARG:
|
||||
assert (arguments->nfiles < arguments->files_max);
|
||||
arguments->files[arguments->nfiles++] = xstrdup(arg);
|
||||
break;
|
||||
|
||||
default:
|
||||
return ARGP_ERR_UNKNOWN;
|
||||
return MY_ARGP_ERR_UNKNOWN;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef GRUB_BUILD
|
||||
|
||||
/* We don't require host platform to have argp. In the same time configuring
|
||||
gnulib for build would result in even worse mess. So we have our
|
||||
minimalistic argp replacement just enough for build system. Most
|
||||
argp features are omitted. */
|
||||
|
||||
static int
|
||||
my_argp_parse_real (int argc, char **argv, void *st)
|
||||
{
|
||||
int curar;
|
||||
struct my_argp_state p;
|
||||
|
||||
p.input = st;
|
||||
|
||||
for (curar = 1; curar < argc; )
|
||||
{
|
||||
if (argv[curar][0] == '-')
|
||||
{
|
||||
if (has_argument (argv[curar][1])
|
||||
&& curar + 1 >= argc)
|
||||
return 1;
|
||||
if (has_argument (argv[curar][1]))
|
||||
{
|
||||
if (argp_parser (argv[curar][1], argv[curar + 1], &p))
|
||||
return 1;
|
||||
curar += 2;
|
||||
continue;
|
||||
}
|
||||
if (argp_parser (argv[curar][1], NULL, &p))
|
||||
return 1;
|
||||
curar++;
|
||||
continue;
|
||||
}
|
||||
if (argp_parser (MY_ARGP_KEY_ARG, argv[curar], &p))
|
||||
return 1;
|
||||
curar++;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef GRUB_BUILD
|
||||
static struct argp argp = {
|
||||
options, argp_parser, N_("[OPTIONS] FONT_FILES"),
|
||||
N_("Convert common font file formats into PF2"),
|
||||
NULL, NULL, NULL
|
||||
};
|
||||
#endif
|
||||
|
||||
int
|
||||
main (int argc, char *argv[])
|
||||
|
|
@ -1078,7 +1149,9 @@ main (int argc, char *argv[])
|
|||
FT_Library ft_lib;
|
||||
struct arguments arguments;
|
||||
|
||||
#ifndef GRUB_BUILD
|
||||
set_program_name (argv[0]);
|
||||
#endif
|
||||
|
||||
grub_util_init_nls ();
|
||||
|
||||
|
|
@ -1090,7 +1163,7 @@ main (int argc, char *argv[])
|
|||
memset (arguments.files, 0, (arguments.files_max + 1)
|
||||
* sizeof (arguments.files[0]));
|
||||
|
||||
if (argp_parse (&argp, argc, argv, 0, 0, &arguments) != 0)
|
||||
if (my_argp_parse (&argp, argc, argv, 0, 0, &arguments) != 0)
|
||||
{
|
||||
fprintf (stderr, "%s", _("Error in parsing command line arguments\n"));
|
||||
exit(1);
|
||||
|
|
|
|||
|
|
@ -30,37 +30,9 @@
|
|||
#include <stdlib.h>
|
||||
#include <getopt.h>
|
||||
|
||||
#include "progname.h"
|
||||
|
||||
/* Please don't internationalise this file. It's pointless. */
|
||||
|
||||
static struct option options[] = {
|
||||
{"help", no_argument, 0, 'h'},
|
||||
{"version", no_argument, 0, 'V'},
|
||||
{"verbose", no_argument, 0, 'v'},
|
||||
{0, 0, 0, 0}
|
||||
};
|
||||
|
||||
static void __attribute__ ((noreturn))
|
||||
usage (int status)
|
||||
{
|
||||
if (status)
|
||||
fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
|
||||
else
|
||||
printf ("\
|
||||
Usage: %s [OPTIONS] input [output]\n\
|
||||
\n\
|
||||
Tool to convert pe image to elf.\n\
|
||||
\nOptions:\n\
|
||||
-h, --help display this message and exit\n\
|
||||
-V, --version print version information and exit\n\
|
||||
-v, --verbose print verbose messages\n\
|
||||
\n\
|
||||
Report bugs to <%s>.\n", program_name, PACKAGE_BUGREPORT);
|
||||
|
||||
exit (status);
|
||||
}
|
||||
|
||||
/*
|
||||
* Section layout
|
||||
*
|
||||
|
|
@ -490,54 +462,27 @@ main (int argc, char *argv[])
|
|||
{
|
||||
char *image;
|
||||
FILE* fp;
|
||||
|
||||
set_program_name (argv[0]);
|
||||
|
||||
/* Check for options. */
|
||||
while (1)
|
||||
{
|
||||
int c = getopt_long (argc, argv, "hVv", options, 0);
|
||||
|
||||
if (c == -1)
|
||||
break;
|
||||
else
|
||||
switch (c)
|
||||
{
|
||||
case 'h':
|
||||
usage (0);
|
||||
break;
|
||||
|
||||
case 'V':
|
||||
printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
|
||||
return 0;
|
||||
|
||||
case 'v':
|
||||
verbosity++;
|
||||
break;
|
||||
|
||||
default:
|
||||
usage (1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
char *in, *out;
|
||||
|
||||
/* Obtain PATH. */
|
||||
if (optind >= argc)
|
||||
if (1 >= argc)
|
||||
{
|
||||
fprintf (stderr, "Filename not specified.\n");
|
||||
usage (1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
image = grub_util_read_image (argv[optind]);
|
||||
in = argv[1];
|
||||
if (argc > 2)
|
||||
out = argv[2];
|
||||
else
|
||||
out = in;
|
||||
image = grub_util_read_image (in);
|
||||
|
||||
if (optind + 1 < argc)
|
||||
optind++;
|
||||
|
||||
fp = fopen (argv[optind], "wb");
|
||||
fp = fopen (out, "wb");
|
||||
if (! fp)
|
||||
grub_util_error ("cannot open %s", argv[optind]);
|
||||
grub_util_error ("cannot open %s", out);
|
||||
|
||||
convert_pe (fp, argv[optind], image);
|
||||
convert_pe (fp, out, image);
|
||||
|
||||
fclose (fp);
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,11 @@
|
|||
#include <grub/script_sh.h>
|
||||
|
||||
#define ENABLE_RELOCATABLE 0
|
||||
#ifdef GRUB_BUILD
|
||||
const char *program_name = GRUB_BUILD_PROGRAM_NAME;
|
||||
#else
|
||||
#include "progname.h"
|
||||
#endif
|
||||
|
||||
/* Include malloc.h, only if memalign is available. It is known that
|
||||
memalign is declared in malloc.h in all systems, if present. */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue