Version check for noAppIcon startup option.

Author: nbhoski

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

@@ -21,6 +21,7 @@
 import java.util.function.Function;
 import javax.annotation.Nonnull;
 import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang.ArrayUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
@@ -52,6 +53,7 @@ public class MatlabBuilder extends Builder implements SimpleBuildStep {
     private TestRunTypeList testRunTypeList;
     private String matlabRoot;
     private EnvVars env;
+    private FilePath nodeSpecificMatlabRoot;
     private String nodeSpecificfileSeparator;
 
     @DataBoundConstructor
@@ -476,6 +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));
+        nodeSpecificMatlabRoot = new FilePath(launcher.getChannel(),getLocalMatlab());
         nodeSpecificfileSeparator = getNodeSpecificFileSeperator(launcher);
 
         // Invoke MATLAB command and transfer output to standard
@@ -493,8 +496,7 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
             throws IOException, InterruptedException {
         ProcStarter matlabLauncher;
         try {
-            FilePath nodeSpecificMatlabRoot = new FilePath(launcher.getChannel(),getLocalMatlab());
-            MatlabReleaseInfo rel = new MatlabReleaseInfo(nodeSpecificMatlabRoot);
+            MatlabReleaseInfo rel = new MatlabReleaseInfo(this.nodeSpecificMatlabRoot);
             matlabLauncher = launcher.launch().pwd(workspace).envs(this.env);
             if (rel.verLessThan(MatlabBuilderConstants.BASE_MATLAB_VERSION_BATCH_SUPPORT)) {
                 ListenerLogDecorator outStream = new ListenerLogDecorator(listener);
@@ -539,7 +541,7 @@ public List<String> constructMatlabCommandWithBatch() {
         return matlabDefaultArgs;
     }
 
-    public List<String> constructDefaultMatlabCommand(boolean isLinuxLauncher) {
+    public List<String> constructDefaultMatlabCommand(boolean isLinuxLauncher) throws MatlabVersionNotFoundException {
         final List<String> matlabDefaultArgs = new ArrayList<String>();
         Collections.addAll(matlabDefaultArgs, getPreRunnerSwitches());
         if (!isLinuxLauncher) {
@@ -554,10 +556,14 @@ public List<String> constructDefaultMatlabCommand(boolean isLinuxLauncher) {
     }
 
 
-    private String[] getPreRunnerSwitches() {
+    private String[] getPreRunnerSwitches() throws MatlabVersionNotFoundException {
         String[] preRunnerSwitches =
                 {getLocalMatlab() + nodeSpecificfileSeparator + "bin" + nodeSpecificfileSeparator + "matlab", "-nosplash",
-                        "-nodesktop", "-noAppIcon"};
+                        "-nodesktop"};
+        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/MatlabBuilderConstants.java

@@ -5,6 +5,7 @@
 
 public class MatlabBuilderConstants {
     static final double BASE_MATLAB_VERSION_RUNTESTS_SUPPORT = 8.1;
+    static final double BASE_MATLAB_VERSION_NO_APP_ICON_SUPPORT = 8.6;
     static final double BASE_MATLAB_VERSION_BATCH_SUPPORT = 9.5;
     static final double BASE_MATLAB_VERSION_COBERTURA_SUPPORT = 9.3;
     static final double BASE_MATLAB_VERSION_MODELCOVERAGE_SUPPORT = 9.5;