tastytea/compilescript
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Add --compiler, to override compiler command.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
tastytea 2019-10-10 22:52:51 +02:00
parent 5430c2de39
commit c9e38fa636
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
man/compilescript.1.adoc
View File

@ -2,7 +2,7 @@
:doctype: manpage :doctype: manpage
:Author: tastytea :Author: tastytea
:Email: tastytea@tastytea.de :Email: tastytea@tastytea.de
:Date: 2019-10-01 :Date: 2019-10-10
:Revision: 0.0.0 :Revision: 0.0.0
:man source: compilescript :man source: compilescript
:man version: {revision} :man version: {revision}
@ -40,6 +40,9 @@ The compiler invocation looks like this: <configured compiler> <source file>
Delete old cache files. You can configure the timespan after which a file is Delete old cache files. You can configure the timespan after which a file is
considered old with the config option _clean_after_hours_. considered old with the config option _clean_after_hours_.
*--compiler* _command_::
Override compiler command. Note that *--compiler*=_command_ does NOT work.
*--version*:: *--version*::
Print version, copyright and license. Print version, copyright and license.

32
src/main.cpp
View File

@ -60,6 +60,8 @@ public:
void run(const string &filename, char *argv[]); void run(const string &filename, char *argv[]);
//! Print version, copyright and license. //! Print version, copyright and license.
void print_version(); void print_version();
//! Set compiler command.
void set_compiler(const string &command);
}; };
Compilescript::Compilescript() Compilescript::Compilescript()
@ -218,9 +220,7 @@ string Compilescript::compile(const string &filename)
void Compilescript::run(const string &filename, char *argv[]) void Compilescript::run(const string &filename, char *argv[])
{ {
// We know that argv[1] exists. execvp(filename.c_str(), argv);
// NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic)
execvp(filename.c_str(), &argv[1]);
} }
void Compilescript::print_version() void Compilescript::print_version()
@ -233,6 +233,11 @@ void Compilescript::print_version()
"\nand you are welcome to redistribute it under certain conditions.\n"; "\nand you are welcome to redistribute it under certain conditions.\n";
} }
void Compilescript::set_compiler(const string &command)
{
_compiler = command;
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
const vector<string> args(argv, argv + argc); const vector<string> args(argv, argv + argc);
@ -245,7 +250,8 @@ int main(int argc, char *argv[])
if (args.size() <= 1) if (args.size() <= 1)
{ {
cerr << "usage: " << args[0] cerr << "usage: " << args[0]
<< " [file|--cleanup|--version] [arguments]\n"; << " [file|--cleanup|--version|--compiler command] "
<< "[arguments]\n";
return 1; return 1;
} }
if (args[1] == "--cleanup") if (args[1] == "--cleanup")
@ -258,9 +264,25 @@ int main(int argc, char *argv[])
App.print_version(); App.print_version();
return 0; return 0;
} }
if (args[1] == "--compiler")
{
if (args.size() <= 3)
{
cerr << "Error: You need to specify a command.\n";
return 1;
}
App.set_compiler(args[2]);
const string binary = App.compile(args[3]);
// We know that argv[3] exists.
// NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic)
App.run(binary, &argv[3]);
return 0;
}
const string binary = App.compile(args[1]); const string binary = App.compile(args[1]);
App.run(binary, argv); // We know that argv[1] exists.
// NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic)
App.run(binary, &argv[1]);
} }
catch (const std::exception &e) catch (const std::exception &e)
{ {