From c85661a26413d5c262c2cfdddf9f881cbc28e484 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 9 Mar 2025 21:35:34 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B0=D0=B7=D0=BD=D0=B0=D1=87=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BE=D0=BA=D1=80=D1=83=D0=B6=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20PATH=20LD=5FLIBRARY=5FPATH=20++?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 10 ++++--
 properties                                    | 10 +++---
 src/_VisualDVM/Constants.java                 |  4 +--
 .../Repository/Server/RepositoryServer.java   |  3 --
 src/files/Global.h                            |  2 ++
 src/files/RunTask.h                           |  5 +--
 src/files/Task.h                              |  8 +++--
 src/files/planner.cpp                         | 32 +++++++++----------
 src/files/version.h                           |  2 +-
 9 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 26c1c12e..98bb754b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,10 +8,14 @@
   <component name="ChangeListManager">
     <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$/src/_VisualDVM/ComponentsServer/Component/Json/ComponentPublicationInfoJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Json/ComponentPublicationInfoJson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" 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/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Global.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Global.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/RunTask.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/RunTask.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Task.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Task.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/planner.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/planner.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/version.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/version.h" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index b4e500c8..789eef95 100644
--- a/properties
+++ b/properties
@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\BUG",
+  "ProjectsSearchDirectory": "E:\\Tests",
   "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
@@ -26,13 +26,13 @@
   "Kernels": 8,
   "LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
   "CheckTestingIntervalSeconds": 10,
-  "AutoCheckTesting": false,
+  "AutoCheckTesting": true,
   "EmailOnTestingProgress": true,
   "CompleteCompilationOptions": false,
   "CompleteRunEnvironments": false,
-  "lastMachineId": 13,
-  "lastUserId": 34,
-  "lastCompilerId": 52,
+  "lastMachineId": 28,
+  "lastUserId": 36,
+  "lastCompilerId": 110,
   "RegisterOn": false,
   "SpacesOn": false,
   "EmptyLinesOn": false,
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 62f5ddf3..fdb7e5a7 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,8 +3,8 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1203;
-    public static final int planner_version = 12;
+    public static final int version = 1204;
+    public static final int planner_version = 15;
     public static final int testingMaxKernels = 64;
     //--
     public static final String ApplicationFileName = "VisualSapfor.jar";
diff --git a/src/_VisualDVM/Repository/Server/RepositoryServer.java b/src/_VisualDVM/Repository/Server/RepositoryServer.java
index becf991c..35a7fd3e 100644
--- a/src/_VisualDVM/Repository/Server/RepositoryServer.java
+++ b/src/_VisualDVM/Repository/Server/RepositoryServer.java
@@ -225,9 +225,6 @@ public abstract class RepositoryServer<D extends Database> {
                                 case ReceiveFile:
                                     ReceiveFile();
                                     break;
-                                case Email:
-                                    Email();
-                                    break;
                                 default:
                                     UnsafeSession();
                                     break;
diff --git a/src/files/Global.h b/src/files/Global.h
index a3ce0faf..d3ea9aac 100644
--- a/src/files/Global.h
+++ b/src/files/Global.h
@@ -8,3 +8,5 @@ int maxKernels;
 int busyKernels;
 int freeKernels;
 String dvm_drv;
+String PATH;
+String LD_LIBRARY_PATH;
diff --git a/src/files/RunTask.h b/src/files/RunTask.h
index 6f87d4eb..fd892206 100644
--- a/src/files/RunTask.h
+++ b/src/files/RunTask.h
@@ -91,12 +91,9 @@ public:
 	}
 	
 	String getStartCommand() override {
-		String res = workspace + "/run";
+		String res = Task::getStartCommand();
 		if (!environments.isEmpty())
 			res = environments + " " + res;
-#if DEB
-		printf("START %ld: %s\n", id, res.getCharArray());
-#endif
 		return res;
 	}
 
diff --git a/src/files/Task.h b/src/files/Task.h
index 3ec919ef..6913f488 100644
--- a/src/files/Task.h
+++ b/src/files/Task.h
@@ -122,9 +122,13 @@ public:
 	virtual void prepareWorkspace() {}
 	virtual String getLaunchScriptText() = 0;
 	virtual String getStartCommand() {
-		return workspace + "/run";
+		String res = workspace + "/run";
+        if (!PATH.isEmpty())
+        	res = "PATH="+String::DQuotes(PATH)+ " " + res;
+        if (!LD_LIBRARY_PATH.isEmpty())
+             res = "LD_LIBRARY_PATH="+String::DQuotes(LD_LIBRARY_PATH)+ " " + res;
+		return res;
 	}
-
 	void createWorkspace() {
 		Utils::Mkdir(workspace);
 	}
diff --git a/src/files/planner.cpp b/src/files/planner.cpp
index ce0d2ef6..045a52f0 100644
--- a/src/files/planner.cpp
+++ b/src/files/planner.cpp
@@ -88,6 +88,14 @@ void set_handlers() {
 #endif
 }
 
+void getEnv_(String& res, const char * name_in){
+    char * value_ = getenv(name_in);
+    if (value_ != NULL){
+         res = String(value_);
+         value_ = NULL;
+    }
+}
+
 int main(int argc, char ** argv)      
 {
     //+
@@ -101,18 +109,20 @@ int main(int argc, char ** argv)
 	freeKernels = maxKernels;
 	busyKernels= 0;	   
 	//--
-
+	getEnv_(PATH,"PATH");
+	getEnv_(LD_LIBRARY_PATH,"LD_LIBRARY_PATH");
+    //--
+    ("PATH="+PATH).println();
+    ("LD_LIBRARY_PATH="+LD_LIBRARY_PATH).println();
+    //--
 #if __cplusplus >= 201703L
 	std::filesystem::current_path(packageWorkspace.getCharArray());
 #else
 	chdir(packageWorkspace.getCharArray());
 #endif
-
-#if DEB
 	userWorkspace.println();
 	packageWorkspace.println();
 	printf("%d\n", maxKernels);
-#endif
 
 #ifndef _WIN32	
 	int pid = getpid();
@@ -120,29 +130,17 @@ int main(int argc, char ** argv)
 	int pid = _getpid();
 #endif
 
-#if DEB
 	printf("PID=%d\n", pid);
-#endif
 	File pidFile("PID", String(pid)+"\n");
 	pidFile.Close();
 	//---
 	File startFile("STARTED", "+");
     startFile.Close();
     //---
-#if DEB
 	printf(">>>>\n");
-#endif
 	CompilationSupervisor * compilationSupervisor = new CompilationSupervisor();
-#if DEB
-	printf("%ld\n", compilationSupervisor->getLength());   
-#endif
 	compilationSupervisor->DoWithSchedule(maxKernels);
-	   
-	RunSupervisor * runSupervisor = new RunSupervisor(compilationSupervisor);   
-#if DEB
-	printf("%ld\n", runSupervisor->getLength());
-	runSupervisor->print();
-#endif
+	RunSupervisor * runSupervisor = new RunSupervisor(compilationSupervisor);
 	runSupervisor->DoWithSchedule(maxKernels);  
 	return 0;      
 }      
diff --git a/src/files/version.h b/src/files/version.h
index ca7bf83a..3f10ffe7 100644
--- a/src/files/version.h
+++ b/src/files/version.h
@@ -1 +1 @@
-13
\ No newline at end of file
+15
\ No newline at end of file