fix столбы конфигурация сапфор

v++

src/_VisualDVM/Constants.java

@@ -3,8 +3,8 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1171;
-    public static final int planner_version = 6;
+    public static final int version = 1173;
+    public static final int planner_version = 10;
     public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
     //--
     public static final String ComponentsDirectoryName = "Components";

src/_VisualDVM/Passes/All/ShowMakefilePreview.java

@@ -6,6 +6,7 @@ import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Makefile.Makefile;
 import _VisualDVM.GlobalData.Makefile.UI.MakefilePreviewForm;
 import _VisualDVM.Passes.PassCode;
+import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.ProjectData.Project.db_project_info;
 public class ShowMakefilePreview extends Pass<db_project_info> {
     @Override
@@ -17,14 +18,10 @@ public class ShowMakefilePreview extends Pass<db_project_info> {
         return "";
     }
     @Override
-    protected PassCode necessary() {
-        return PassCode.SPF_ParseFilesWithOrder;
-    }
-    @Override
     protected boolean canStart(Object... args) {
         if (Global.mainModule.Check(Log, Current.Project) && MainModule_.instance.getDb().getTable(Makefile.class).getUI().CheckCurrent(Log)) {
             target = Global.mainModule.getProject();
-            return true;
+            return !target.languageName.equals(LanguageName.fortran) || Global.mainModule.getPass(PassCode.SPF_ParseFilesWithOrder).Do();
         }
         return false;
     }

src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java

@@ -273,6 +273,9 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
     protected void Kill() throws Exception {
         if (!testingPackage.PID.isEmpty()) {
             user.connection.Command("kill -9 " + testingPackage.PID);
+            //очистка после прерывания.
+            if (user.connection.Exists(packageRemoteWorkspace))
+                user.connection.RMDIR(packageRemoteWorkspace.full_name);
         }
     }
     @Override

src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java

@@ -80,10 +80,6 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
                         return ((ConfigurationCache) VisualCaches.GetCache(object)).groupsSummary;
                     }
                     @Override
-                    public int getMaxWidth() {
-                        return 500;
-                    }
-                    @Override
                     public Class getRendererClass() {
                         return RendererMultiline.class;
                     }

src/files/CompilationTask.h

@@ -32,7 +32,7 @@ public:
 		File makeFileFile = File(makeFilePath, this->makefile_text);
 		String tests = userWorkspace + "/projects";
 		String testPath = tests + "/" + test_id;
-		Utils::CopyDirectory(testPath, workspace);
+		Utils::CopyDirectory_L(testPath, workspace);
 	}
 	virtual String getLaunchScriptText() {
 		String modules = userWorkspace + "/modules";

src/files/Utils.h

@@ -83,6 +83,25 @@ public:
             //printf("cp -r '%s' return code = %d\n",src.getCharArray(),i);
 #endif
     }
+    	static void CopyDirectory_L(const String& src, const String& dst) {
+#if __cplusplus >= 201703L
+      	std::filesystem::copy((src+ "/.").getCharArray(), dst.getCharArray(), std::filesystem::copy_options::recursive|std::filesystem::copy_options::directories_only);
+      	std::string src_home = string(src.getCharArray());
+      	std::string dst_home = string(dst.getCharArray());
+		for (const std::filesystem::directory_entry& dir_entry : std::filesystem::recursive_directory_iterator(src_home))
+    		{
+        		if (dir_entry.is_regular_file()){
+        			std::string src_file = dir_entry.path().string();
+        			std::string relative = src_file.substr(src_home.size(), src_file.size());
+        			std::string dst_file = string(dst_home).append(relative);
+        			std::filesystem::copy(src_file, dst_file, std::filesystem::copy_options::create_symlinks);
+        		}
+    		}
+#else
+      	String command = "cp -rs " + String::DQuotes(src + "/.") + " " + String::DQuotes(dst);
+      	int i = system(command.getCharArray());
+#endif
+      }
 
 	static time_t getAbsoluteTime() {
 		return time(NULL);

src/files/version.h

@@ -1 +1 @@
-6
+10