diff --git a/src/@x13/run.m b/src/@x13/run.m index 73faa7a2d0ddde93cc36af0e6ebe645c782d9b7a..4692c3b104b953d24350d821767928a67cdcee43 100644 --- a/src/@x13/run.m +++ b/src/@x13/run.m @@ -22,8 +22,16 @@ function run(o, basename) % Print spc file. basename = o.print(); +% Get expected path to X13 binary. +x13b = select_x13_binary(); + +% Test for the existence of the binary. +if ~exist(x13b, 'file') + error('X13 is not available, so we cannot run the generated spc file.') +end + % Run spc file. -[~, ~] = system(sprintf('%s %s', select_x13_binary(), basename)); +[~, ~] = system(sprintf('%s %s', x13b, basename)); o.results.name = basename; % Base name of the generated files. diff --git a/src/initialize_dseries_toolbox.m b/src/initialize_dseries_toolbox.m index 00e6b5bb2686ba5cad41ec3d219045d7531019d0..a8cbe15aab02781f7a672bad85a9c471e57cca6b 100644 --- a/src/initialize_dseries_toolbox.m +++ b/src/initialize_dseries_toolbox.m @@ -78,8 +78,13 @@ end % Install X13 binaries opath = pwd(); -cd([dseries_src_root '/../externals/x13']) -installx13(); +try + cd([dseries_src_root '/../externals/x13']) + installx13(); +catch + warning('X13 is not available!') + p(strmatch('/utilities/x13', p, 'exact')) = []; +end cd(opath); % Set path diff --git a/src/utilities/x13/select_x13_binary.m b/src/utilities/x13/select_x13_binary.m index f7c3873787b9ac923f204b1f55205c361596c54a..0ade22f45951660b539b4c7c2440766197ade98c 100644 --- a/src/utilities/x13/select_x13_binary.m +++ b/src/utilities/x13/select_x13_binary.m @@ -40,5 +40,5 @@ elseif ispc() x13_binary = sprintf('%s%s%s%s', x13_binary, '32', filesep(), 'x13.exe'); end else - error('X13 binary is not yet available for this plateform') + error('X13 binary is not available for this plateform') end \ No newline at end of file