Fixes for oar, with the new DCT structure

Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

zUtil_OAR/OAR_make.m

@@ -138,7 +138,7 @@ out.odisp(app)
 %split executable path
 [~, fname, ~] = fileparts(executable);
 %split tempname path
-[~, tempfilename] = fileparts(tempname);
+[~, tempfilename] = fileparts(tempname()); % This is actually a matlab function
 
 %% Setting log dir and log file names
 

zUtil_OAR/make_oar_matlab.m

@@ -23,9 +23,9 @@ function script_location = make_oar_matlab(pathdir, tmpdir, tmpname, oarpars)
             && isfield(xmlConf.general, 'libraries') ...
             && isfield(xmlConf.general.libraries, 'path'))
         numPaths = numel(xmlConf.general.libraries.path);
-        externalLibs = cell(numPaths, 1);
+        externalLibs = cell(1, numPaths);
         for n = 1:numPaths
-            externalLibs{n} = [exportLibary xmlConf.astra.mex.path{n} '"'];
+            externalLibs{n} = [exportLibary xmlConf.general.libraries.path{n} '"'];
         end
     else
         externalLibs = {};
@@ -45,13 +45,13 @@ function script_location = make_oar_matlab(pathdir, tmpdir, tmpname, oarpars)
         ['#OAR --name ' oarpars.name], ...
         '#OAR --project graintracking' };
     libraries = [ externalLibs, ...
-        ... % To make compiled functions visible
-        [exportPath fullfile(GT_MATLAB_HOME, 'bin', 'compiled', getenv('CPU')) '"'], ...
         ... % On linux systems it is surely required, but on windows the path could be different
         [exportLibary fullfile(matlabroot, 'runtime', 'glnxa64') '"'], ...
         [exportLibary fullfile(matlabroot, 'bin', 'glnxa64') '"'], ...
         [exportLibary fullfile(matlabroot, 'sys', 'os', 'glnxa64') '"'], ...
-        [exportLibary fullfile(matlabroot, 'sys', 'java', 'jre', 'glnxa64', 'jre', 'lib', 'amd64', 'server') '"'] ];
+        [exportLibary fullfile(matlabroot, 'sys', 'java', 'jre', 'glnxa64', 'jre', 'lib', 'amd64', 'server') '"'], ...
+        ... % To make compiled functions visible
+        [exportPath fullfile(GT_MATLAB_HOME, 'bin', 'compiled', getenv('HOSTTYPE')) '"'] ];
     script_content = [ header, '', libraries, '', '"$@"' ];
     script_content(2, :) = {sprintf('\n')};