рефакторинг. вынес в обобщенную часть бд, но еще не все

This commit is contained in:
2024-10-08 01:30:25 +03:00
parent d0c08a2c7e
commit 18ceb04325
91 changed files with 442 additions and 456 deletions

View File

@@ -3,6 +3,7 @@ import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common_old.Constants;
import Common_old.Current;
import GlobalData.GlobalDatabase;
import _VisualDVM.Global;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
@@ -50,7 +51,7 @@ public class Precompilation extends Pass_2021<db_project_info> {
target = Current.getProject();
if (CommonUtils.isWindows) {
//--
makepath = Global.db.settings.get(SettingName.LocalMakePathWindows).toString();
makepath = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.LocalMakePathWindows).toString();
if (makepath.isEmpty()) {
Log.Writeln_("Не задан путь к make.exe.\n " +
"Укажите его в меню глобальных настроек." +
@@ -186,10 +187,10 @@ public class Precompilation extends Pass_2021<db_project_info> {
protected void body() throws Exception {
if (CommonUtils.isWindows) {
name_to_kill = "make.exe";
StartProcess(CommonUtils.DQuotes(Global.db.settings.get(SettingName.LocalMakePathWindows).Value) + " -j " + Global.db.settings.get(SettingName.Kernels).toString(),
StartProcess(CommonUtils.DQuotes(((GlobalDatabase)CommonUtils.db).settings.get(SettingName.LocalMakePathWindows).Value) + " -j " + ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Kernels).toString(),
target.compilation_maxtime);
} else
StartProcess("make -j " + Global.db.settings.get(SettingName.Kernels).toString(), target.compilation_maxtime);
StartProcess("make -j " + ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.Kernels).toString(), target.compilation_maxtime);
}
protected void StartProcess(String command, int TA) throws Exception {
killed = false;