Revoked support for windows and other comments

Author: nbhoski

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

@@ -188,16 +188,19 @@ public void setUp(Context context, Run<?, ?> build, FilePath workspace, Launcher
         // Set Environment variable
         setEnv(initialEnvironment);
 
-        FilePath matlabExecutablePath = new FilePath(launcher.getChannel(),
-                getNodeSpecificMatlab(Computer.currentComputer(), listener) + getNodeSpecificExecutable(launcher));
+        String nodeSpecificMatlab = getNodeSpecificMatlab(Computer.currentComputer(), listener) + getNodeSpecificExecutable(launcher);
+        FilePath matlabExecutablePath = new FilePath(launcher.getChannel(), nodeSpecificMatlab);
 
         if (!matlabExecutablePath.exists()) {
             throw new MatlabNotFoundError(Message.getValue("matlab.not.found.error"));
         }
         // Add matlab-batch executable in path
-        context.env("PATH+matlab_batch", matlabExecutablePath.getParent().getParent().getRemote());
+        if(getNthParentFilePath(matlabExecutablePath, 3).exists () || getNthParentFilePath(matlabExecutablePath,3 ) != null){
+            context.env("PATH+matlab_batch", matlabExecutablePath.getParent ().getParent ().getParent().getRemote ());
+        }
+
         // Add "matlabroot" without bin as env variable which will be available across the build.
-        context.env("matlabroot", getNodeSpecificMatlab(Computer.currentComputer(), listener));
+        context.env("matlabroot", nodeSpecificMatlab);
         // Add matlab bin to path to invoke MATLAB directly on command line.
         context.env("PATH+matlabroot", matlabExecutablePath.getParent().getRemote());;
         listener.getLogger().println("\n" + String.format(Message.getValue("matlab.added.to.path.from"), matlabExecutablePath.getParent().getRemote()) + "\n");
@@ -206,4 +209,20 @@ public void setUp(Context context, Run<?, ?> build, FilePath workspace, Launcher
     private String getNodeSpecificExecutable(Launcher launcher) {
         return (launcher.isUnix()) ? "/bin/matlab" : "\\bin\\matlab.exe";
     }
+
+    public static FilePath getNthParentFilePath (FilePath path, int levels) {
+        if (path == null || levels < 0) {
+            return null;
+        }
+
+        FilePath currentPath = path;
+        for (int i = 0; i < levels; i++) {
+            if (currentPath == null) {
+                return null;
+            }
+            currentPath = currentPath.getParent ();
+        }
+        return currentPath;
+    }
+
 }

src/main/java/com/mathworks/ci/tools/MatlabInstaller.java

@@ -76,15 +76,17 @@ public void setProducts (String products) {
     @Override
     public FilePath performInstallation (ToolInstallation tool, Node node, TaskListener log)
         throws IOException, InterruptedException {
-        FilePath expectedPath = preferredLocation (tool, node);
+        FilePath supportingExecutable = preferredLocation (tool, node);
+        FilePath expectedPath = new FilePath (supportingExecutable, this.getVersion ());
         MatlabInstallable installable;
         try {
             installable = (MatlabInstallable) getInstallable (node);
         } catch (Exception e) {
             throw new InstallationFailedException (e.getMessage ());
         }
 
-        getFreshCopyOfExecutables (installable, expectedPath);
+        getFreshCopyOfExecutables (installable, supportingExecutable);
+        makeDir (expectedPath);
 
         FilePath versionInfo = new FilePath (expectedPath,"VersionInfo.xml");
         FilePath installedProducts = new FilePath (expectedPath,"installed_matlab_product_list.txt");
@@ -109,7 +111,7 @@ private int installUsingMpm (Node node, FilePath destination, TaskListener log,
         ProcStarter installerProc = matlabInstaller.launch ();
 
         ArgumentListBuilder args = new ArgumentListBuilder ();
-        args.add (destination.getRemote () + getNodeSpecificMPMExecutor (node));
+        args.add (destination.getParent ().getRemote () + getNodeSpecificMPMExecutor (node));
         args.add ("install");
         appendReleaseToArguments (args, log);
         args.add ("--destination=" + destination.getRemote ());
@@ -119,12 +121,19 @@ private int installUsingMpm (Node node, FilePath destination, TaskListener log,
         try {
             result = installerProc.join ();
         } catch (Exception e) {
-            log.getLogger ().println ("MATLAB installation failed" + e.getMessage ());
+            log.getLogger ().println ("MATLAB installation failed " + e.getMessage ());
             throw new InstallationFailedException (e.getMessage ());
         }
         return result;
     }
 
+    private void makeDir(FilePath path) throws IOException, InterruptedException {
+        if(!path.exists ()){
+            path.mkdirs ();
+            path.chmod (0777);
+        }
+    }
+
     private boolean isSameProduct (FilePath installedProducts)
         throws IOException, InterruptedException {
         if (installedProducts.exists ()) {
@@ -250,6 +259,9 @@ public Installable getInstallable (Node node) throws IOException, InterruptedExc
         // Gather properties for the node to install on
         String[] properties = node.getChannel ()
             .call (new GetSystemProperties ("os.name", "os.arch", "os.version"));
+        if(properties[0].contains ("win")) {
+            throw new InstallationFailedException ("Unsupported OS");
+        }
         return getInstallCandidate (properties[0], properties[1]);
     }