символические ссылки при копировании экземпляров визуализатора на сервере ( для нитей и пакетов сапфора)
v++
This commit is contained in:
7
.idea/workspace.xml
generated
7
.idea/workspace.xml
generated
@@ -7,9 +7,12 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/TableMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/TableMenu.java" afterDir="false" />
|
<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/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|||||||
14
properties
14
properties
@@ -4,15 +4,15 @@
|
|||||||
"ServerUserPassword": "mprit_2011",
|
"ServerUserPassword": "mprit_2011",
|
||||||
"OfferRegistrationOnStart": true,
|
"OfferRegistrationOnStart": true,
|
||||||
"Workspace": "E:\\Tests",
|
"Workspace": "E:\\Tests",
|
||||||
"ProjectsSearchDirectory": "E:\\BUG",
|
"ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1740738431",
|
||||||
"DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
|
"DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
|
||||||
"VisualiserPath": "C:\\Users\\misha\\Downloads",
|
"VisualiserPath": "C:\\Users\\misha\\Downloads",
|
||||||
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
|
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
|
||||||
"Visualizer_2Path": "C:\\Users\\misha\\Documents",
|
"Visualizer_2Path": "C:\\Users\\misha\\Documents",
|
||||||
"InstructionPath": "C:\\Users\\misha\\Documents",
|
"InstructionPath": "C:\\Users\\misha\\Documents",
|
||||||
"PerformanceAnalyzerPath": "C:\\Users\\misha\\Documents",
|
"PerformanceAnalyzerPath": "C:\\Users\\misha\\Documents",
|
||||||
"AutoBugReportsLoad": false,
|
"AutoBugReportsLoad": true,
|
||||||
"AutoTestsLoad": false,
|
"AutoTestsLoad": true,
|
||||||
"ConfirmPassesStart": true,
|
"ConfirmPassesStart": true,
|
||||||
"ShowPassesDone": true,
|
"ShowPassesDone": true,
|
||||||
"FocusPassesResult": true,
|
"FocusPassesResult": true,
|
||||||
@@ -26,11 +26,11 @@
|
|||||||
"Kernels": 8,
|
"Kernels": 8,
|
||||||
"LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
|
"LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
|
||||||
"CheckTestingIntervalSeconds": 10,
|
"CheckTestingIntervalSeconds": 10,
|
||||||
"AutoCheckTesting": false,
|
"AutoCheckTesting": true,
|
||||||
"EmailOnTestingProgress": true,
|
"EmailOnTestingProgress": true,
|
||||||
"lastMachineId": 28,
|
"lastMachineId": 13,
|
||||||
"lastUserId": 36,
|
"lastUserId": 34,
|
||||||
"lastCompilerId": 109,
|
"lastCompilerId": 52,
|
||||||
"RegisterOn": false,
|
"RegisterOn": false,
|
||||||
"SpacesOn": false,
|
"SpacesOn": false,
|
||||||
"EmptyLinesOn": false,
|
"EmptyLinesOn": false,
|
||||||
|
|||||||
@@ -3,10 +3,12 @@ import Common.Utils.Vector_;
|
|||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class Constants {
|
public class Constants {
|
||||||
public static final int version = 1188;
|
public static final int version = 1189;
|
||||||
public static final int planner_version = 10;
|
public static final int planner_version = 10;
|
||||||
public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
|
public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
|
||||||
//--
|
//--
|
||||||
|
public static final String ApplicationFileName = "VisualSapfor.jar";
|
||||||
|
//--
|
||||||
public static final String ComponentsDirectoryName = "Components";
|
public static final String ComponentsDirectoryName = "Components";
|
||||||
public static final String DataDirectoryName = "Data";
|
public static final String DataDirectoryName = "Data";
|
||||||
public static final String DownloadsDirectoryName = "Downloads";
|
public static final String DownloadsDirectoryName = "Downloads";
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
|
|||||||
import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
|
import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
public class Global {
|
public class Global {
|
||||||
//todo свести большинство к содержимому mainModule
|
//todo свести большинство к содержимому mainModule
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import org.apache.commons.io.FileUtils;
|
|||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.net.InetAddress;
|
import java.net.InetAddress;
|
||||||
|
import java.nio.file.Files;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class MachineProcess extends DBObject {
|
public class MachineProcess extends DBObject {
|
||||||
public String id = "";
|
public String id = "";
|
||||||
@@ -95,9 +96,10 @@ public class MachineProcess extends DBObject {
|
|||||||
File workspace = getWorkspace();
|
File workspace = getWorkspace();
|
||||||
Utils_.CheckAndCleanDirectory(workspace);
|
Utils_.CheckAndCleanDirectory(workspace);
|
||||||
//копирование визуализатора
|
//копирование визуализатора
|
||||||
File src = new File(Utils_.getHomeDirectory(), "TestingSystem.jar");
|
File src = new File(Utils_.getHomeDirectory(), Constants.ApplicationFileName);
|
||||||
File supervisor = new File(workspace, "VisualSapfor.jar");
|
File supervisor = new File(workspace, "VisualSapfor.jar");
|
||||||
FileUtils.copyFile(src, supervisor); //? можно ли символическую ссылку?
|
//здесь наоборот дст в начале
|
||||||
|
Files.createSymbolicLink(supervisor.toPath(), src.toPath());
|
||||||
//создание настроек
|
//создание настроек
|
||||||
VisualDVMProperties properties = new VisualDVMProperties();
|
VisualDVMProperties properties = new VisualDVMProperties();
|
||||||
properties.Mode = Mode.MachineQueue;
|
properties.Mode = Mode.MachineQueue;
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import org.apache.commons.io.FileUtils;
|
|||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.nio.charset.Charset;
|
import java.nio.charset.Charset;
|
||||||
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
|
public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
|
||||||
@@ -89,7 +90,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
|
|||||||
protected void PackageWorkspaceCreation() throws Exception {
|
protected void PackageWorkspaceCreation() throws Exception {
|
||||||
//копирование визуализатора
|
//копирование визуализатора
|
||||||
File visualiser = new File(workspace, "VisualSapfor.jar");
|
File visualiser = new File(workspace, "VisualSapfor.jar");
|
||||||
FileUtils.copyFile(new File(Utils_.getHomeDirectory(), "TestingSystem.jar"), visualiser);
|
Files.createSymbolicLink(visualiser.toPath(), new File(Utils_.getHomeDirectory(), Constants.ApplicationFileName).toPath());
|
||||||
//создание настроек
|
//создание настроек
|
||||||
VisualDVMProperties properties = new VisualDVMProperties();
|
VisualDVMProperties properties = new VisualDVMProperties();
|
||||||
properties.Mode = Mode.Package;
|
properties.Mode = Mode.Package;
|
||||||
|
|||||||
Reference in New Issue
Block a user