Compilation: changed bin directory to just bin/compiled/

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

zUtil_OAR/gt_mcc.m

@@ -33,12 +33,7 @@ function compiled_fine = gt_mcc(myfunctionname, varargin)
     conf = parse_pv_pairs(conf, varargin);
 
     if (isempty(conf.out_path))
-        if (isunix())
-            cpu = getenv('HOSTTYPE');
-        else
-            cpu = computer('arch');
-        end
-        path_for_binaries = fullfile(GT_MATLAB_HOME, 'bin', 'compiled',  cpu);
+        path_for_binaries = fullfile(GT_MATLAB_HOME, 'bin', 'compiled');
     else
         path_for_binaries = conf.out_path;
     end

zUtil_OAR/make_oar_matlab.m

@@ -51,7 +51,7 @@ function script_location = make_oar_matlab(pathdir, tmpdir, tmpname, oarpars)
         [exportLibary fullfile(matlabroot, 'sys', 'os', 'glnxa64') '"'], ...
         [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')) '"'] ];
+        [exportPath fullfile(GT_MATLAB_HOME, 'bin', 'compiled') '"'] ];
     script_content = [ header, '', libraries, '', '"$@"' ];
     script_content(2, :) = {sprintf('\n')};
 

zUtil_Python/dct_compile_matlab_functions.py

@@ -73,7 +73,7 @@ class FunctionsBuilder(object):
         if script_dir is None:
             script_dir = os.path.join(self.dct_dir, 'bin', 'scripts')
         if bin_dir is None:
-            bin_dir = os.path.join(self.dct_dir, 'bin', 'compiled', os.getenv('HOSTTYPE'))
+            bin_dir = os.path.join(self.dct_dir, 'bin', 'compiled')
 
         self.script_dir = script_dir
         self.bin_dir = bin_dir