diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a3b4b394..1340fa72 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,27 +10,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
diff --git a/properties b/properties
index 5336c116..792c3549 100644
--- a/properties
+++ b/properties
@@ -1,19 +1,19 @@
{
"Workspace": "E:\\Tests",
- "ProjectsSearchDirectory": "E:\\Tests\\Downloads",
+ "ProjectsSearchDirectory": "E:\\Tests",
"VisualiserPath": "C:\\Users\\misha\\Downloads",
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
"Visualizer_2Path": "C:\\Users\\misha\\Documents",
"InstructionPath": "C:\\Users\\misha\\Documents",
"PerformanceAnalyzerPath": "C:\\Users\\misha\\Documents",
- "AutoBugReportsLoad": true,
- "AutoTestsLoad": true,
+ "AutoBugReportsLoad": false,
+ "AutoTestsLoad": false,
"ConfirmPassesStart": true,
"ShowPassesDone": true,
"FocusPassesResult": true,
"collapseCredentials": true,
- "collapseFileGraphs": false,
- "collapseFileMessages": false,
+ "collapseFileGraphs": true,
+ "collapseFileMessages": true,
"collapseProjectTrees": false,
"EditorFontSize": 17,
"ComponentsWindowWidth": 929,
@@ -21,11 +21,11 @@
"Kernels": 8,
"LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
"CheckTestingIntervalSeconds": 10,
- "AutoCheckTesting": true,
+ "AutoCheckTesting": false,
"EmailOnTestingProgress": true,
- "lastMachineId": 28,
- "lastUserId": 36,
- "lastCompilerId": 107,
+ "lastMachineId": 13,
+ "lastUserId": 24,
+ "lastCompilerId": 52,
"RegisterOn": false,
"SpacesOn": false,
"EmptyLinesOn": false,
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 6f40d2a5..ac60801c 100644
--- a/src/_VisualDVM/Constants.java
+++ b/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";
diff --git a/src/_VisualDVM/Passes/All/ShowMakefilePreview.java b/src/_VisualDVM/Passes/All/ShowMakefilePreview.java
index ef21d20a..6b679920 100644
--- a/src/_VisualDVM/Passes/All/ShowMakefilePreview.java
+++ b/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 {
@Override
@@ -17,14 +18,10 @@ public class ShowMakefilePreview extends Pass {
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;
}
diff --git a/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java b/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
index 2ce9a10f..5e3dadc7 100644
--- a/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
+++ b/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
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
index 192116dc..a696b50c 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
@@ -80,10 +80,6 @@ public class SapforConfigurationsForm extends DataSetControlFormmakefile_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";
diff --git a/src/files/Utils.h b/src/files/Utils.h
index edc1ab33..7567429a 100644
--- a/src/files/Utils.h
+++ b/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);
diff --git a/src/files/version.h b/src/files/version.h
index 62f94575..9a037142 100644
--- a/src/files/version.h
+++ b/src/files/version.h
@@ -1 +1 @@
-6
\ No newline at end of file
+10
\ No newline at end of file