clean up command line stuff
sim/main.cc: Clean uo usage output and print usage when no options are given Don't accept mpy files anymore since we don't use them. --HG-- extra : convert_revision : c3b16f602f301d2de12547285334c0037d829998
This commit is contained in:
parent
0ee75f27b8
commit
ba73e1cc39
25
sim/main.cc
25
sim/main.cc
|
@ -127,11 +127,12 @@ showBriefHelp(ostream &out)
|
||||||
" -I add the directory <dir> to python's path\n"
|
" -I add the directory <dir> to python's path\n"
|
||||||
" -P execute <python> directly in the configuration\n"
|
" -P execute <python> directly in the configuration\n"
|
||||||
" --var=val set the python variable <var> to '<val>'\n"
|
" --var=val set the python variable <var> to '<val>'\n"
|
||||||
" <configfile> config file name (.py or .mpy)\n",
|
" <configfile> config file name (ends in .py)\n\n",
|
||||||
prog);
|
prog);
|
||||||
|
|
||||||
ccprintf(out, "%s -X\n -X extract embedded files\n", prog);
|
ccprintf(out, "%s -X\n -X extract embedded files\n\n", prog);
|
||||||
ccprintf(out, "%s -h\n -h print long help\n", prog);
|
ccprintf(out, "%s -h\n -h print short help\n\n", prog);
|
||||||
|
ccprintf(out, "%s -H\n -H print long help\n\n", prog);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Show verbose help message. Includes parameter listing from
|
/// Show verbose help message. Includes parameter listing from
|
||||||
|
@ -245,12 +246,17 @@ main(int argc, char **argv)
|
||||||
signal(SIGINT, exitNowHandler); // dump final stats and exit
|
signal(SIGINT, exitNowHandler); // dump final stats and exit
|
||||||
signal(SIGABRT, abortHandler);
|
signal(SIGABRT, abortHandler);
|
||||||
|
|
||||||
sayHello(cerr);
|
|
||||||
|
|
||||||
bool configfile_found = false;
|
bool configfile_found = false;
|
||||||
PythonConfig pyconfig;
|
PythonConfig pyconfig;
|
||||||
string outdir;
|
string outdir;
|
||||||
|
|
||||||
|
if (argc < 2) {
|
||||||
|
showBriefHelp(cerr);
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
sayHello(cerr);
|
||||||
|
|
||||||
// Parse command-line options.
|
// Parse command-line options.
|
||||||
// Since most of the complex options are handled through the
|
// Since most of the complex options are handled through the
|
||||||
// config database, we don't mess with getopts, and just parse
|
// config database, we don't mess with getopts, and just parse
|
||||||
|
@ -283,6 +289,10 @@ main(int argc, char **argv)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'h':
|
case 'h':
|
||||||
|
showBriefHelp(cerr);
|
||||||
|
exit(1);
|
||||||
|
|
||||||
|
case 'H':
|
||||||
showLongHelp(cerr);
|
showLongHelp(cerr);
|
||||||
exit(1);
|
exit(1);
|
||||||
|
|
||||||
|
@ -328,9 +338,8 @@ main(int argc, char **argv)
|
||||||
string file(arg_str);
|
string file(arg_str);
|
||||||
string base, ext;
|
string base, ext;
|
||||||
|
|
||||||
if (!split_last(file, base, ext, '.') ||
|
if (!split_last(file, base, ext, '.') || ext != "py")
|
||||||
ext != "py" && ext != "mpy")
|
panic("Config file '%s' must end in '.py'\n", file);
|
||||||
panic("Config file '%s' must end in '.py' or '.mpy'\n", file);
|
|
||||||
|
|
||||||
pyconfig.load(file);
|
pyconfig.load(file);
|
||||||
configfile_found = true;
|
configfile_found = true;
|
||||||
|
|
Loading…
Reference in a new issue