restoring the Toolboxes menu for not autoloaded contrib/ toolboxes. http://bugzilla...

Change-Id: If984e2ac3d107c831b1eff060fd84a694037b675

diff --git a/scilab/contrib/loader.sce b/scilab/contrib/loader.sce
index 46cf0c0..88b67f7 100644 (file)
--- a/scilab/contrib/loader.sce
+++ b/scilab/contrib/loader.sce
@@ -1,5 +1,5 @@
 // search and add a toolbox menu
-//toolboxes(SCI+'/contrib');
+toolboxes(SCI+"/contrib");
 clear toolboxes  build   distrib_clean  distrib_zip
 
 

diff --git a/scilab/modules/atoms/tests/nonreg_tests/bug_13944.tst b/scilab/modules/atoms/tests/nonreg_tests/bug_13944.tst
new file mode 100644 (file)
index 0000000..b7a9e7b
--- /dev/null
+++ b/scilab/modules/atoms/tests/nonreg_tests/bug_13944.tst
@@ -0,0 +1,23 @@
+// ============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - John GLIKSBERG
+//
+//  This file is distributed under the same license as the Scilab package.
+// ============================================================================
+
+// <-- INTERACTIVE TEST -->
+//
+// <-- Non-regression test for bug 13944 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=13944
+//
+// <-- Short Description -->
+// When there exists a contrib/ package which is not autoloaded, the Toolbox
+// top-bar menu should be created.
+
+// Install a module via atomsIntall or atomsGui
+
+// Un-Autoload it via atomAutoloadDel or atomsGui
+
+// Restart Scilab and make sure the Toolbox top-bar menu is available

diff --git a/scilab/modules/core/macros/toolboxes.sci b/scilab/modules/core/macros/toolboxes.sci
index 7467e05..3719a5e 100644 (file)
--- a/scilab/modules/core/macros/toolboxes.sci
+++ b/scilab/modules/core/macros/toolboxes.sci
@@ -30,7 +30,7 @@ function [y] = toolboxes(path)
         else
             Path = %toolboxes_dir + tmp;
         end
-        y = "exec(""" + %toolboxes_dir + %toolboxes(path) + filesep() + "loader.sce" + """);";
+        y = "exec(""" + pathconvert(Path) + filesep() + "loader.sce" + """);";
         return
     end