diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9e0946df..b334de4a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,12 +10,12 @@
+
+
-
-
-
+
diff --git a/properties b/properties
index 4b00cccf..a7fc1ac9 100644
--- a/properties
+++ b/properties
@@ -37,6 +37,7 @@
"Visualizer_2Path": "C:\\Users\\misha\\Documents",
"InstructionPath": "",
"PerformanceAnalyzerPath": "",
+ "LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
"ComponentsBackUpsCount": 10,
"AutoCheckTesting": true,
"CheckTestingIntervalSeconds": 10,
diff --git a/src/_VisualDVM/GlobalData/Settings/SettingName.java b/src/_VisualDVM/GlobalData/Settings/SettingName.java
index afb52bc9..acacb2d4 100644
--- a/src/_VisualDVM/GlobalData/Settings/SettingName.java
+++ b/src/_VisualDVM/GlobalData/Settings/SettingName.java
@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData.Settings;
public enum SettingName {
Undefined,
//--------------
- LocalMakePathWindows,
Precompilation,
SaveModifications, // сохранять исходную версию
GCOVLimit,
@@ -46,8 +45,6 @@ public enum SettingName {
return "Нижний порог отображения GCOV";
case Precompilation:
return "Предварительная компиляция";
- case LocalMakePathWindows:
- return "Путь к make.exe";
case STATIC_SHADOW_ANALYSIS:
return "Оптимизация теневых обменов";
case STATIC_PRIVATE_ANALYSIS:
diff --git a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
index 4441755f..00f7432b 100644
--- a/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
+++ b/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
@@ -31,8 +31,6 @@ public class SettingsDBTable extends DBTable {
//проверка списка всех настроек.
//
AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
- if (Utils_.isWindows())
- AddSetting(new DBSetting(SettingName.LocalMakePathWindows, "C:\\MinGW\\msys\\1.0\\bin\\make.exe", SettingType.StringField, ComponentType.Visualiser));
//
//--
//
diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
index 9b6b56af..4a135497 100644
--- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
+++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
@@ -18,7 +18,7 @@ public class WindowsLocalCompilationSupervisor extends WindowsLocalTaskSuperviso
}
@Override
protected String getScriptText() {
- return Utils_.DQuotes((Global.mainModule.getDb()).settings.get(SettingName.LocalMakePathWindows).Value) + " 1>out.txt 2>err.txt";
+ return Utils_.DQuotes(Global.properties.LocalMakePathWindows) + " 1>out.txt 2>err.txt";
}
//скорее всего как то выделить подготовку к компиляции как метод предка.
@Override
diff --git a/src/_VisualDVM/GlobalProperties.java b/src/_VisualDVM/GlobalProperties.java
index 36e63848..9723e50a 100644
--- a/src/_VisualDVM/GlobalProperties.java
+++ b/src/_VisualDVM/GlobalProperties.java
@@ -92,6 +92,8 @@ public class GlobalProperties {
@Expose
public String PerformanceAnalyzerPath = "";
@Expose
+ public String LocalMakePathWindows= "C:\\MinGW\\msys\\1.0\\bin\\make.exe";
+ @Expose
public int ComponentsBackUpsCount = 10;
@Expose
public boolean AutoCheckTesting = false; // проверять ли задачи тестирования при включенном визуализаторе.
@@ -185,6 +187,8 @@ public class GlobalProperties {
//-----------------
public String getFieldDescription(String fieldName) {
switch (fieldName) {
+ case "LocalMakePathWindows":
+ return "Путь к make.exe";
case "SmallScreen":
return "Маленький экран";
case "ShowFullTabsNames":
diff --git a/src/_VisualDVM/Passes/All/Precompilation.java b/src/_VisualDVM/Passes/All/Precompilation.java
index 18427ff6..d9ae8127 100644
--- a/src/_VisualDVM/Passes/All/Precompilation.java
+++ b/src/_VisualDVM/Passes/All/Precompilation.java
@@ -94,7 +94,7 @@ public class Precompilation extends Pass {
target = Global.mainModule.getProject();
if (Utils_.isWindows()) {
//--
- makepath = Global.mainModule.getDb().settings.get(SettingName.LocalMakePathWindows).toString();
+ makepath = Global.properties.LocalMakePathWindows;
if (makepath.isEmpty()) {
Log.Writeln_("Не задан путь к make.exe.\n " +
"Укажите его в меню глобальных настроек." +
@@ -185,7 +185,7 @@ public class Precompilation extends Pass {
protected void body() throws Exception {
if (Utils_.isWindows()) {
name_to_kill = "make.exe";
- StartProcess(Utils_.DQuotes((Global.mainModule.getDb()).settings.get(SettingName.LocalMakePathWindows).Value) + " -j " + (Global.mainModule.getDb()).settings.get(SettingName.Kernels).toString(),
+ StartProcess(Utils_.DQuotes(Global.properties.LocalMakePathWindows) + " -j " + (Global.mainModule.getDb()).settings.get(SettingName.Kernels).toString(),
target.compilation_maxtime);
} else
StartProcess("make -j " + (Global.mainModule.getDb()).settings.get(SettingName.Kernels).toString(), target.compilation_maxtime);
diff --git a/src/_VisualDVM/Passes/All/UpdateProperty.java b/src/_VisualDVM/Passes/All/UpdateProperty.java
index e0ff438e..db933f85 100644
--- a/src/_VisualDVM/Passes/All/UpdateProperty.java
+++ b/src/_VisualDVM/Passes/All/UpdateProperty.java
@@ -35,6 +35,12 @@ public class UpdateProperty extends Pass