From 8a6c9804b413d5d5b492de9b483e7ce466459b00 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 12 Mar 2025 21:47:54 +0300
Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B0=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=B4=20=D1=8E=D0=BD=D0=B8=D0=BA=D1=81=D0=BE=D0=BC=20=D1=87?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B7=20=D0=B3=D0=B8=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 16 ++++----
 .../Component/Sapfor/Sapfor_F.java            |  4 +-
 .../Component/Visualizer_2.java               |  4 +-
 src/_VisualDVM/Constants.java                 |  3 ++
 src/_VisualDVM/Passes/All/BuildComponent.java |  9 ++++-
 .../Passes/All/DownloadDvmRepository.java     | 37 +++++++++++++++++++
 ...ory.java => DownloadSapforRepository.java} |  5 +--
 src/_VisualDVM/Passes/PassCode.java           | 10 +++--
 .../TestingSystem/Common/TestingServer.java   |  4 +-
 9 files changed, 70 insertions(+), 22 deletions(-)
 create mode 100644 src/_VisualDVM/Passes/All/DownloadDvmRepository.java
 rename src/_VisualDVM/Passes/All/{DownloadRepository.java => DownloadSapforRepository.java} (90%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ab08c069..81ffc95f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDvmRepository.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/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor_F.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor_F.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadRepository.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/BuildComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/BuildComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforRepository.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -94,7 +94,7 @@
     <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.SHOW" value="true" />
     <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="509" />
     <property name="extract.method.default.visibility" value="public" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/_VisualDVM/Passes/All" />
     <property name="project.structure.last.edited" value="Libraries" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.27322906" />
@@ -107,11 +107,11 @@
       <recent name="controls.Trees" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\Passes\All" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\libs" />
       <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\Transformations" />
-      <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\icons" />
     </key>
     <key name="MoveMembersDialog.RECENTS_KEY">
       <recent name="_VisualDVM.ComponentsServer.Component.Sapfor.Sapfor" />
diff --git a/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor_F.java b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor_F.java
index 47f5ec7c..7f3756b0 100644
--- a/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor_F.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor_F.java
@@ -11,7 +11,7 @@ public class Sapfor_F extends Sapfor {
     }
     @Override
     public String getAssemblyCommand() {
-        return "cd Repo/sapfor/experts/Sapfor_2017/_bin\n" +
+        return "cd Repo/SAPFOR/install\n" +
                 "cmake ../\n" +
                 "make -j 4\n";
     }
@@ -19,7 +19,7 @@ public class Sapfor_F extends Sapfor {
     public File getAssemblyFile() {
         return Paths.get(
                 Global.RepoDirectory.getAbsolutePath(),
-                "sapfor/experts/Sapfor_2017/_bin/Sapfor_F").toFile();
+                "SAPFOR/install/Sapfor_F").toFile();
     }
     @Override
     public String getUpdateCommand() {
diff --git a/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java b/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java
index 83fd8a0d..e87044cb 100644
--- a/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java
@@ -73,7 +73,7 @@ public class Visualizer_2 extends OSDComponent {
     }
     @Override
     public String getAssemblyCommand() {
-        File src_home= Paths.get(Global.RepoDirectory.getAbsolutePath(),"/sapfor/experts/Sapfor_2017/_src/Server").toFile();
+        File src_home= Paths.get(Global.RepoDirectory.getAbsolutePath(),"SAPFOR/src/Server").toFile();
         return "cd " +Utils_.DQuotes(src_home)+
                 "\n" +
                 "g++ -O3 -std=c++17 checkUniq.cpp server.cpp -o Visualizer_2 -lpthread -lstdc++fs\n";
@@ -82,7 +82,7 @@ public class Visualizer_2 extends OSDComponent {
     public File getAssemblyFile() {
         return Paths.get(
                 Global.RepoDirectory.getAbsolutePath(),
-                "sapfor/experts/Sapfor_2017/_src/Server/Visualizer_2").toFile();
+                "SAPFOR/src/Server/Visualizer_2").toFile();
     }
     public void Connect() throws Exception {
         ClearLog();
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 3b28e688..736ed4af 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -26,6 +26,9 @@ public class Constants {
     public static final String PerformanceAnalyzerDirectoryName = "PerformanceAnalyzer";
     public static final String KeyDirectoryName = "Keys";
     //--
+    //SVN (пока оставить для тестов)
+    public static final String REPOSITORY_AUTHENTICATION = "--username dvmhuser --password dvmh2013 --non-interactive";
+    public static final String DVM_REPOSITORY = "http://svn.dvm-system.org/svn/dvmhrepo/dvm";
     //GIT
     public static final String SAPFOR_REPOSITORY = "http://dvmh-server.ddns.net:3000/Alexander_KS/SAPFOR.git";
     public static final String SAPFOR_VERSION_URL= "http://dvmh-server.ddns.net:3000/Alexander_KS/SAPFOR/raw/branch/master/src/Utils/version.h";
diff --git a/src/_VisualDVM/Passes/All/BuildComponent.java b/src/_VisualDVM/Passes/All/BuildComponent.java
index 40df4864..5187b0d9 100644
--- a/src/_VisualDVM/Passes/All/BuildComponent.java
+++ b/src/_VisualDVM/Passes/All/BuildComponent.java
@@ -2,16 +2,18 @@ package _VisualDVM.Passes.All;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
 import _VisualDVM.ComponentsServer.Component.Component;
+import _VisualDVM.ComponentsServer.Component.ComponentType;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.ProcessPass;
 
+import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 public class BuildComponent extends ProcessPass<Component> {
     @Override
     protected PassCode necessary() {
-        return PassCode.DownloadRepository;
+        return PassCode.DownloadSapforRepository;
     }
     @Override
     protected boolean resetsNecessary() {
@@ -29,6 +31,11 @@ public class BuildComponent extends ProcessPass<Component> {
     @Override
     protected void body() throws Exception {
         ShowMessage1("Сборка " + target.getComponentType().getDescription());
+        if (target.getComponentType().equals(ComponentType.Sapfor_F)){
+            File RepoSapfor = new File(Global.RepoDirectory, "SAPFOR");
+            File installationDirectory = new File(RepoSapfor,"install");
+            Utils_.CheckAndCleanDirectory(installationDirectory);
+        }
         PerformScript(target.getAssemblyCommand());
         if (!target.getAssemblyFile().exists())
             throw new PassException("Сборка не найдена");
diff --git a/src/_VisualDVM/Passes/All/DownloadDvmRepository.java b/src/_VisualDVM/Passes/All/DownloadDvmRepository.java
new file mode 100644
index 00000000..beb62724
--- /dev/null
+++ b/src/_VisualDVM/Passes/All/DownloadDvmRepository.java
@@ -0,0 +1,37 @@
+package _VisualDVM.Passes.All;
+import Common.CommonConstants;
+import _VisualDVM.Constants;
+import _VisualDVM.Global;
+import _VisualDVM.Passes.ProcessPass;
+import _VisualDVM.Utils;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.nio.file.Paths;
+public class DownloadDvmRepository extends ProcessPass {
+    File dvmHome;
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        dvmHome = Paths.get(Global.RepoDirectory.getAbsolutePath(),
+                "dvm").toFile();
+        return true;
+    }
+    private void synchronize(String src, File dst) throws Exception {
+        File loadedFile = Paths.get(dst.getAbsolutePath(), CommonConstants.LOADED).toFile();
+        if (loadedFile.exists()) {
+            PerformScript("cd " +
+                    dst.getAbsolutePath() +
+                    "\nsvn update " + Constants.REPOSITORY_AUTHENTICATION + "\n");
+        } else {
+            Utils.CleanDirectory(dst);
+            PerformScript("cd Repo\nsvn checkout " + Constants.REPOSITORY_AUTHENTICATION + " " + src + "\n"); //export
+            FileUtils.write(loadedFile, "");
+        }
+    }
+    @Override
+    protected void body() throws Exception {
+        ShowProgress(1, 0, true);
+        synchronize(Constants.DVM_REPOSITORY, dvmHome);
+        ShowProgress(1, 1, true);
+    }
+}
diff --git a/src/_VisualDVM/Passes/All/DownloadRepository.java b/src/_VisualDVM/Passes/All/DownloadSapforRepository.java
similarity index 90%
rename from src/_VisualDVM/Passes/All/DownloadRepository.java
rename to src/_VisualDVM/Passes/All/DownloadSapforRepository.java
index 08dbf258..b868bee4 100644
--- a/src/_VisualDVM/Passes/All/DownloadRepository.java
+++ b/src/_VisualDVM/Passes/All/DownloadSapforRepository.java
@@ -8,7 +8,7 @@ import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.nio.file.Paths;
-public class DownloadRepository extends ProcessPass {
+public class DownloadSapforRepository extends ProcessPass {
     File sapforHome;
     @Override
     public String getDescription() {
@@ -23,8 +23,7 @@ public class DownloadRepository extends ProcessPass {
     private void synchronize(String src, File dst) throws Exception {
         File loadedFile = Paths.get(dst.getAbsolutePath(), CommonConstants.LOADED).toFile();
         if (loadedFile.exists()) {
-            PerformScript("cd " +
-                    dst.getAbsolutePath() +
+            PerformScript("cd " + dst.getAbsolutePath() +
                     "\ngit pull ");
         } else {
             Utils.CleanDirectory(dst);
diff --git a/src/_VisualDVM/Passes/PassCode.java b/src/_VisualDVM/Passes/PassCode.java
index 552faf9e..421eb094 100644
--- a/src/_VisualDVM/Passes/PassCode.java
+++ b/src/_VisualDVM/Passes/PassCode.java
@@ -1,7 +1,6 @@
 package _VisualDVM.Passes;
 import Common.Passes.PassCode_;
 public enum PassCode implements PassCode_ {
-    //-
     UpdateProperty,
     UpdateSapforProperty,
     ShowAllParallelVariants,
@@ -132,7 +131,8 @@ public enum PassCode implements PassCode_ {
     ShowComponentChangesLog,
     UpdateComponent,
     BuildComponent,
-    DownloadRepository,
+    DownloadSapforRepository,
+    DownloadDvmRepository,
     SaveGraph,
     ApplyBugReportSettings,
     DownloadBugReport,
@@ -789,8 +789,10 @@ public enum PassCode implements PassCode_ {
                 return "Обновление компонента";
             case BuildComponent:
                 return "Сборка компонента";
-            case DownloadRepository:
-                return "Загрузка репозитория";
+            case DownloadSapforRepository:
+                return "Загрузка репозитория SAPFOR";
+            case DownloadDvmRepository:
+                return "Загрузка репозитория DVM";
             case SaveGraph:
                 return "Сделать скриншот графа функций";
             case ApplyBugReportSettings:
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index ab2225d2..aba6453a 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -12,7 +12,7 @@ import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Tasks.TaskState;
-import _VisualDVM.Passes.All.DownloadRepository;
+import _VisualDVM.Passes.All.DownloadDvmRepository;
 import _VisualDVM.Passes.All.ZipFolderPass;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.Files.ProjectFile;
@@ -350,7 +350,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
     void RefreshDVMTests() throws Exception {
         UserAccount account = new UserAccount("server", Constants.MailAddress);
         ServerSapfor serverSapfor = db.serverSapfors.getLastDoneVersion();
-        DownloadRepository downloadRepository = new DownloadRepository();
+        DownloadDvmRepository downloadRepository = new DownloadDvmRepository();
         if (!downloadRepository.Do())
             throw new RepositoryRefuseException("Не удалось обновить репозиторий");
         //-->>