[all] Build a single executable

This commit is contained in:
Joe Thornber
2014-08-27 14:01:31 +01:00
parent c1e0799367
commit 6f8b7e2914
48 changed files with 418 additions and 496 deletions

17
era/commands.h Normal file
View File

@@ -0,0 +1,17 @@
#ifndef ERA_COMMANDS_H
#define ERA_COMMANDS_H
#include "base/application.h"
//----------------------------------------------------------------
namespace era {
extern base::command era_check_cmd;
extern base::command era_dump_cmd;
extern base::command era_invalidate_cmd;
extern base::command era_restore_cmd;
}
//----------------------------------------------------------------
#endif

View File

@@ -14,6 +14,7 @@
#include "base/error_state.h"
#include "base/nested_output.h"
#include "era/commands.h"
#include "era/writeset_tree.h"
#include "era/era_array.h"
#include "era/superblock.h"
@@ -276,7 +277,7 @@ namespace {
//----------------------------------------------------------------
int main(int argc, char **argv)
int era_check_main(int argc, char **argv)
{
int c;
flags fs;
@@ -322,4 +323,6 @@ int main(int argc, char **argv)
return check_with_exception_handling(argv[optind], fs);
}
base::command era::era_check_cmd("era_check", era_check_main);
//----------------------------------------------------------------

View File

@@ -4,6 +4,7 @@
#include <iostream>
#include "version.h"
#include "era/commands.h"
#include "era/era_array.h"
#include "era/writeset_tree.h"
#include "era/metadata.h"
@@ -70,7 +71,7 @@ namespace {
//----------------------------------------------------------------
int main(int argc, char **argv)
int era_dump_main(int argc, char **argv)
{
int c;
flags fs;
@@ -123,4 +124,6 @@ int main(int argc, char **argv)
return dump(argv[optind], output, fs);
}
base::command era::era_dump_cmd("era_dump", era_dump_main);
//----------------------------------------------------------------

View File

@@ -5,6 +5,7 @@
#include "version.h"
#include "base/indented_stream.h"
#include "era/commands.h"
#include "era/era_array.h"
#include "era/writeset_tree.h"
#include "era/metadata.h"
@@ -189,7 +190,7 @@ namespace {
//----------------------------------------------------------------
int main(int argc, char **argv)
int era_invalidate_main(int argc, char **argv)
{
int c;
flags fs;
@@ -248,4 +249,6 @@ int main(int argc, char **argv)
return invalidate(argv[optind], output, fs);
}
base::command era::era_invalidate_cmd("era_invalidate", era_invalidate_main);
//----------------------------------------------------------------

View File

@@ -1,5 +1,6 @@
#include "version.h"
#include "era/commands.h"
#include "era/metadata.h"
#include "era/restore_emitter.h"
#include "era/xml_format.h"
@@ -57,7 +58,7 @@ namespace {
}
}
int main(int argc, char **argv)
int era_restore_main(int argc, char **argv)
{
int c;
flags fs;
@@ -120,4 +121,6 @@ int main(int argc, char **argv)
return restore(fs, fs.quiet);
}
base::command era::era_restore_cmd("era_restore", era_restore_main);
//----------------------------------------------------------------