From fd34111d2050bd064b44281edf475255b8ac0bd4 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 20 Dec 2023 20:21:47 +0300
Subject: [PATCH] fix

---
 .idea/workspace.xml                           |  1 +
 .../Passes/All/RemoteInitialiseUser.java      | 41 ++++++++++---------
 src/files/{Planner.cpp => planner.cpp}        |  0
 3 files changed, 22 insertions(+), 20 deletions(-)
 rename src/files/{Planner.cpp => planner.cpp} (100%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3f479d2e..091bd9b0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,6 +9,7 @@
     <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/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/planner.cpp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java b/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
index d790ec54..2353e310 100644
--- a/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
+++ b/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
@@ -39,12 +39,27 @@ public class RemoteInitialiseUser extends ConnectionPass_2023<RemoteFile> {
         }
     }
     String getPlannerFlags() throws Exception{
+        String res = "";
         String command = "g++ -v --help 2> /dev/null | sed -n '/^ *-std=\\([^<][^ ]\\+\\).*/ {s//\\1/p}' | grep c++";
         System.out.println(command);
-        Pair<RemoteFile, RemoteFile> res = user.connection.performScript(modulesDirectory, command);
-        RemoteFile out = res.getKey();
-        System.out.println(user.connection.readFromFile(out));
-        return "";
+        Pair<RemoteFile, RemoteFile> oe = user.connection.performScript(modulesDirectory, command);
+        RemoteFile outFile = oe.getKey();
+        String out = user.connection.readFromFile(outFile);
+        String [] data = out.split("\n");
+        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;
+            }
+        }
+        System.out.println(Utils.Brackets(res));
+        if (res.isEmpty())
+            throw new PassException("На целевой машине отсутствуют с++17 и с++11!");
+        return res;
     }
     @Override
     protected void ServerAction() throws Exception {
@@ -71,7 +86,7 @@ public class RemoteInitialiseUser extends ConnectionPass_2023<RemoteFile> {
                 "CompilationTask.h",
                 "File.h",
                 "Global.h",
-                "Planner.cpp",
+                "planner.cpp",
                 "RunSupervisor.h",
                 "RunTask.h",
                 "String.h",
@@ -91,21 +106,7 @@ public class RemoteInitialiseUser extends ConnectionPass_2023<RemoteFile> {
         ShowMessage1("Сборка модулей...");
         compileModule("launcher","");
         compileModule("starter","");
-        getPlannerFlags();
-        //compileModule("planner", getPlannerFlags());
-        /*
-
-        //канал на исполнение независим, поэтому переход в папку отдельный
-        Command(
-                "cd " + Utils.DQuotes(sftpChannel.pwd()), //нужны ли тут кавычки?
-                "g++ " + starter_code + " -o " + starter,
-                "g++ " + launcher_code + " -o " + launcher,
-                "g++ -O3 -std=c++17 Planner.cpp -o " + planner,
-                "chmod 0777 " + starter,
-                "chmod 0777 " + launcher,
-                "chmod 0777 " + planner
-        );
-        */
+        compileModule("planner", getPlannerFlags());
         //--------------------------------------
         RemoteFile info = new RemoteFile(target, Current.getAccount().email);
         user.connection.writeToFile("", info);
diff --git a/src/files/Planner.cpp b/src/files/planner.cpp
similarity index 100%
rename from src/files/Planner.cpp
rename to src/files/planner.cpp