Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added check if Matlab installed before running powershell commands that rely on its installation. #141

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion BuildTestRelease.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ $mccl_version = "7.3.0"
$matlab_version = "10.0.0"

Invoke-Expression ".\BuildTestReleaseMCCL.ps1 $mccl_version"
Invoke-Expression ".\BuildTestReleaseMATLAB.ps1 $matlab_version"
# only run if matlab installed
if (Get-Command "matlab" -ErrorAction SilentlyContinue)
{
Invoke-Expression ".\BuildTestReleaseMATLAB.ps1 $matlab_version"
}

Read-Host -Prompt "Press Enter to exit"
8 changes: 6 additions & 2 deletions BuildTestReleaseMCCL.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,12 @@ New-Item $MCmatlabdir -ItemType "directory"
$MCresults = "$vtslevel\publish\local\one_layer_all_detectors\*"
Copy-Item -Path $MCresults -Destination $MCmatlabdir -Recurse -ErrorAction Ignore

# run load_results_script (default datanames is set to one_layer_all_detectors)
matlab -wait -r "load_results_script; quit"
# only run following commands if matlab installed
if (Get-Command "matlab" -ErrorAction SilentlyContinue)
{
# run load_results_script (default datanames is set to one_layer_all_detectors)
matlab -wait -r "load_results_script; quit"
}

#cleanup one_layer_all_detectors folder
Remove-Item $MCmatlabdir -Recurse -ErrorAction Ignore
Expand Down
Loading