Merge pull request #82 from Locutus18/refactor

Moved the project subshell initialization values from CcConfiguration

Author: dkrupp

eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin/src/cc/codechecker/plugin/config/CcConfiguration.java

@@ -64,43 +64,18 @@ public CcConfiguration(IProject project) {
         }
     }
 
-    public void modifyProjectEnvironmentVariables(final IProject project, final File dir, final String location) {
+    public void modifyProjectEnvironmentVariables(final IProject project, final Map<String, String> environmentAdd) {
         IContributedEnvironment ice = CCorePlugin.getDefault().getBuildEnvironmentManager()
                 .getContributedEnvironment();
         ICProjectDescription prjd = CoreModel.getDefault().getProjectDescription(project, true);
         ICConfigurationDescription cfgd = prjd.getActiveConfiguration();
-        boolean pythonEnvPresent;
-        if(getGlobal()) {
-            pythonEnvPresent = getGlobalPythonEnv().isPresent();
-        } else {
-            pythonEnvPresent = getProjectPythonEnv().isPresent();
-        }
-        Map<String, String> environmentAdd = new HashMap<String, String>(){{
-            put("LD_LIBRARY_PATH", location + "/ld_logger/lib");
-            put("_", location + "/bin/CodeChecker");
-            put("CC_LOGGER_GCC_LIKE", "gcc:g++:clang:cc:c++");
-            put("LD_PRELOAD","ldlogger.so");
-            put("CC_LOGGER_FILE", dir.toString() + "/" + project.getName() + "/compilation_commands.json.javarunner");
-            put("CC_LOGGER_BIN", location + "/bin/ldlogger");
-        }};
-        if(pythonEnvPresent) {
-            String pythonEnvironment;
-            if(getGlobal()) {
-                pythonEnvironment = getGlobalPythonEnv().get();
-            } else {
-                pythonEnvironment = getProjectPythonEnv().get();
-            }
-            environmentAdd.put("PATH", pythonEnvironment + "/bin:");
-            environmentAdd.put("VIRTUAL_ENV", pythonEnvironment);
-        }
         for(String key : environmentAdd.keySet()) {
             if(key.equals("PATH")) {
                 ice.addVariable(key, environmentAdd.get(key), IEnvironmentVariable.ENVVAR_PREPEND,"", cfgd);
             } else {
                 ice.addVariable(key, environmentAdd.get(key), IEnvironmentVariable.ENVVAR_REPLACE,"", cfgd);
             }
         }
-
         try {
             CoreModel.getDefault().setProjectDescription(project, prjd);
         } catch (CoreException e) {
@@ -251,7 +226,7 @@ public void updateServer(IProject project, CodecheckerServerThread server) {
 
             server.setCodecheckerEnvironment(ccec);
 
-            modifyProjectEnvironmentVariables(project, dir, location);
+            modifyProjectEnvironmentVariables(project, ccec.environmentAddList);
             ConsoleFactory.consoleWrite(project.getName() + ": Started server for project (port: "+ server.serverPort + ")");
         } catch (Exception e) {
             ConsoleFactory.consoleWrite(project.getName() + ": Failed to start server");

eclipse-plugin/eclipse/cc.codechecker.eclipse.plugin/src/cc/codechecker/plugin/config/CodeCheckerContext.java

@@ -182,7 +182,7 @@ public synchronized CodecheckerServerThread getServerObject(final IProject proje
 
                 @Override
                 public void built() {
-                    cleanCache(project);
+                    cleanCache();
                     Display.getDefault().asyncExec(new Runnable() {
                         @Override
                         public void run() {
@@ -200,10 +200,8 @@ public void run() {
 
     /**
      * Clean cache.
-     *
-     * @param project the project, the user change his/her view to
      */
-    public void cleanCache(IProject project) {
+    public void cleanCache() {
         jobRunner.getActionCacheFilter().removeAll();
         logger.log(Level.DEBUG, "SERVER_GUI_MSG >> CLEARING CACHE");
     }

eclipse-plugin/service/cc.codechecker.service.api/src/main/java/cc/codechecker/api/runtime/CodeCheckEnvironmentChecker.java

@@ -1,7 +1,6 @@
 package cc.codechecker.api.runtime;
 
 import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
 import org.apache.log4j.Logger;
@@ -10,6 +9,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 import java.lang.Math;
 
@@ -27,8 +28,10 @@ public class CodeCheckEnvironmentChecker {
     // can be used to run CodeChecker
     public final ImmutableMap<String, String> environmentDuringChecks; // this can be added to
 
-    public CodeCheckEnvironmentChecker(Optional<String> pythonEnvironment,
-            String codeCheckerParameter, String workspaceName, String checkerCommand) {
+    public Map<String, String> environmentAddList;
+
+    public CodeCheckEnvironmentChecker(Optional<String> pythonEnvironment, final String codeCheckerParameter,
+            final String workspaceName, String checkerCommand) {
         this.pythonEnvironment = pythonEnvironment;
         this.codeCheckerParameter = codeCheckerParameter;
         this.workspaceName = workspaceName;
@@ -39,6 +42,21 @@ public CodeCheckEnvironmentChecker(Optional<String> pythonEnvironment,
 
         environmentDuringChecks = modifyLogfileName(getCheckerEnvironment(environmentBefore,
                 codeCheckerCommand, workspaceName));
+
+        environmentAddList = new HashMap<String, String>(){{
+            put("LD_LIBRARY_PATH", codeCheckerParameter + "/ld_logger/lib");
+            put("_", codeCheckerParameter + "/bin/CodeChecker");
+            put("CC_LOGGER_GCC_LIKE", "gcc:g++:clang:clang++:cc:c++");
+            put("LD_PRELOAD","ldlogger.so");
+            put("CC_LOGGER_FILE", workspaceName + "/compilation_commands.json.javarunner");
+            put("CC_LOGGER_BIN", codeCheckerParameter + "/bin/ldlogger");
+        }};
+
+        if(pythonEnvironment.isPresent()) {
+            String pythonEnv = pythonEnvironment.get();
+            environmentAddList.put("PATH", pythonEnv + "/bin:");
+            environmentAddList.put("VIRTUAL_ENV", pythonEnv);
+        }
     }
 
     private static ImmutableMap<String, String> getCheckerEnvironment(
@@ -116,7 +134,7 @@ public void setCheckerCommand(String checkerCommand) {
     }
 
     public String getLogFileLocation() {
-        return environmentDuringChecks.get("CC_LOGGER_FILE"); // hackis ...
+        return workspaceName + "/compilation_commands.json.javarunner";
     }
 
     // renames the logfile, to avoid concurrency issues