do_download function improved to be compatible with future releases of MATLAB

The internal functions definitions of the coder.internal.ModelCodegenMgr
class are still chaging, so it should be really better to use rtwprivate
for data access.

diff --git a/rpp/rpp/rpp_make_rtw_hook.m b/rpp/rpp/rpp_make_rtw_hook.m
index 4e8ebf796a1e8f877e37e4f01dde63fd53ed5dbf..e027495e308d37e444268ea1775cb84088e91e0e 100644 (file)
--- a/rpp/rpp/rpp_make_rtw_hook.m
+++ b/rpp/rpp/rpp_make_rtw_hook.m
@@ -118,17 +118,17 @@ end
 
 
 function rpp_do_download(modelName)
-
     if verLessThan('matlab', '8.1')
         makertwObj = get_param(gcs, 'MakeRTWSettingsObject');
-    else
-        % TODO use rtwprivate('get_makertwsettings', gcs, 'BuildInfo') - see
-        % R2013a Simulink Coder release notes.
-        makertwObj = coder.internal.ModelCodegenMgr.getInstance();
+               makertwBuildDirectory = makertwObj.BuildDirectory;
+               makertwArgs = makertwObj.BuildInfo.BuildArgs;
+       else
+               makertwObj = rtwprivate('get_makertwsettings', gcs, 'BuildInfo');
+               makertwBuildDirectory = rtwprivate('get_makertwsettings', gcs, 'BuildDirectory');
+               makertwArgs = makertwObj.BuildArgs;
     end
 
     % Check if user choose to Download to RPP board in Settings
-    makertwArgs = makertwObj.BuildInfo.BuildArgs;
     download = 0;
        use_openocd = 0;
        use_sdram = 0;
@@ -146,7 +146,7 @@ function rpp_do_download(modelName)
         if getenv('RPP_NO_DOWNLOAD')
             disp(['RPP_NO_DOWNLOAD defined - skipping downloading to target.'])
         else
-               rpp_download(modelName, makertwObj.BuildDirectory, use_openocd, use_sdram);
+               rpp_download(modelName, makertwBuildDirectory, use_openocd, use_sdram);
         end
     end