From 23b188cadce93f69b11488cd9450a89bdf19fd0c Mon Sep 17 00:00:00 2001 From: kaetemi Date: Mon, 21 Jun 2021 08:46:24 +0800 Subject: [PATCH] Support launch ctrl on dev shard --- nel/tools/build_gamedata/b3_shard_dev.py | 21 +++++++++++++++++++ .../spt_server_patch_terminal.cpp | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/nel/tools/build_gamedata/b3_shard_dev.py b/nel/tools/build_gamedata/b3_shard_dev.py index 4b85f9a40..6d5651aac 100644 --- a/nel/tools/build_gamedata/b3_shard_dev.py +++ b/nel/tools/build_gamedata/b3_shard_dev.py @@ -81,6 +81,27 @@ cfg.flush() cfg.close() printLog(log, "") +if not os.path.exists(ShardDevDirectory + "/aes_state.txt"): + printLog(log, ">>> Generate shard dev aes_state.txt <<<") + f = open(ShardDevDirectory + "/aes_state.txt", "w") + f.write("ShardOrders unifier so_autostart_off\n") + f.write("ShardOrders mainland so_autostart_off\n") + f.write("ShardOrders ring so_autostart_off\n") + f.flush() + f.close() + printLog(log, "") + +mkPath(log, ShardDevDirectory + "/ras") +if not os.path.exists(ShardDevDirectory + "/ras/as_state.txt"): + printLog(log, ">>> Generate shard dev as_state.txt <<<") + f = open(ShardDevDirectory + "/ras/as_state.txt", "w") + f.write("ShardOrders unifier so_autostart_off\n") + f.write("ShardOrders mainland so_autostart_off\n") + f.write("ShardOrders ring so_autostart_off\n") + f.flush() + f.close() + printLog(log, "") + for execDir in InstallShardDataExecutables: dstDir = execDir[0] mkPath(log, PatchmanCfgDefaultDirectory) diff --git a/ryzom/server/src/patchman_service/spt_server_patch_terminal.cpp b/ryzom/server/src/patchman_service/spt_server_patch_terminal.cpp index ef509acb9..34883e0b7 100644 --- a/ryzom/server/src/patchman_service/spt_server_patch_terminal.cpp +++ b/ryzom/server/src/patchman_service/spt_server_patch_terminal.cpp @@ -902,7 +902,7 @@ NLMISC_CLASS_COMMAND_IMPL(CServerPatchTerminal, depDevCfg) } else { - if (p == "--nobreak" || p == "--writepid") + if (p == "--nobreak") // || p == "--writepid") p = ""; } } @@ -942,7 +942,7 @@ NLMISC_CLASS_COMMAND_IMPL(CServerPatchTerminal, depDevCfg) ini << "WorkingDirectory=.\\" << appDesc.AppName << "\n"; ini << "LaunchCmd=" << launchCmd << "\n"; ini << "LaunchArgs=" << cmdLine << "\n"; - ini << "LaunchCtrl=.\\" << appDesc.AppName << ".launch_ctrl,LAUNCH,RUNNING,STOP,STOPPED\n"; + ini << "LaunchCtrl=.\\" << appDesc.AppName << ".launch_ctrl,.\\" << appDesc.AppName << ".state,LAUNCH,RUNNING,STOP,STOPPED\n"; if (priorityIt != priorityMap.end()) ini << "Priority=" << priorityIt->second << "\n"; ini << "\n";