no message
This commit is contained in:
1
.idea/workspace.xml
generated
1
.idea/workspace.xml
generated
@@ -10,7 +10,6 @@
|
|||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Precompilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Precompilation.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Precompilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Precompilation.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" afterDir="false" />
|
||||||
|
|||||||
@@ -38,6 +38,7 @@
|
|||||||
"InstructionPath": "",
|
"InstructionPath": "",
|
||||||
"PerformanceAnalyzerPath": "",
|
"PerformanceAnalyzerPath": "",
|
||||||
"LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
|
"LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
|
||||||
|
"Kernels": 8,
|
||||||
"ComponentsBackUpsCount": 10,
|
"ComponentsBackUpsCount": 10,
|
||||||
"AutoCheckTesting": true,
|
"AutoCheckTesting": true,
|
||||||
"CheckTestingIntervalSeconds": 10,
|
"CheckTestingIntervalSeconds": 10,
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ public enum SettingName {
|
|||||||
SaveModifications, // сохранять исходную версию
|
SaveModifications, // сохранять исходную версию
|
||||||
GCOVLimit,
|
GCOVLimit,
|
||||||
DVMConvertationOptions,
|
DVMConvertationOptions,
|
||||||
Kernels,
|
|
||||||
//--
|
//--
|
||||||
//<editor-fold desc="Настройки сапфора. должны быть подряд!">
|
//<editor-fold desc="Настройки сапфора. должны быть подряд!">
|
||||||
STATIC_SHADOW_ANALYSIS,
|
STATIC_SHADOW_ANALYSIS,
|
||||||
@@ -39,8 +38,6 @@ public enum SettingName {
|
|||||||
return "Сохранять копию исходной версии при преобразованиях";
|
return "Сохранять копию исходной версии при преобразованиях";
|
||||||
case DVMConvertationOptions:
|
case DVMConvertationOptions:
|
||||||
return "Опции DVM конвертации";
|
return "Опции DVM конвертации";
|
||||||
case Kernels:
|
|
||||||
return "Число ядер при компиляции";
|
|
||||||
case GCOVLimit:
|
case GCOVLimit:
|
||||||
return "Нижний порог отображения GCOV";
|
return "Нижний порог отображения GCOV";
|
||||||
case Precompilation:
|
case Precompilation:
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
|
|||||||
public void AddAll() throws Exception {
|
public void AddAll() throws Exception {
|
||||||
//проверка списка всех настроек.
|
//проверка списка всех настроек.
|
||||||
//<editor-fold desc="Global">
|
//<editor-fold desc="Global">
|
||||||
AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
|
|
||||||
//</editor-fold>
|
//</editor-fold>
|
||||||
//--
|
//--
|
||||||
//<editor-fold desc="Sapfor">
|
//<editor-fold desc="Sapfor">
|
||||||
|
|||||||
@@ -94,6 +94,8 @@ public class GlobalProperties {
|
|||||||
@Expose
|
@Expose
|
||||||
public String LocalMakePathWindows= "C:\\MinGW\\msys\\1.0\\bin\\make.exe";
|
public String LocalMakePathWindows= "C:\\MinGW\\msys\\1.0\\bin\\make.exe";
|
||||||
@Expose
|
@Expose
|
||||||
|
public int Kernels= Utils.getHalfKernels();
|
||||||
|
@Expose
|
||||||
public int ComponentsBackUpsCount = 10;
|
public int ComponentsBackUpsCount = 10;
|
||||||
@Expose
|
@Expose
|
||||||
public boolean AutoCheckTesting = false; // проверять ли задачи тестирования при включенном визуализаторе.
|
public boolean AutoCheckTesting = false; // проверять ли задачи тестирования при включенном визуализаторе.
|
||||||
@@ -187,6 +189,8 @@ public class GlobalProperties {
|
|||||||
//-----------------
|
//-----------------
|
||||||
public String getFieldDescription(String fieldName) {
|
public String getFieldDescription(String fieldName) {
|
||||||
switch (fieldName) {
|
switch (fieldName) {
|
||||||
|
case "Kernels":
|
||||||
|
return "Число ядер при компиляции";
|
||||||
case "LocalMakePathWindows":
|
case "LocalMakePathWindows":
|
||||||
return "Путь к make.exe";
|
return "Путь к make.exe";
|
||||||
case "SmallScreen":
|
case "SmallScreen":
|
||||||
|
|||||||
@@ -185,10 +185,10 @@ public class Precompilation extends Pass<db_project_info> {
|
|||||||
protected void body() throws Exception {
|
protected void body() throws Exception {
|
||||||
if (Utils_.isWindows()) {
|
if (Utils_.isWindows()) {
|
||||||
name_to_kill = "make.exe";
|
name_to_kill = "make.exe";
|
||||||
StartProcess(Utils_.DQuotes(Global.properties.LocalMakePathWindows) + " -j " + (Global.mainModule.getDb()).settings.get(SettingName.Kernels).toString(),
|
StartProcess(Utils_.DQuotes(Global.properties.LocalMakePathWindows) + " -j " + Global.properties.Kernels,
|
||||||
target.compilation_maxtime);
|
target.compilation_maxtime);
|
||||||
} else
|
} else
|
||||||
StartProcess("make -j " + (Global.mainModule.getDb()).settings.get(SettingName.Kernels).toString(), target.compilation_maxtime);
|
StartProcess("make -j " + Global.properties.Kernels, target.compilation_maxtime);
|
||||||
}
|
}
|
||||||
protected void StartProcess(String command, int TA) throws Exception {
|
protected void StartProcess(String command, int TA) throws Exception {
|
||||||
killed = false;
|
killed = false;
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import Common.Visual.Windows.Dialog.VFileChooser;
|
|||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.GlobalProperties;
|
import _VisualDVM.GlobalProperties;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
|
import _VisualDVM.Utils;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@@ -35,6 +36,10 @@ public class UpdateProperty extends Pass<Object> {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
switch (name){
|
switch (name){
|
||||||
|
case "Kernels":
|
||||||
|
if (sliderNumberForm.ShowDialog(description, oldValue, 1, Utils.getMaxKernels()))
|
||||||
|
newValue=sliderNumberForm.Result;
|
||||||
|
break;
|
||||||
case "LocalMakePathWindows":
|
case "LocalMakePathWindows":
|
||||||
fileChooser.setTitle(description);
|
fileChooser.setTitle(description);
|
||||||
File file = fileChooser.ShowDialog();
|
File file = fileChooser.ShowDialog();
|
||||||
|
|||||||
@@ -41,19 +41,6 @@ public class UpdateSetting extends Pass<DBSetting> {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case IntField:
|
|
||||||
int min = 0;
|
|
||||||
int max = 0;
|
|
||||||
switch (target.Name) {
|
|
||||||
case Kernels:
|
|
||||||
min = 1;
|
|
||||||
max = Utils.getMaxKernels();
|
|
||||||
SliderNumberForm ffff = new SliderNumberForm();
|
|
||||||
if (ffff.ShowDialog(target.Name.getDescription(), target.toInt32(), min, max))
|
|
||||||
NewValue = String.valueOf(ffff.Result);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
NewValue = args[1].toString();
|
NewValue = args[1].toString();
|
||||||
|
|||||||
@@ -21,19 +21,19 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
|
|||||||
add(new SettingsSubmenu("Компиляция на локальной машине", null){
|
add(new SettingsSubmenu("Компиляция на локальной машине", null){
|
||||||
{
|
{
|
||||||
add(Global.properties.getMenuItem("LocalMakePathWindows"));
|
add(Global.properties.getMenuItem("LocalMakePathWindows"));
|
||||||
|
add(Global.properties.getMenuItem("Kernels"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
}else {
|
||||||
|
add(new SettingsSubmenu("Компиляция на локальной машине", null){
|
||||||
|
{
|
||||||
|
add(Global.properties.getMenuItem("Kernels"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
SettingName.Kernels
|
|
||||||
));
|
|
||||||
} else {
|
|
||||||
add(new SettingsSubmenu("Компиляция на локальной машине", null,
|
|
||||||
SettingName.Kernels
|
|
||||||
));
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
add(new SynchronizationSettingsMenu());
|
add(new SynchronizationSettingsMenu());
|
||||||
add(new VersionsComparisonMenu());
|
add(new VersionsComparisonMenu());
|
||||||
add(Global.properties.getMenuItem("Workspace"));
|
add(Global.properties.getMenuItem("Workspace"));
|
||||||
|
|||||||
Reference in New Issue
Block a user