From bd5ebdf53cc722634d581bf22bb77b6f04fa5c18 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 24 Mar 2024 23:36:56 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B3=D0=B0=20=D1=81=20?=
 =?UTF-8?q?=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=D0=BC=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20=D1=81++?=
 =?UTF-8?q?=20=D0=BD=D0=B0=20=D1=86=D0=B5=D0=BB=D0=B5=D0=B2=D0=BE=D0=B9=20?=
 =?UTF-8?q?=D0=BC=D0=B0=D1=88=D0=B8=D0=BD=D0=B5=20=D1=82=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20DVM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                       |  7 +++---
 properties                                |  4 ++--
 src/Common/Constants.java                 |  2 +-
 src/TestingSystem/DVM/UserConnection.java | 27 +++++++++++++++++------
 src/files/version.h                       |  2 +-
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7aa3ff1e..835a859e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,12 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InsertImplicitNone.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/TransformationsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/TransformationsMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/version.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/version.h" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 08c0adf9..7e97f998 100644
--- a/properties
+++ b/properties
@@ -10,7 +10,7 @@
   "SMTPHost": "smtp.mail.ru",
   "SMTPPort": 465,
   "MailSocketPort": 465,
-  "collapseCredentials": true,
+  "collapseCredentials": false,
   "collapseFileGraphs": true,
   "collapseFileMessages": true,
   "collapseProjectTrees": true,
@@ -35,7 +35,7 @@
   "PerformanceAnalyzerPath": "",
   "ComponentsBackUpsCount": 10,
   "TestingKernels": 16,
-  "AutoCheckTesting": false,
+  "AutoCheckTesting": true,
   "CheckTestingIntervalSeconds": 10,
   "EmailOnTestingProgress": false,
   "eraseTestingWorkspaces": true
diff --git a/src/Common/Constants.java b/src/Common/Constants.java
index 118ace99..6453e65e 100644
--- a/src/Common/Constants.java
+++ b/src/Common/Constants.java
@@ -7,7 +7,7 @@ import Visual_DVM_2021.Passes.PassCode_2021;
 import java.util.regex.Pattern;
 public class Constants {
     public static final int Nan = -1;
-    public static final int planner_version = 2;
+    public static final int planner_version = 3;
     //--
     public static final String testingSystemHomeName = "_testing_system";
     //SVN
diff --git a/src/TestingSystem/DVM/UserConnection.java b/src/TestingSystem/DVM/UserConnection.java
index d90dcfd3..c217de75 100644
--- a/src/TestingSystem/DVM/UserConnection.java
+++ b/src/TestingSystem/DVM/UserConnection.java
@@ -268,17 +268,30 @@ public class UserConnection {
         Pair<RemoteFile, RemoteFile> oe = performScript(scriptDirectory, command);
         RemoteFile outFile = oe.getKey();
         String out = readFromFile(outFile);
+        //--
+        RemoteFile cppVersionsInfo = new RemoteFile(scriptDirectory, "cpp_versions.txt");
+        sftpChannel.rename(outFile.full_name, cppVersionsInfo.full_name);
+        //--
         String[] data = out.split("\n");
+        boolean cpp_17=false;
+        boolean cpp_11=false;
+        //определить какие есть версии.
         for (String version : data) {
-            System.out.println(Utils.Brackets(version));
-            if (version.equals("c++17")) {
-                res = "-std=c++17";
-                break;
-            } else if (version.equals("c++11")) {
-                res = "-std=c++11";
-                break;
+            switch (version){
+                case "c++17":
+                    cpp_17=true;
+                    break;
+                case "c++11":
+                    cpp_11=true;
+                    break;
             }
         }
+        if (cpp_17)
+            res = "-std=c++17";
+        else if (cpp_11)
+            res= "-std=c++11";
+        RemoteFile cppFlag = new RemoteFile(scriptDirectory, "current_ccp_version");
+        writeToFile(res, cppFlag);
         return res;
     }
     public String compileModules(RemoteFile modulesDirectory) throws Exception {
diff --git a/src/files/version.h b/src/files/version.h
index d8263ee9..e440e5c8 100644
--- a/src/files/version.h
+++ b/src/files/version.h
@@ -1 +1 @@
-2
\ No newline at end of file
+3
\ No newline at end of file