Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

retroshare-android-service can be built without libresapi

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2018-09-01 16:16:15 +02:00
parent 7f74313552
commit 4acbf775a5
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
2 changed files with 63 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-android-service/src/retroshare-android-service.pro
View File

@ -11,7 +11,9 @@ android-*:CONFIG += dll
android-*:TEMPLATE = lib android-*:TEMPLATE = lib
!android-*:TEMPLATE = app !android-*:TEMPLATE = app
libresapilocalserver {
!include("../../libresapi/src/use_libresapi.pri"):error("Including") !include("../../libresapi/src/use_libresapi.pri"):error("Including")
}
!include("../../libretroshare/src/use_libretroshare.pri"):error("Including") !include("../../libretroshare/src/use_libretroshare.pri"):error("Including")

83
retroshare-android-service/src/service.cpp
View File

@ -17,36 +17,34 @@
*/ */
#include <QCoreApplication> #include <QCoreApplication>
#include <QDebug>
#include <QDir>
#include <QTimer>
#include <csignal> #include <csignal>
#ifdef __ANDROID__ #ifdef __ANDROID__
# include "util/androiddebug.h" # include "util/androiddebug.h"
#endif #endif
#ifdef LIBRESAPI_LOCAL_SERVER
# include <QDir>
# include <QTimer>
# include <QDebug>
# include "api/ApiServer.h" # include "api/ApiServer.h"
# include "api/ApiServerLocal.h" # include "api/ApiServerLocal.h"
# include "api/RsControlModule.h" # include "api/RsControlModule.h"
#else // ifdef LIBRESAPI_LOCAL_SERVER
# include <QObject>
# include "retroshare/rsinit.h"
# include "retroshare/rsiface.h"
#endif // ifdef LIBRESAPI_LOCAL_SERVER
#ifdef RS_JSONAPI #ifdef RS_JSONAPI
# include <cstdint>
# include "jsonapi/jsonapi.h" # include "jsonapi/jsonapi.h"
# include "retroshare/rsiface.h" # include <QCommandLineParser>
# include <QString>
JsonApiServer jas(9092, [](int ec) # include <iostream>
{ #endif // def RS_JSONAPI
RsControl::instance()->rsGlobalShutDown();
QCoreApplication::exit(ec);
});
void exitGracefully(int ec) { jas.shutdown(ec); }
#else // ifdef RS_JSONAPI
void exitGracefully(int ec) { QCoreApplication::exit(ec); }
#endif // ifdef RS_JSONAPI
using namespace resource_api;
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -56,13 +54,15 @@ int main(int argc, char *argv[])
QCoreApplication app(argc, argv); QCoreApplication app(argc, argv);
signal(SIGINT, exitGracefully); signal(SIGINT, QCoreApplication::exit);
signal(SIGTERM, exitGracefully); signal(SIGTERM, QCoreApplication::exit);
#ifdef SIGBREAK #ifdef SIGBREAK
signal(SIGBREAK, exitGracefully); signal(SIGBREAK, QCoreApplication::exit);
#endif // ifdef SIGBREAK #endif // ifdef SIGBREAK
#ifdef LIBRESAPI_LOCAL_SERVER #ifdef LIBRESAPI_LOCAL_SERVER
using namespace resource_api;
ApiServer api; ApiServer api;
RsControlModule ctrl_mod(argc, argv, api.getStateTokenServer(), &api, true); RsControlModule ctrl_mod(argc, argv, api.getStateTokenServer(), &api, true);
api.addResourceHandler( api.addResourceHandler(
@ -81,15 +81,46 @@ int main(int argc, char *argv[])
shouldExitTimer.setTimerType(Qt::VeryCoarseTimer); shouldExitTimer.setTimerType(Qt::VeryCoarseTimer);
shouldExitTimer.setInterval(1000); shouldExitTimer.setInterval(1000);
QObject::connect( &shouldExitTimer, &QTimer::timeout, [&]() QObject::connect( &shouldExitTimer, &QTimer::timeout, [&]()
{ if(ctrl_mod.processShouldExit()) exitGracefully(0); } ); { if(ctrl_mod.processShouldExit()) QCoreApplication::exit(0); } );
shouldExitTimer.start(); shouldExitTimer.start();
#else #else // ifdef LIBRESAPI_LOCAL_SERVER
# error retroshare-android-service need CONFIG+=libresapilocalserver to build RsInit::InitRsConfig();
#endif RsInit::InitRetroShare(argc, argv, true);
RsControl::earlyInitNotificationSystem();
QObject::connect(
&app, &QCoreApplication::aboutToQuit,
[](){
if(RsControl::instance()->isReady())
RsControl::instance()->rsGlobalShutDown(); } );
#endif // ifdef LIBRESAPI_LOCAL_SERVER
#ifdef RS_JSONAPI #ifdef RS_JSONAPI
uint16_t jsonApiPort = 9092;
{
QCommandLineOption jsonApiPortOpt(
"jsonApiPort", "JSON API listening port.", "port", "9092");
QCommandLineParser cmdParser;
cmdParser.addHelpOption();
cmdParser.addOption(jsonApiPortOpt);
cmdParser.parse(app.arguments());
QString jsonApiPortStr = cmdParser.value(jsonApiPortOpt);
bool portOk;
jsonApiPort = jsonApiPortStr.toUShort(&portOk);
if(!portOk)
{
std::cerr << "ERROR: jsonApiPort option value must be a valid TCP "
<< "port!" << std::endl;
cmdParser.showHelp();
QCoreApplication::exit(EINVAL);
}
}
JsonApiServer jas(jsonApiPort, [](int ec) { QCoreApplication::exit(ec); });
jas.start(); jas.start();
#endif std::cerr << "JSON API listening on port " << jsonApiPort << std::endl;
#endif // ifdef RS_JSONAPI
return app.exec(); return app.exec();
} }