jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename run command to session-manager

Browse source
This commit is contained in:
Simon Fels 2017-02-09 12:19:17 +01:00
commit 586bdce1b3
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CMakeLists.txt
View file

@ -184,9 +184,9 @@ set(SOURCES
anbox/application/launcher_storage.cpp
anbox/cmds/version.cpp
anbox/cmds/run.cpp
anbox/cmds/launch.cpp
anbox/cmds/session_manager.cpp
anbox/cmds/container_manager.cpp
anbox/cmds/launch.cpp
anbox/do_not_copy_or_move.h
anbox/optional.h

6
src/anbox/cmds/run.cpp → src/anbox/cmds/session_manager.cpp
View file

@ -26,7 +26,7 @@
#include "anbox/bridge/android_api_stub.h"
#include "anbox/bridge/platform_api_skeleton.h"
#include "anbox/bridge/platform_message_processor.h"
#include "anbox/cmds/run.h"
#include "anbox/cmds/session_manager.h"
#include "anbox/common/dispatcher.h"
#include "anbox/config.h"
#include "anbox/container/client.h"
@ -76,13 +76,13 @@ std::istream& operator>>(std::istream& in, anbox::graphics::GLRendererServer::Co
}
}
anbox::cmds::Run::BusFactory anbox::cmds::Run::session_bus_factory() {
anbox::cmds::SessionManager::BusFactory anbox::cmds::SessionManager::session_bus_factory() {
return []() {
return std::make_shared<core::dbus::Bus>(core::dbus::WellKnownBus::session);
};
}
anbox::cmds::Run::Run(const BusFactory &bus_factory)
anbox::cmds::SessionManager::SessionManager(const BusFactory &bus_factory)
: CommandWithFlagsAndAction{cli::Name{"run"}, cli::Usage{"run"},
cli::Description{"Run the the anbox system"}},
bus_factory_(bus_factory) {

4
src/anbox/cmds/run.h → src/anbox/cmds/session_manager.h
View file

@ -30,13 +30,13 @@
namespace anbox {
namespace cmds {
class Run : public cli::CommandWithFlagsAndAction {
class SessionManager : public cli::CommandWithFlagsAndAction {
public:
typedef std::function<core::dbus::Bus::Ptr()> BusFactory;
static BusFactory session_bus_factory();
Run(const BusFactory& bus_factory = session_bus_factory());
SessionManager(const BusFactory& bus_factory = session_bus_factory());
private:
BusFactory bus_factory_;

4
src/anbox/daemon.cpp
View file

@ -23,8 +23,8 @@
#include "anbox/logger.h"
#include "anbox/cmds/container_manager.h"
#include "anbox/cmds/session_manager.h"
#include "anbox/cmds/launch.h"
#include "anbox/cmds/run.h"
#include "anbox/cmds/version.h"
#include <boost/filesystem.hpp>
@ -36,7 +36,7 @@ Daemon::Daemon()
: cmd{cli::Name{"anbox"}, cli::Usage{"anbox"},
cli::Description{"The Android in a Box runtime"}} {
cmd.command(std::make_shared<cmds::Version>())
.command(std::make_shared<cmds::Run>())
.command(std::make_shared<cmds::SessionManager>())
.command(std::make_shared<cmds::Launch>())
.command(std::make_shared<cmds::ContainerManager>());
}