Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
fb726ef439 | ||
| f3b29d8d7e | |||
| 9dbf72ece2 | |||
| e6321cbdb6 | |||
| 8af5acbecd | |||
| bc24507487 |
6
.idea/workspace.xml
generated
6
.idea/workspace.xml
generated
@@ -9,11 +9,7 @@
|
||||
<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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMTask.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/RunTask_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/RunTask_json.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/DialogWrapText.java" beforeDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
||||
10
properties
10
properties
@@ -4,7 +4,7 @@
|
||||
"ServerUserPassword": "mprit_2011",
|
||||
"OfferRegistrationOnStart": true,
|
||||
"Workspace": "E:\\Tests",
|
||||
"ProjectsSearchDirectory": "E:\\Tests\\Downloads\\1331\\EP\\v1\\v1\\v4",
|
||||
"ProjectsSearchDirectory": "E:\\Tests",
|
||||
"DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
|
||||
"VisualiserPath": "C:\\Users\\misha\\Downloads",
|
||||
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
|
||||
@@ -27,15 +27,15 @@
|
||||
"LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
|
||||
"PrecompilationFlags": " ",
|
||||
"CheckTestingIntervalSeconds": 10,
|
||||
"AutoCheckTesting": true,
|
||||
"AutoCheckTesting": false,
|
||||
"EmailOnTestingProgress": true,
|
||||
"CompleteCompilationOptions": true,
|
||||
"CompleteRunEnvironments": true,
|
||||
"CreateEthalonTasks": true,
|
||||
"ErasePackageWorkspace": false,
|
||||
"lastMachineId": 1,
|
||||
"lastUserId": 17,
|
||||
"lastCompilerId": 15,
|
||||
"lastMachineId": 14,
|
||||
"lastUserId": 25,
|
||||
"lastCompilerId": 56,
|
||||
"RegisterOn": false,
|
||||
"SpacesOn": false,
|
||||
"EmptyLinesOn": false,
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
package Common.Visual.Windows.Dialog;
|
||||
import Common.MainModule_;
|
||||
import Common.Visual.Fonts.VisualiserFonts;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.awt.*;
|
||||
public class DialogWrapText extends JTextPane implements DialogFields {
|
||||
public DialogWrapText() {
|
||||
setOpaque(true);
|
||||
setBackground(Color.WHITE);
|
||||
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeBold));
|
||||
setEditable(false);
|
||||
}
|
||||
@Override
|
||||
public Component getContent() {
|
||||
return this;
|
||||
}
|
||||
/*
|
||||
public void setTextW(String text_in){
|
||||
String[] lines = text_in.split("\n");
|
||||
String labelText = "";
|
||||
if (lines.length == 1) {
|
||||
labelText = text_in;
|
||||
} else {
|
||||
int i = 0;
|
||||
for (String line : lines) {
|
||||
String fline = "";
|
||||
if (i == 0) {
|
||||
fline = "<html><body>" + line + "<br>";
|
||||
} else if (i == lines.length - 1) {
|
||||
fline = line + "</body></html>";
|
||||
} else {
|
||||
fline = line + "<br>";
|
||||
}
|
||||
++i;
|
||||
labelText += fline;
|
||||
}
|
||||
}
|
||||
setText(labelText);
|
||||
}
|
||||
*/
|
||||
}
|
||||
@@ -13,7 +13,9 @@ public class Sapfor_F extends Sapfor {
|
||||
public String getAssemblyCommand() {
|
||||
return "cd Repo/SAPFOR/install\n" +
|
||||
"cmake ../\n" +
|
||||
"make -j 4\n";
|
||||
"make -j " +
|
||||
Global.normalProperties.Kernels +
|
||||
"\n";
|
||||
}
|
||||
@Override
|
||||
public File getAssemblyFile() {
|
||||
|
||||
@@ -3,8 +3,8 @@ import Common.Utils.Vector_;
|
||||
|
||||
import java.util.Vector;
|
||||
public class Constants {
|
||||
public static final int version = 1266;
|
||||
public static final int planner_version = 26;
|
||||
public static final int version = 1267;
|
||||
public static final int planner_version = 27;
|
||||
public static final int testingMaxKernels = 64;
|
||||
//--
|
||||
public static final String ApplicationFileName = "VisualSapfor.jar";
|
||||
|
||||
@@ -36,12 +36,12 @@ public class DownloadRepositoryPass extends ProcessPass {
|
||||
if (pull) {
|
||||
System.out.println("PULL");
|
||||
scriptLines.add("cd " + dst.getAbsolutePath());
|
||||
scriptLines.add("git pull");
|
||||
scriptLines.add("GIT_SSL_NO_VERIFY=true git pull");
|
||||
} else {
|
||||
Utils.CleanDirectory(dst);
|
||||
System.out.println("CLONE");
|
||||
scriptLines.add("cd " + Utils_.DQuotes(Global.RepoDirectory.getAbsolutePath()));
|
||||
scriptLines.add("git clone " + Utils_.DQuotes(url) + " " + Utils_.DQuotes(dst.getAbsolutePath()));
|
||||
scriptLines.add("GIT_SSL_NO_VERIFY=true git clone " + Utils_.DQuotes(url) + " " + Utils_.DQuotes(dst.getAbsolutePath()));
|
||||
}
|
||||
if (hasSubmodules()) {
|
||||
scriptLines.add("cd " + Utils_.DQuotes(dst));
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user