no message

2025-10-30 15:45:29 +03:00
parent 9cadbef661
commit f4c54acb3e
7 changed files with 29 additions and 6 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,9 +8,12 @@
  <component name="ChangeListManager">
    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Json/VersionInfo_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Json/VersionInfo_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.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/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" />
--- a/3
+++ b/3
@@ -4,7 +4,7 @@
  "ServerUserPassword": "mprit_2011",
  "OfferRegistrationOnStart": true,
  "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\SAPFOR\\Tests\\BT_inserted",
+  "ProjectsSearchDirectory": "E:\\SAPFOR\\Tests",
  "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
  "VisualiserPath": "C:\\Users\\misha\\Downloads",
  "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
@@ -25,6 +25,7 @@
  "ComponentsWindowHeight": 250,
  "Kernels": 8,
  "LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
+  "PrecompilationFlags": " ",
  "CheckTestingIntervalSeconds": 10,
  "AutoCheckTesting": true,
  "EmailOnTestingProgress": true,
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;

 import java.util.Vector;
 public class Constants {
-    public static final int version = 1258;
+    public static final int version = 1259;
    public static final int planner_version = 24;
    public static final int testingMaxKernels = 64;
    //--
--- a/src/_VisualDVM/NormalProperties.java
+++ b/src/_VisualDVM/NormalProperties.java
@@ -65,6 +65,8 @@ public class NormalProperties extends VisualDVMProperties {
    public int Kernels = Utils.getHalfKernels();
    @Expose
    public String LocalMakePathWindows = "C:\\MinGW\\msys\\1.0\\bin\\make.exe";
+    @Expose
+    public String PrecompilationFlags = "";
    //--тестирование
    @Expose
    public int CheckTestingIntervalSeconds = 10; //интервал автопроверки тестирования
@@ -123,6 +125,8 @@ public class NormalProperties extends VisualDVMProperties {
    @Override
    public String getFieldDescription(String fieldName) {
        switch (fieldName) {
+            case "PrecompilationFlags":
+                return "Опции предварительной компиляции";
            case "ErasePackageWorkspace":
                return "Очистка рабочего пространства пакета на целевой машине";
            case "CompleteCompilationOptions":
--- a/src/_VisualDVM/Passes/All/Precompilation.java
+++ b/src/_VisualDVM/Passes/All/Precompilation.java
@@ -121,7 +121,7 @@ public class Precompilation extends Pass<db_project_info> {
        return "";
    }
    protected String getFortranFlags() {
-        return "";
+        return Global.normalProperties.PrecompilationFlags;
    }
    protected void prepareForParse() throws Exception {
        target.CleanAnalyses();
@@ -212,7 +212,11 @@ public class Precompilation extends Pass<db_project_info> {
    }
    @Override
    protected boolean validate() {
-        return outputLines.stream().noneMatch(line -> line.toLowerCase().startsWith("error"));
+        return outputLines.stream().noneMatch(
+                line -> (line.toLowerCase().startsWith("error")
+                        || line.toLowerCase().startsWith("gfortran.exe: error:")
+                        || line.toLowerCase().startsWith("gfortran: error:")
+                ));
    }
    @Override
    protected void performDone() throws Exception {
--- a/src/_VisualDVM/Passes/All/UpdateProperty.java
+++ b/src/_VisualDVM/Passes/All/UpdateProperty.java
@@ -3,6 +3,7 @@ import Common.MainModule_;
 import Common.Passes.Pass;
 import Common.Visual.Windows.Dialog.SliderNumberForm;
 import Common.Visual.Windows.Dialog.SpinnerNumberForm;
+import Common.Visual.Windows.Dialog.Text.TextFieldDialog;
 import Common.Visual.Windows.Dialog.VDirectoryChooser;
 import Common.Visual.Windows.Dialog.VFileChooser;
 import _VisualDVM.Global;
@@ -44,6 +45,14 @@ public class UpdateProperty extends Pass<Object> {
                    if (file != null)
                        newValue = file.getAbsolutePath();
                    break;
+                case "PrecompilationFlags":
+                    TextFieldDialog textFieldDialog = new TextFieldDialog();
+                    if (textFieldDialog.ShowDialog(description, oldValue)) {
+                        newValue = textFieldDialog.Result;
+                        if (newValue.toString().isEmpty())
+                            newValue = " ";
+                    }
+                    break;
                case "BugReportsAgeLimit":
                    if (sliderNumberForm.ShowDialog(description, oldValue, 1, 12))
                        newValue = sliderNumberForm.Result;
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
@@ -18,11 +18,13 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
            add(new PropertiesSubmenu("Компиляция на локальной машине", null,
                    Global.normalProperties,
                    "LocalMakePathWindows",
+                    "PrecompilationFlags",
                    "Kernels"
            ));
        } else {
            add(new PropertiesSubmenu("Компиляция на локальной машине", null,
                    Global.normalProperties,
+                    "PrecompilationFlags",
                    "Kernels"
            ));
        }