Changeset 923 for trunk/src

Timestamp:

Jan 15, 2016, 11:02:37 AM (9 years ago)

Author:

g7moreau

Message:

• Update MCRROOT variable with mcrversion matlab function

Location:

trunk/src

Files:

• compile.m (modified) (1 diff)
• series.m (modified) (1 diff)

trunk/src/compile.m

@@ -43 +43 @@
     SubfctPath=['-I ' SubfctPath];%string indicating the option of including the path SubfctPath
 end
-hver=ver('MATLAB');
-FctNameVersion=[FctName '_MCRROOT' regexprep(hver.Version,'\.','')];%suppress the dot in version number
+[mcrmajor, mcrminor] = mcrversion;   
+MCRROOT = ['MCRROOT',int2str(mcrmajor),int2str(mcrminor)];
+FctNameVersion=[FctName,'_',MCRROOT];
+%hver=ver('MATLAB');
+%FctNameVersion=[FctName '_MCRROOT' regexprep(hver.Version,'\.','')];%suppress the dot in version number
 try
     disp(['mcc -m -R -nojvm -R -nodisplay -R -singleCompThread ' SubfctPath ' ' FctName '.m'])

trunk/src/series.m

@@ -1510 +1510 @@
     set(handles.series,'Pointer','watch') % set the mouse pointer to 'watch'
     set(handles.ActionExt,'BackgroundColor',[1 1 0])
-    hver=ver('MATLAB');
-    MCRROOT=['MCRROOT' regexprep(hver.Version,'\.','')];%suppress the dot in version number
+    [mcrmajor, mcrminor] = mcrversion;   
+    MCRROOT = ['MCRROOT',int2str(mcrmajor),int2str(mcrminor)];
+    %hver=ver('MATLAB');
+    %MCRROOT=['MCRROOT' regexprep(hver.Version,'\.','')];%suppress the dot in version number
     RunTime = getenv(MCRROOT);
     ActionNameVersion=[ActionName '_' MCRROOT];