M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2025-01-11 22:48:00 +03:00
parent 8b2fb67422
commit 7a06c2ce2b
10 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/workspace.xml generated
View File

@@ -10,12 +10,12 @@
<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/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/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/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSetting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/CompactnessSettingsMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ProjectForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

1
properties
View File

@@ -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,

3
src/_VisualDVM/GlobalData/Settings/SettingName.java
View File

@@ -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:

2
src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
View File

@@ -31,8 +31,6 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
//проверка списка всех настроек.
//<editor-fold desc="Global">
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));
//</editor-fold>
//--
//<editor-fold desc="Sapfor">

2
src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java
View File

@@ -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

4
src/_VisualDVM/GlobalProperties.java
View File

@@ -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":

4
src/_VisualDVM/Passes/All/Precompilation.java
View File

@@ -94,7 +94,7 @@ public class Precompilation extends Pass<db_project_info> {
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<db_project_info> {
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);

6
src/_VisualDVM/Passes/All/UpdateProperty.java
View File

@@ -35,6 +35,12 @@ public class UpdateProperty extends Pass<Object> {
return true;
}
switch (name){
case "LocalMakePathWindows":
fileChooser.setTitle(description);
File file = fileChooser.ShowDialog();
if (file != null)
newValue = file.getAbsolutePath();
break;
case "BugReportsAgeLimit":
if (sliderNumberForm.ShowDialog(description, oldValue, 1, 12))
newValue=sliderNumberForm.Result;

6
src/_VisualDVM/Passes/All/UpdateSetting.java
View File

@@ -31,12 +31,6 @@ public class UpdateSetting extends Pass<DBSetting> {
break;
case StringField:
switch (target.Name) {
case LocalMakePathWindows:
fileChooser.setTitle(target.Name.getDescription());
File file = fileChooser.ShowDialog();
if (file != null)
NewValue = file.getAbsolutePath();
break;
default:
TextFieldDialog ff = new TextFieldDialog();
if (ff.ShowDialog(target.Name.getDescription(), target.Value)) {

11
src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
View File

@@ -18,8 +18,14 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
));
add(new CompactnessSettingsMenu());
if (Utils_.isWindows()) {
add(new SettingsSubmenu("Компиляция на локальной машине", null,
SettingName.LocalMakePathWindows,
add(new SettingsSubmenu("Компиляция на локальной машине", null){
{
add(Global.properties.getMenuItem("LocalMakePathWindows"));
}
}
);
}
/*
SettingName.Kernels
));
} else {
@@ -27,6 +33,7 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
SettingName.Kernels
));
}
*/
add(new SynchronizationSettingsMenu());
add(new VersionsComparisonMenu());
add(Global.properties.getMenuItem("Workspace"));