This commit is contained in:
2024-05-17 01:33:39 +03:00
parent 264fc3b955
commit d29c2ba93c
11 changed files with 115 additions and 43 deletions

View File

@@ -10,5 +10,6 @@ public class ActualizePackages extends Pass_2021 {
protected void body() throws Exception {
passes.get(PassCode_2021.ActualizeDVMPackages).Do();
passes.get(PassCode_2021.ActualizeSapforPackages).Do();
passes.get(PassCode_2021.ActualizeServerSapfors).Do();
}
}

View File

@@ -0,0 +1,16 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import Common.UI.UI;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
public class ActualizeServerSapfors extends Pass_2021 {
@Override
protected boolean canStart(Object... args) throws Exception {
return Global.testingServer.db.hasActiveSapfors();
}
@Override
protected void body() throws Exception {
passes.get(PassCode_2021.SynchronizeTests).Do();
}
}

View File

@@ -6,6 +6,7 @@ import Common.Global;
import TestingSystem.Common.TasksPackageState;
import TestingSystem.SAPFOR.Json.SapforPackage_json;
import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
import Visual_DVM_2021.Passes.AddObjectPass;
import java.io.File;
@@ -29,37 +30,44 @@ public class AddSapforPackage extends AddObjectPass<SapforPackage> {
if (!Current.getAccount().CheckRegistered(Log)) {
return false;
}
if (Current.Check(Log, Current.ServerSapfor)) {
for (SapforPackage sapforPackage : Global.testingServer.db.sapforPackages.Data.values()) {
if (sapforPackage.state.equals(TasksPackageState.Draft)) {
Log.Writeln_("Может существовать только один пакет, готовящийся к публикации.");
return false;
}
}
//--
target = new SapforPackage();
target.id = Constants.Nan;
target.state = TasksPackageState.Draft;
//-
target.sender_name = Current.getAccount().name;
target.sender_address = Current.getAccount().email;
//-
target.drv = Current.getServerSapfor().call_command;
target.version = Current.getServerSapfor().version;
target.kernels = Global.properties.TestingKernels;
target.needsEmail = Global.properties.EmailOnTestingProgress ? 1 : 0;
//--
target.sapforId = Current.getServerSapfor().id;
//
SapforPackage_json package_json = new SapforPackage_json();
target.package_json = package_json;
///-------------------------------
package_json.kernels = target.kernels;
package_json.sapfor_drv = Current.getServerSapfor().call_command;
///-------------------------------
return true;
if (!Current.Check(Log, Current.ServerSapfor))
return false;
if (!Current.getServerSapfor().state.equals(ServerSapforState.Done)) {
Log.Writeln_("Выбранная версия SAPFOR не собрана!");
return false;
}
return false;
if (!Current.getServerSapfor().state.equals(ServerSapforState.Done)) {
Log.Writeln_("Выбранная версия SAPFOR не собрана!");
return false;
}
for (SapforPackage sapforPackage : Global.testingServer.db.sapforPackages.Data.values()) {
if (sapforPackage.state.equals(TasksPackageState.Draft)) {
Log.Writeln_("Может существовать только один пакет, готовящийся к публикации.");
return false;
}
}
//--
target = new SapforPackage();
target.id = Constants.Nan;
target.state = TasksPackageState.Draft;
//-
target.sender_name = Current.getAccount().name;
target.sender_address = Current.getAccount().email;
//-
target.drv = Current.getServerSapfor().call_command;
target.version = Current.getServerSapfor().version;
target.kernels = Global.properties.TestingKernels;
target.needsEmail = Global.properties.EmailOnTestingProgress ? 1 : 0;
//--
target.sapforId = Current.getServerSapfor().id;
//
SapforPackage_json package_json = new SapforPackage_json();
target.package_json = package_json;
///-------------------------------
package_json.kernels = target.kernels;
package_json.sapfor_drv = Current.getServerSapfor().call_command;
///-------------------------------
return true;
}
@Override
protected void body() throws Exception {

View File

@@ -16,6 +16,7 @@ import TestingSystem.SAPFOR.Json.SapforTestingSet_json;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import TestingSystem.SAPFOR.SapforTask.SapforTask;
import TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
import Visual_DVM_2021.Passes.AddObjectPass;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
@@ -84,6 +85,10 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
//--
if (!Current.Check(Log, Current.ServerSapfor))
return false;
if (!Current.getServerSapfor().state.equals(ServerSapforState.Done)) {
Log.Writeln_("Выбранная версия SAPFOR не собрана!");
return false;
}
//--
srcPackages = Global.testingServer.db.sapforPackages.getCheckedOrCurrent();
if (srcPackages.isEmpty()) {

View File

@@ -335,12 +335,15 @@ public enum PassCode_2021 {
//---
SPF_InsertImplicitNone,
CompileServerSapfor,
ActualizeServerSapfors,
;
public String getDescription() {
switch (this) {
case Undefined:
return "?";
//--
case ActualizeServerSapfors:
return "Проверить собираемые версии SAPFOR";
case CompileServerSapfor:
return "Собрать версию Sapfor";
case PublishComponentsServer: