buildtool mex works for R2022b and later

Author: scivision

.github/workflows/composite-buildtool/action.yml

@@ -13,22 +13,15 @@ runs:
       startup-options: ${{ matrix.startup-options }}
       tasks: check
 
-  - name: Legacy Mex Test
-    if: ${{ matrix.release >= 'R2022b' && matrix.release < 'R2024b' }}
-    uses: matlab-actions/run-build@v2
-    with:
-      startup-options: ${{ matrix.startup-options }}
-      tasks: legacyMex test
-
   - name: Non-Mex Test
     if: ${{ matrix.release >= 'R2024b' || startsWith(matrix.release, 'latest') }}
     uses: matlab-actions/run-build@v2
     with:
       startup-options: ${{ matrix.startup-options }}
       tasks: test
 
-  - name: Mex Group Test
-    if: ${{ matrix.release >= 'R2024b' || startsWith(matrix.release, 'latest') }}
+  - name: Mex Test
+    if: ${{ matrix.release >= 'R2022b' || startsWith(matrix.release, 'latest') }}
     uses: matlab-actions/run-build@v2
     with:
       startup-options: ${{ matrix.startup-options }}

Readme.md

@@ -27,17 +27,13 @@ Functions requiring or optionally benefiting from MEX are indicated in the
 
 To build the optional high-performance
 [MEX](https://www.mathworks.com/help/matlab/cpp-mex-file-applications.html)
-functions:
+functions from the Matlab prompt:
 
 ```matlab
 buildtool mex
 ```
 
-or for older Matlab:
-
-```matlab
-legacy_mex_build()
-```
+For Matlab R2022a and older, instead do: `legacy_mex_build()`
 
 If just building MEX functions for the first time, to ensure the MEX functions are used instead of the plain Matlab script, one-time do a `clear all` in Matlab.
 

buildfile.m

@@ -5,12 +5,19 @@
 
 pkg_name = "+stdlib";
 
-if ~isMATLABReleaseOlderThan("R2023b")
+addpath(plan.RootFolder)
+
+if isMATLABReleaseOlderThan("R2023b")
+  plan("test") = matlab.buildtool.Task(Actions=@legacyTestTask);
+else
   plan("check") = matlab.buildtool.tasks.CodeIssuesTask(pkg_name, IncludeSubfolders=true);
+  plan("test") = matlab.buildtool.tasks.TestTask("test", Strict=true);
 end
 
-if ~isMATLABReleaseOlderThan("R2024b")
 
+if isMATLABReleaseOlderThan("R2024b")
+  plan("mex") = matlab.buildtool.Task(Actions=@legacyMexTask);
+else
   plan("clean") = matlab.buildtool.tasks.CleanTask;
 
   [compiler_id, compiler_opt] = get_compiler_options();
@@ -33,41 +40,29 @@
 
 
 function legacyMexTask(context)
-
-pkg_name = "+stdlib";
-
-legacy_mex_build(context.Plan.RootFolder, fullfile(context.Plan.RootFolder, pkg_name))
-
+legacy_mex_build(context.Plan.RootFolder, fullfile(context.Plan.RootFolder, "+stdlib"))
 end
 
 
-function testTask(context)
+function legacyTestTask(context)
+r = runtests(fullfile(context.Plan.RootFolder, "test"), Strict=true);
+% Parallel Computing Toolbox takes more time to startup than is worth it for this task
 
-  addpath(context.Plan.RootFolder)
-
-  r = runtests("test", ...
-    IncludeSubfolders=true, ...
-    strict=true, ...
-    UseParallel=false);
-  % Parallel Computing Toolbox takes more time to startup than is worth it for this task
-
-  assert(~isempty(r), "No tests were run")
-  assertSuccess(r)
+assert(~isempty(r), "No tests were run")
+assertSuccess(r)
 end
 
 
 function coverageTask(context)
-
-  coverage_run("stdlib", fullfile(context.Plan.RootFolder, "test"))
+coverage_run("stdlib", fullfile(context.Plan.RootFolder, "test"))
 end
 
 
 function publishTask(context)
+outdir = fullfile(context.Plan.RootFolder, "docs");
 
-  outdir = fullfile(context.Plan.RootFolder, "docs");
-
-  publish_gen_index_html("stdlib", ...
-    "A standard library of functions for Matlab.", ...
-    "https://github.com/geospace-code/matlab-stdlib", ...
-    outdir)
+publish_gen_index_html("stdlib", ...
+  "A standard library of functions for Matlab.", ...
+  "https://github.com/geospace-code/matlab-stdlib", ...
+  outdir)
 end