Revert "Added version finding capability with Contents file."

This reverts commit 80cb0cd.

Author: nbhoski

src/main/java/com/mathworks/ci/MatlabBuilder.java

@@ -53,7 +53,7 @@ public class MatlabBuilder extends Builder implements SimpleBuildStep {
     private TestRunTypeList testRunTypeList;
     private String matlabRoot;
     private EnvVars env;
-    private MatlabReleaseInfo matlabRel;
+    private FilePath nodeSpecificMatlabRoot;
     private String nodeSpecificfileSeparator;
 
     @DataBoundConstructor
@@ -478,10 +478,7 @@ public void perform(@Nonnull Run<?, ?> build, @Nonnull FilePath workspace,
             throws InterruptedException, IOException {        
         //Set the environment variable specific to the this build
         setEnv(build.getEnvironment(listener));
-        
-        // Get node specific matlabroot to get MATLAB version information 
-        FilePath nodeSpecificMatlabRoot = new FilePath(launcher.getChannel(),getLocalMatlab());
-        matlabRel = new MatlabReleaseInfo(nodeSpecificMatlabRoot);
+        nodeSpecificMatlabRoot = new FilePath(launcher.getChannel(),getLocalMatlab());
         nodeSpecificfileSeparator = getNodeSpecificFileSeperator(launcher);
 
         // Invoke MATLAB command and transfer output to standard
@@ -499,8 +496,9 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
             throws IOException, InterruptedException {
         ProcStarter matlabLauncher;
         try {
+            MatlabReleaseInfo rel = new MatlabReleaseInfo(this.nodeSpecificMatlabRoot);
             matlabLauncher = launcher.launch().pwd(workspace).envs(this.env);
-            if (matlabRel.verLessThan(MatlabBuilderConstants.BASE_MATLAB_VERSION_BATCH_SUPPORT)) {
+            if (rel.verLessThan(MatlabBuilderConstants.BASE_MATLAB_VERSION_BATCH_SUPPORT)) {
                 ListenerLogDecorator outStream = new ListenerLogDecorator(listener);
                 matlabLauncher = matlabLauncher.cmds(constructDefaultMatlabCommand(launcher.isUnix())).stderr(outStream);
             } else {
@@ -562,7 +560,8 @@ private String[] getPreRunnerSwitches() throws MatlabVersionNotFoundException {
         String[] preRunnerSwitches =
                 {getLocalMatlab() + nodeSpecificfileSeparator + "bin" + nodeSpecificfileSeparator + "matlab", "-nosplash",
                         "-nodesktop"};
-        if(!matlabRel.verLessThan(MatlabBuilderConstants.BASE_MATLAB_VERSION_NO_APP_ICON_SUPPORT)) {
+        MatlabReleaseInfo rel = new MatlabReleaseInfo(this.nodeSpecificMatlabRoot);
+        if(!rel.verLessThan(MatlabBuilderConstants.BASE_MATLAB_VERSION_NO_APP_ICON_SUPPORT)) {
         	preRunnerSwitches =  (String[]) ArrayUtils.add(preRunnerSwitches, "-noAppIcon");
         } 
         return preRunnerSwitches;

src/main/java/com/mathworks/ci/MatlabReleaseInfo.java

@@ -6,18 +6,10 @@
  */
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
 import java.nio.file.NotDirectoryException;
-import java.nio.file.Paths;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.apache.commons.collections.MapUtils;
@@ -34,8 +26,6 @@
 public class MatlabReleaseInfo {
     private FilePath matlabRoot;
     private static final String VERSION_INFO_FILE = "VersionInfo.xml";
-    private static final String CONTENTS_FILE = "Contents.m";
-    private static final String VERSION_PATTERN = "(\\d+)\\.(\\d+)";
     private static final String VERSION_INFO_ROOT_TAG = "MathWorks_version_info";
     private static final String RELEASE_TAG = "release";
     private static final String VERSION_TAG = "version";
@@ -117,18 +107,7 @@ private Map<String, String> getVersionInfoFromFile() throws MatlabVersionNotFoun
                 else if(!this.matlabRoot.exists()){
                     throw new NotDirectoryException("Invalid matlabroot path");
                 }else {
-                	// Get the version information from Contents.m file
-                	String versionLine = this.matlabRoot.act(new ContentsVersion());
-                	
-                	// Setting actual version to default R2016b 
-                	String actualVersion = VERSION_16B;
-                	Pattern p = Pattern.compile(VERSION_PATTERN);
-                	Matcher m = p.matcher(versionLine);
-                	if(m.find()) {
-                		actualVersion = m.group();
-                	}
-                	// Update the versionInfoCache with actual version extracted from Contents.m file
-                	versionInfoCache.put(VERSION_TAG, actualVersion);
+                    versionInfoCache.putAll(VERSION_OLDER_THAN_17A);
                 }
 
             } catch (Exception e) {
@@ -139,22 +118,3 @@ else if(!this.matlabRoot.exists()){
         return versionInfoCache;
     }
  }
-
-//Below piece of code will be executed on the specific node in case of job is running on remote agent.
-final class ContentsVersion implements FileCallable<String> {
-    private static final long serialVersionUID = 1;
-    
-    // File path of Contents.m on specific node
-    private static String CONTENTS_FILE = "toolbox" + File.separator + "matlab" + File.separator + "general" + File.separator + "Contents.m";
-    @Override 
-    public String invoke(File f, VirtualChannel channel) throws IOException, InterruptedException {
-    	List<String> line = Files.readAllLines(Paths.get(f.getPath() + File.separator + CONTENTS_FILE));
-    	// Get second line from Contents.m file
-        return line.get(1);
-    }
-	@Override
-	public void checkRoles(RoleChecker checker) throws SecurityException {
-		// No Roles to check 
-		
-	}
-}