fixing load order for dependencies in ATOMS 20/8920/3
Simon GARESTE [Mon, 3 Sep 2012 15:18:36 +0000 (17:18 +0200)]
Change-Id: Ia45831b59d84481aa8fcc31ccc20a1e79ff75de2

scilab/CHANGES_5.4.X
scilab/modules/atoms/macros/atomsLoad.sci
scilab/modules/atoms/tests/unit_tests/atomsIsLoaded.dia.ref

index 5399a0f..5c9fa5a 100644 (file)
@@ -1017,6 +1017,8 @@ ATOMS
 
 * ATOMS option 'offLine' has been renamed to 'offline'.
 
+* Bug #8302 fixed - wrong order when loading dependencies
+
 * Bug #9078 fixed - atomsGui took time to start gui.
 
 * Bug #9798 fixed - .quit script of Atoms modules were not evaluated at Scilab quit.
index cddd39b..6f6e60c 100644 (file)
@@ -300,8 +300,7 @@ function result = atomsLoad(packages)
 
             mandatory_packages(childs(j,1)+" - "+childs(j,2)) = packages(i,1)+" - "+packages(i,2);
             mandatory_packages_name(childs(j,1)) = childs(j,2);
-            mandatory_packages_mat = [ mandatory_packages_mat ; childs(j,1) childs(j,2) this_package_section atomsGetInstalledPath(childs(j,:),this_package_section) ];
-
+            mandatory_packages_mat = [ childs(j,1) childs(j,2) this_package_section atomsGetInstalledPath(childs(j,:),this_package_section) ; mandatory_packages_mat ];
         end
     end
 
index c52da40..04588f8 100644 (file)
@@ -22,13 +22,13 @@ if ~ atomsIsInstalled(["toolbox_1","1.0","user"]) then bugmes();quit;end
 if ~ atomsIsInstalled(["toolbox_2","2.0","user"]) then bugmes();quit;end
 atomsLoad(["toolbox_2","2.0","user"]);
 
-Start Toolbox 2
-       Load macros
-
 Start Toolbox 1
        Load macros
        Load gateways
 
+Start Toolbox 2
+       Load macros
+
 if ~ atomsIsLoaded("toolbox_2")                  then bugmes();quit;end
 if ~ atomsIsLoaded(["toolbox_2","2.0"])          then bugmes();quit;end
 if ~ atomsIsLoaded(["toolbox_2","2.0","user"])   then bugmes();quit;end