From 96b6d4013606eb5a71b3e20aff31cdf0f8913e8b Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 20 Dec 2023 16:56:18 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 25 ---------------
 .../Passes/All/RemoteInitialiseUser.java      | 32 +++++++++++--------
 2 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5121907a..3f479d2e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,33 +7,8 @@
   </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/SSH/ConnectionPass_2023.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/User.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java" 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/Visual_DVM_2021/Passes/SSH/ConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/ConnectionPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/files/Planner/Array.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Array.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/files/Planner/CompilationSupervisor.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/CompilationSupervisor.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/files/Planner/CompilationTask.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/CompilationTask.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/files/Planner/File.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/File.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/files/Planner/Global.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Global.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/files/Planner/Planner.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Planner.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/files/Planner/RunSupervisor.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/RunSupervisor.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/files/Planner/RunTask.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/RunTask.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/files/Planner/String.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/String.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/files/Planner/Supervisor.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Supervisor.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/files/Planner/Task.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Task.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/files/Planner/Text.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Text.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/files/Planner/Utils.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Utils.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/files/Planner/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/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java b/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
index f25dcdd3..d790ec54 100644
--- a/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
+++ b/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java
@@ -4,6 +4,7 @@ import Common.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import Visual_DVM_2021.Passes.PassException;
 import Visual_DVM_2021.Passes.SSH.ConnectionPass_2023;
+import javafx.util.Pair;
 
 import java.io.File;
 import java.util.Vector;
@@ -26,10 +27,10 @@ public class RemoteInitialiseUser extends ConnectionPass_2023<RemoteFile> {
     void put_resource(String res_name, RemoteFile dst_directory) throws Exception {
         user.connection.putSingleFile(Utils.CreateTempResourceFile(res_name), new RemoteFile(dst_directory, res_name));
     }
-    void compileModule(String module_name) throws Exception{
-        user.connection.performScript(modulesDirectory,
-                "g++ " +
-                Utils.DQuotes(module_name + ".cpp") + " -o "+ Utils.DQuotes(module_name));
+    void compileModule(String module_name, String flags) throws Exception{
+        String command = "g++ " + flags+" "+ Utils.DQuotes(module_name + ".cpp") + " -o "+ Utils.DQuotes(module_name);
+        ShowMessage2(command);
+        user.connection.performScript(modulesDirectory, command);
         RemoteFile binary = new RemoteFile(modulesDirectory, module_name);
         if (!user.connection.Exists(binary)){
             throw new PassException("Не удалось собрать модуль "+Utils.Brackets(module_name));
@@ -37,6 +38,14 @@ public class RemoteInitialiseUser extends ConnectionPass_2023<RemoteFile> {
             user.connection.sftpChannel.chmod(0777, binary.full_name);
         }
     }
+    String getPlannerFlags() throws Exception{
+        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 "";
+    }
     @Override
     protected void ServerAction() throws Exception {
         String workspace_name = Utils.getDateName("visual_sapfor_workspace");
@@ -71,7 +80,7 @@ public class RemoteInitialiseUser extends ConnectionPass_2023<RemoteFile> {
                 "Text.h",
                 "Utils.h"
         };
-        ShowMessage1("Закачка модулей...");
+        ShowMessage1("Закачка кода модулей...");
         for (String resource_name : resourses_names) {
             ShowMessage2(resource_name);
             File src = Utils.CreateTempResourceFile(resource_name);
@@ -80,15 +89,10 @@ public class RemoteInitialiseUser extends ConnectionPass_2023<RemoteFile> {
         }
         //-------------------------------------
         ShowMessage1("Сборка модулей...");
-        String [] modules_names = new String[]{
-                "launcher",
-                "starter",
-                "planner"
-        };
-        for (String module_name: modules_names){
-            ShowMessage2(module_name);
-            compileModule(module_name);
-        }
+        compileModule("launcher","");
+        compileModule("starter","");
+        getPlannerFlags();
+        //compileModule("planner", getPlannerFlags());
         /*
 
         //канал на исполнение независим, поэтому переход в папку отдельный