From 6a7feb96e7deb6269b68ebeca0309922ac37dc5b Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 19 Feb 2024 23:49:35 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  4 ++-
 properties                                    |  1 +
 src/Repository/Server/ServerCode.java         |  5 +--
 src/TestingSystem/Common/TestingServer.java   | 30 ++++++++++++++++
 .../Passes/All/InstallServerSapfor.java       | 34 ++++++++++++++++---
 5 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fa1b3db0..c0af1d08 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,9 @@
   <component name="ChangeListManager">
     <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/Common/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/GlobalProperties.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/properties b/properties
index b592c51c..e2234573 100644
--- a/properties
+++ b/properties
@@ -2,6 +2,7 @@
   "Mode": "Normal",
   "ServerAddress": "alex-freenas.ddns.net",
   "ServerUserName": "testuser",
+  "ServerUserSHHPort": 23,
   "ComponentsServerPort": 7995,
   "TestingServerPort": 7998,
   "SocketTimeout": 5000,
diff --git a/src/Repository/Server/ServerCode.java b/src/Repository/Server/ServerCode.java
index 3c64f9ff..184e486f 100644
--- a/src/Repository/Server/ServerCode.java
+++ b/src/Repository/Server/ServerCode.java
@@ -53,7 +53,6 @@ public enum ServerCode {
     CheckURLRegistered,
     DVMConvertProject,
     SetRole,
-    InstallSapforForTesting,
     Patch,
     EmailSapforAssembly,
     //-
@@ -76,5 +75,7 @@ public enum ServerCode {
     SapforPackageNeedsKill,
     UpdateActiveSapforPackages,
     DownloadDVMPackage,
-    DownloadDVMPackages, DownloadSapforPackage;
+    DownloadDVMPackages,
+    DownloadSapforPackage,
+    InstallServerSapfor;
 }
diff --git a/src/TestingSystem/Common/TestingServer.java b/src/TestingSystem/Common/TestingServer.java
index 825d2d1d..f4a37aba 100644
--- a/src/TestingSystem/Common/TestingServer.java
+++ b/src/TestingSystem/Common/TestingServer.java
@@ -243,6 +243,10 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 Print("Загрузить пакет SAPFOR");
                 DownloadSapforPackage();
                 break;
+            case InstallServerSapfor:
+                Print("Установить текущую версию SAPFOR для тестирования");
+                InstallServerSapfor();
+                break;
             default:
                 throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
         }
@@ -485,4 +489,30 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         else
             throw new RepositoryRefuseException("Не удалось заархивировать пакет тестирования SAPFOR с ключом " + sapforPackage_id);
     }
+    private void InstallServerSapfor() throws Exception {
+        File testingSystemHome = new File(Global.Home);
+        File repo = new File(testingSystemHome, "Repo");
+        File repoSapforHome = Paths.get(repo.getAbsolutePath(), Constants.SAPFOR_REPOSITORY_BIN ).toFile();
+        File repo_bin = new File(repoSapforHome, "Sapfor_F");
+        //--
+        Utils.startScript(repo, repo, "dvm_checkout",
+                "svn checkout " +
+                        Constants.REPOSITORY_AUTHENTICATION +
+                        " " + Constants.DVM_REPOSITORY + " 1>dvm_out.txt 2>dvm_err.txt\n").waitFor();
+
+        Utils.startScript(repo, repo, "spf_checkout",
+                "svn checkout " +
+                        Constants.REPOSITORY_AUTHENTICATION +
+                        " " + Constants.SAPFOR_REPOSITORY + " 1>spf_out.txt 2>spf_err.txt\n").waitFor();
+        //--
+
+        if (repo_bin.exists()){
+            FileUtils.forceDelete(repo_bin);
+        }
+        //--
+        Utils.startScript(repoSapforHome, repoSapforHome, "build_sapfor",
+                "cmake ../ 1>out.txt 2>err.txt\nmake -j 14 1>>out.txt 2>>err.txt\n").waitFor();
+        //--
+        response = new ServerExchangeUnit_2021(ServerCode.OK);
+    }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java b/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
index 6d5b41a5..e797ce20 100644
--- a/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
+++ b/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java
@@ -17,6 +17,7 @@ import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 
 import java.util.Date;
 import java.util.Vector;
+/*
 public class InstallServerSapfor extends ConnectionPass<Object> {
     boolean result;
     ServerSapfor serverSapfor;
@@ -28,6 +29,10 @@ public class InstallServerSapfor extends ConnectionPass<Object> {
     @Override
     public String getButtonText() {
         return "";
+    }
+      @Override
+    protected boolean needsAnimation() {
+        return true;
     }
     @Override
     public void Connect() throws Exception {
@@ -42,10 +47,7 @@ public class InstallServerSapfor extends ConnectionPass<Object> {
         serverSapfor = null;
         return true;
     }
-    @Override
-    protected boolean needsAnimation() {
-        return true;
-    }
+
     @Override
     protected void ServerAction() throws Exception {
         RemoteFile testingSystemHome = new RemoteFile(user.connection.sftpChannel.pwd(), "_testing_system", true);
@@ -127,3 +129,27 @@ public class InstallServerSapfor extends ConnectionPass<Object> {
     }
 }
 
+*/
+public class InstallServerSapfor extends TestingSystemPass{
+    @Override
+    public String getIconPath() {
+        return "/icons/DownloadAll.png";
+    }
+    @Override
+    public String getButtonText() {
+        return "";
+    }
+    @Override
+    protected boolean needsAnimation() {
+        return true;
+    }
+    @Override
+    protected int getTimeout() {
+        return 0;
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+        Command(new ServerExchangeUnit_2021(ServerCode.InstallServerSapfor));
+        System.out.println(response.object);
+    }
+}