no message
This commit is contained in:
@@ -7,11 +7,8 @@ import Common.Utils.Utils;
|
||||
import ProjectData.LanguageName;
|
||||
import Repository.Component.Sapfor.Sapfor;
|
||||
import Repository.EmailMessage;
|
||||
import Repository.RepositoryRefuseException;
|
||||
import Repository.Server.ServerCode;
|
||||
import Repository.Server.ServerExchangeUnit_2021;
|
||||
import TestingSystem.Common.TasksPackageState;
|
||||
import TestingSystem.Common.TestingPackageToKill.TestingPackageToKill;
|
||||
import TestingSystem.Common.TestingPlanner;
|
||||
import TestingSystem.SAPFOR.Json.SapforConfiguration_json;
|
||||
import TestingSystem.SAPFOR.Json.SapforTest_json;
|
||||
@@ -27,7 +24,6 @@ import java.nio.charset.Charset;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Vector;
|
||||
public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
|
||||
File workspace;
|
||||
@@ -188,13 +184,16 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
|
||||
}
|
||||
}
|
||||
void SyncronizeRepository() throws Exception {
|
||||
|
||||
System.out.println("Синхронизация репозитория...");
|
||||
UpdateSapforState(ServerSapforState.DVMRepositorySynchronization);
|
||||
System.out.println("Синхронизация ветви DVM...");
|
||||
Utils.startScript(repo, repo, "dvm_checkout",
|
||||
"svn checkout " +
|
||||
Constants.REPOSITORY_AUTHENTICATION +
|
||||
" " + Constants.DVM_REPOSITORY + " 1>dvm_out.txt 2>dvm_err.txt\n").waitFor();
|
||||
System.out.println("Синхронизация ветви SAPFOR...");
|
||||
UpdateSapforState(ServerSapforState.SAPFORRepositorySynchronization);
|
||||
Utils.startScript(repo, repo, "spf_checkout",
|
||||
"svn checkout " +
|
||||
Constants.REPOSITORY_AUTHENTICATION +
|
||||
@@ -202,6 +201,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
|
||||
}
|
||||
void CompileSapfor() throws Exception {
|
||||
System.out.println("Сборка SAPFOR...");
|
||||
UpdateSapforState(ServerSapforState.Compilation);
|
||||
//-
|
||||
if (repo_bin.exists())
|
||||
FileUtils.forceDelete(repo_bin);
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
package TestingSystem.SAPFOR.ServerSapfor;
|
||||
import Common.Constants;
|
||||
import Common.Database.DBObject;
|
||||
import Common.Database.riDBObject;
|
||||
import Common.Utils.Utils;
|
||||
import GlobalData.RemoteFile.RemoteFile;
|
||||
import ProjectData.LanguageName;
|
||||
import com.sun.org.glassfish.gmbal.Description;
|
||||
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
package TestingSystem.SAPFOR.ServerSapfor;
|
||||
import Common.Current;
|
||||
import Common.UI.StatusEnum;
|
||||
import Common.UI.Themes.VisualiserFonts;
|
||||
|
||||
import java.awt.*;
|
||||
public enum ServerSapforState implements StatusEnum {
|
||||
Queued,
|
||||
RepositorySynchronization,
|
||||
DVMRepositorySynchronization,
|
||||
SAPFORRepositorySynchronization,
|
||||
Compilation,
|
||||
Done,
|
||||
DoneWithErrors;
|
||||
@@ -20,7 +18,8 @@ public enum ServerSapforState implements StatusEnum {
|
||||
case DoneWithErrors:
|
||||
return VisualiserFonts.BadState;
|
||||
case Compilation:
|
||||
case RepositorySynchronization:
|
||||
case DVMRepositorySynchronization:
|
||||
case SAPFORRepositorySynchronization:
|
||||
return VisualiserFonts.ProgressState;
|
||||
default:
|
||||
return VisualiserFonts.UnknownState;
|
||||
@@ -31,8 +30,10 @@ public enum ServerSapforState implements StatusEnum {
|
||||
switch (this) {
|
||||
case Queued:
|
||||
return "в очереди";
|
||||
case RepositorySynchronization:
|
||||
return "синхронизация";
|
||||
case DVMRepositorySynchronization:
|
||||
return "синхронизация репозитория DVM";
|
||||
case SAPFORRepositorySynchronization:
|
||||
return "синхронизация репозитория SAPFOR";
|
||||
case Compilation:
|
||||
return "сборка";
|
||||
case Done:
|
||||
|
||||
@@ -5,7 +5,8 @@ public class ServerSapforsBar extends DataMenuBar {
|
||||
public ServerSapforsBar() {
|
||||
super("версии SAPFOR",
|
||||
PassCode_2021.CompileServerSapfor,
|
||||
// PassCode_2021.InstallServerSapfor,
|
||||
PassCode_2021.ShowSapforCompilationOut,
|
||||
PassCode_2021.ShowSapforCompilationErr,
|
||||
PassCode_2021.DeleteServerSapfor
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user