frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Application build time added to application to write to stdout at startup

Browse Source 
Former-commit-id: 4fca64a4b7ae6f0d74495173df26538cebae95f3
This commit is contained in:
johan 2013-10-21 20:29:30 +02:00
parent 293a2e7c19
commit 756e9a28c0
2 changed files with 63 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
dependencies/build/getoptPlusPlus/getoptpp.cc vendored
View File

@ -49,81 +49,82 @@ void OptionsParser::parse(int argc, const char* argv[]) throw(runtime_error)
for(; !state.end(); state.advance()) { for(; !state.end(); state.advance()) {
std::list<Parameter*>::iterator i; std::list<Parameter*>::iterator i;
for(i = parameters.parameters.begin(); for(i = parameters.parameters.begin();
i != parameters.parameters.end(); i++) i != parameters.parameters.end(); i++)
{ {
int n = 0; int n = 0;
try try
{ {
n = (*i)->receive(state); n = (*i)->receive(state);
} }
catch(Parameter::ExpectedArgument &) catch(Parameter::ExpectedArgument &)
{ {
throw Parameter::ExpectedArgument(state.get() + ": expected an argument"); throw Parameter::ExpectedArgument(state.get() + ": expected an argument");
} }
catch(Parameter::UnexpectedArgument &) catch(Parameter::UnexpectedArgument &)
{ {
throw Parameter::UnexpectedArgument(state.get() + ": did not expect an argument"); throw Parameter::UnexpectedArgument(state.get() + ": did not expect an argument");
} }
catch(Switchable::SwitchingError &) catch(Switchable::SwitchingError &)
{ {
throw Parameter::ParameterRejected(state.get() + ": parameter already set"); throw Parameter::ParameterRejected(state.get() + ": parameter already set");
} }
catch(Parameter::ParameterRejected & pr) { catch(Parameter::ParameterRejected & pr) {
std::string what = pr.what(); std::string what = pr.what();
if(what.length()) if(what.length())
{ {
throw Parameter::ParameterRejected(state.get() + ": " + what); throw Parameter::ParameterRejected(state.get() + ": " + what);
} }
throw Parameter::ParameterRejected(state.get() + " (unspecified error)"); throw Parameter::ParameterRejected(state.get() + " (unspecified error)");
} }
for (int j = 1; j < n; ++j) for (int j = 1; j < n; ++j)
{ {
state.advance(); state.advance();
} }
if(n != 0) if(n != 0)
{ {
break; break;
} }
} }
if(i == parameters.parameters.end()) { if(i == parameters.parameters.end()) {
std::string file = state.get(); std::string file = state.get();
if(file == "--") { if(file == "--") {
state.advance(); state.advance();
break; break;
} }
else if(file.at(0) == '-') else if(file.at(0) == '-')
throw Parameter::ParameterRejected(string("Bad parameter: ") + file); throw Parameter::ParameterRejected(string("Bad parameter: ") + file);
else files.push_back(state.get()); else files.push_back(state.get());
} }
} }
if(!state.end()) for(; !state.end(); state.advance()) { if(!state.end()) for(; !state.end(); state.advance()) {
files.push_back(state.get()); files.push_back(state.get());
} }
} }
void OptionsParser::usage() const { void OptionsParser::usage() const {
cerr << fprogramDesc << endl; cerr << fprogramDesc << endl;
cerr << "Build time: " << __DATE__ << " " << __TIME__ << endl << endl;
cerr << "Usage: " << programName() << " [OPTIONS]" << endl << endl; cerr << "Usage: " << programName() << " [OPTIONS]" << endl << endl;
cerr << "Parameters: " << endl; cerr << "Parameters: " << endl;
std::list<Parameter*>::const_iterator i; std::list<Parameter*>::const_iterator i;
for(i = parameters.parameters.begin(); for(i = parameters.parameters.begin();
i != parameters.parameters.end(); i++) i != parameters.parameters.end(); i++)
{ {
cerr.width(30); cerr.width(30);
cerr << std::left << " " + (*i)->usageLine(); cerr << std::left << " " + (*i)->usageLine();
cerr.width(40); cerr.width(40);
cerr << std::left << (*i)->description() << endl; cerr << std::left << (*i)->description() << endl;
} }
} }
@ -148,9 +149,9 @@ ParameterSet::ParameterSet(const ParameterSet& ps) {
ParameterSet::~ParameterSet() { ParameterSet::~ParameterSet() {
for(std::list<Parameter*>::iterator i = parameters.begin(); for(std::list<Parameter*>::iterator i = parameters.begin();
i != parameters.end(); i++) i != parameters.end(); i++)
{ {
delete *i; delete *i;
} }
} }
@ -161,7 +162,7 @@ ParameterSet::~ParameterSet() {
Parameter& ParameterSet::operator[](char c) const { Parameter& ParameterSet::operator[](char c) const {
for(std::list<Parameter*>::const_iterator i = parameters.begin(); i!= parameters.end(); i++) { for(std::list<Parameter*>::const_iterator i = parameters.begin(); i!= parameters.end(); i++) {
if((*i)->shortOption() == c) return *(*i); if((*i)->shortOption() == c) return *(*i);
} }
throw out_of_range("ParameterSet["+c+string("]")); throw out_of_range("ParameterSet["+c+string("]"));
} }
@ -169,7 +170,7 @@ Parameter& ParameterSet::operator[](char c) const {
Parameter& ParameterSet::operator[](const string& param) const { Parameter& ParameterSet::operator[](const string& param) const {
for(std::list<Parameter*>::const_iterator i = parameters.begin(); i!= parameters.end(); i++) { for(std::list<Parameter*>::const_iterator i = parameters.begin(); i!= parameters.end(); i++) {
if((*i)->longOption() == param) return *(*i); if((*i)->longOption() == param) return *(*i);
} }
throw out_of_range("ParameterSet["+param+"]"); throw out_of_range("ParameterSet["+param+"]");
} }
@ -278,7 +279,7 @@ void PresettableUniquelySwitchable::preset() {
template<> template<>
PODParameter<string>::PODParameter(char shortOption, const char *longOption, PODParameter<string>::PODParameter(char shortOption, const char *longOption,
const char* description) : CommonParameter<PresettableUniquelySwitchable>(shortOption, longOption, description) { const char* description) : CommonParameter<PresettableUniquelySwitchable>(shortOption, longOption, description) {
preset(); preset();
} }
@ -297,7 +298,7 @@ int PODParameter<int>::validate(const string &s) throw(Parameter::ParameterRejec
if(*cstr != '\0') throw ParameterRejected("Expected int"); if(*cstr != '\0') throw ParameterRejected("Expected int");
if(l > INT_MAX || l < INT_MIN) { if(l > INT_MAX || l < INT_MIN) {
throw ParameterRejected("Expected int"); throw ParameterRejected("Expected int");
} }
return l; return l;

2
src/hyperiond/hyperiond.cpp
View File

@ -57,6 +57,8 @@ Json::Value loadConfig(const std::string & configFile)
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
std::cout << "Application build time: " << __DATE__ << " " << __TIME__ << std::endl;
// Initialising QCoreApplication // Initialising QCoreApplication
QCoreApplication app(argc, argv); QCoreApplication app(argc, argv);
std::cout << "QCoreApplication initialised" << std::endl; std::cout << "QCoreApplication initialised" << std::endl;