M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

++

Browse Source 
Дополнение обновлений
This commit is contained in:
02090095
2025-03-13 14:36:02 +03:00
parent 1d97048de1
commit dc68667b20
8 changed files with 35 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/_VisualDVM/TestingSystem/Common/TestingServer.java
View File

@@ -587,6 +587,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
void GetSapforForCompilation() throws Exception {
//1. Проверить наличие заказов от пользователя
ServerSapfor serverSapfor = db.getSapforCopyForCompilation();
if (serverSapfor == null) {
//2 если нет. проверить есть ли свежие версии.
int max_version = db.getInstalledSapforMaxVersion();
@@ -597,6 +598,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
serverSapfor = new ServerSapfor();
serverSapfor.sender_name = "server";
serverSapfor.sender_address = Constants.MailAddress;
serverSapfor.version = String.valueOf(current_version);
serverSapfor.state = ServerSapforState.Queued;
db.Insert(serverSapfor);
}

7
src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
View File

@@ -237,9 +237,9 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
UpdateSapforState(ServerSapforState.SAPFORRepositorySynchronization);
Utils.CleanDirectory(repo);
Utils.startScript(repo, repo, "git_clone",
"git clone " + Constants.SAPFOR_REPOSITORY + " " +
Utils_.DQuotes(repo_sapfor) +
" 1>spf_out.txt 2>spf_err.txt\n").waitFor();
"git clone " + Constants.SAPFOR_REPOSITORY + " " + Utils_.DQuotes(repo_sapfor) + " 1>spf_out.txt 2>spf_err.txt\n" +
"cd " + Utils_.DQuotes(repo_sapfor) + "\n"+
"GIT_SSL_NO_VERIFY=true git submodule update --init\n").waitFor();
}
void CompileSapfor() throws Exception {
UpdateSapforState(ServerSapforState.Compilation);
@@ -276,7 +276,6 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
//--
sapfor.home_path = sapforHome.getAbsolutePath();
sapfor.languageName = LanguageName.fortran;
sapfor.version = String.valueOf(current_version);
//--
File sapforBin = new File(sapforHome, "Sapfor_F");
File sapforOut = new File(sapforHome, Constants.out_file);