Commit c1831cfe authored by Philipp Schäfer's avatar Philipp Schäfer
Browse files

Merge branch 'master' into develop

# Conflicts:
#	CMakeLists.txt
parents ef16f8d0 f2095be2
......@@ -77,6 +77,7 @@ if( ITA_VASERVER_DEPLOY_WITH_COMMON_SCRIPTS )
configure_file( "run_VAServer.bat.proto" "${CMAKE_CURRENT_SOURCE_DIR}/run_VAServer.bat" @ONLY )
install( FILES "run_VAServer.bat" DESTINATION "." )
set( ITA_VA_SERVER_START_SCRIPT_INI VACore.recording.ini )
set( ITA_VA_SERVER_START_SCRIPT_RC "allow_remote_control_shutdown" )
configure_file( "run_VAServer.bat.proto" "${CMAKE_CURRENT_SOURCE_DIR}/run_VAServer_recording.bat" @ONLY )
install( FILES "run_VAServer_recording.bat" DESTINATION "." )
else( )
......@@ -84,6 +85,7 @@ if( ITA_VASERVER_DEPLOY_WITH_COMMON_SCRIPTS )
configure_file( "run_VAServer.sh.proto" "${CMAKE_CURRENT_SOURCE_DIR}/run_VAServer.sh" @ONLY )
install( FILES "run_VAServer.sh" DESTINATION "." )
set( ITA_VA_SERVER_START_SCRIPT_INI VACore.recording.ini )
set( ITA_VA_SERVER_START_SCRIPT_RC "allow_remote_control_shutdown" )
configure_file( "run_VAServer.sh.proto" "${CMAKE_CURRENT_SOURCE_DIR}/run_VAServer_recording.sh" @ONLY )
install( FILES "run_VAServer_recording.sh" DESTINATION "." )
endif( )
......
......@@ -112,7 +112,7 @@ int main( int argc, char* argv[] )
// Arguments
bool bVersionInfoRequest = false;
bool bRemoveControlMode = false;
bool bRemoteControlMode = false;
std::string sServerAddress, sVACoreConfigPath;
if( argc == 1 )
......@@ -140,7 +140,7 @@ int main( int argc, char* argv[] )
if( argc >= 3 )
sVACoreConfigPath = argv[ 2 ];
if( argc >= 4 )
bRemoveControlMode = true;
bRemoteControlMode = true;
}
......@@ -196,7 +196,7 @@ int main( int argc, char* argv[] )
pCore->Initialize();
if( bRemoveControlMode )
if( bRemoteControlMode )
{
pServerCoreEventHandler = new CServerCoreEventHandler();
pCore->AttachEventHandler( pServerCoreEventHandler );
......@@ -225,7 +225,7 @@ int main( int argc, char* argv[] )
cout << endl << "[ VAServer ] Core version: " << ver.ToString() << endl;
cout << "[ VAServer ] Successfully started and listening on " << sServer << ":" << iPort << endl << endl;
if( bRemoveControlMode )
if( bRemoteControlMode )
{
cout << "[ VAServer ] Enering remote control mode. Type CTRL+C to stop server manually or send shutdown message from client" << endl << endl;
......
bin\VAServer.exe @ITA_VA_SERVER_START_SCRIPT_ADDRESS@:@ITA_VA_SERVER_START_SCRIPT_PORT@ conf\@ITA_VA_SERVER_START_SCRIPT_INI@
\ No newline at end of file
bin\VAServer.exe @ITA_VA_SERVER_START_SCRIPT_ADDRESS@:@ITA_VA_SERVER_START_SCRIPT_PORT@ conf\@ITA_VA_SERVER_START_SCRIPT_INI@ @ITA_VA_SERVER_START_SCRIPT_RC@
\ No newline at end of file
./bin/VAServer @ITA_VA_SERVER_START_SCRIPT_ADDRESS@:@ITA_VA_SERVER_START_SCRIPT_PORT@ conf/@ITA_VA_SERVER_START_SCRIPT_INI@
\ No newline at end of file
./bin/VAServer @ITA_VA_SERVER_START_SCRIPT_ADDRESS@:@ITA_VA_SERVER_START_SCRIPT_PORT@ conf/@ITA_VA_SERVER_START_SCRIPT_INI@ @ITA_VA_SERVER_START_SCRIPT_RC@
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment