Modules_manager tests: regen xcos_toolbox_skeleton 74/18774/4
Paul Bignier [Thu, 8 Dec 2016 11:33:50 +0000 (12:33 +0100)]
 * Fixed obsolete use of tbx_build_loader & tbx_build_cleaner(name, path)

Change-Id: I5465ade0414325583a271defb5c9229bd50b8bfd

scilab/contrib/xcos_toolbox_skeleton/builder.sce
scilab/modules/modules_manager/tests/unit_tests/xcos_toolbox_skeleton.tst
scilab/modules/modules_manager/tests/unit_tests/xcos_toolbox_skeleton.unix.dia.ref

index 42b191d..372c365 100644 (file)
@@ -43,8 +43,8 @@ function main_builder()
     tbx_builder_src(toolbox_dir);
     tbx_builder_gateway(toolbox_dir);
     tbx_builder_help(toolbox_dir);
-    tbx_build_loader(TOOLBOX_NAME, toolbox_dir);
-    tbx_build_cleaner(TOOLBOX_NAME, toolbox_dir);
+    tbx_build_loader(toolbox_dir);
+    tbx_build_cleaner(toolbox_dir);
 endfunction
 
 if with_module("xcos") then
index cba94d6..e15d19a 100644 (file)
@@ -18,4 +18,4 @@ status = copyfile(SCI + "/contrib/xcos_toolbox_skeleton/", TMPDIR + "/xcos_toolb
 assert_checkequal(status, 1);
 exec("TMPDIR/xcos_toolbox_skeleton/builder.sce");
 exec("TMPDIR/xcos_toolbox_skeleton/loader.sce");
-test_run("TMPDIR/xcos_toolbox_skeleton/", [], "short_summary");
\ No newline at end of file
+test_run("TMPDIR/xcos_toolbox_skeleton/", [], "short_summary");
index e02a1b5..2154e7e 100644 (file)
@@ -24,7 +24,6 @@ genlib: Processing file: TBX_SUM_c.sci
 genlib: Processing file: TBX_SUM_modelica.sci
 genlib: Processing file: TBX_SUM_sci.sci
 genlib: Processing file: TBX_SUM_sim.sci
-genlib: Regenerate names and lib
 Building blocks...
 Building sources...
    Generate a loader file
@@ -42,7 +41,9 @@ Building gateway...
    Generate a loader file
    Generate a Makefile
    ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
-   ilib_gen_Make: Copy libxcos_toolbox_skeleton_c.c to TMPDIR
+   ilib_gen_Make: Copy libxcos_toolbox_skeleton_c.cpp to TMPDIR
+   ilib_gen_Make: Copy libxcos_toolbox_skeleton_c.h to TMPDIR
+   ilib_gen_Make: Copy libxcos_toolbox_skeleton_c.hxx to TMPDIR
    ilib_gen_Make: Copy sci_tbx_sum.c to TMPDIR
    ilib_gen_Make: configure : Generate Makefile.
    ilib_gen_Make: Modification of the Makefile in TMPDIR.
@@ -51,10 +52,8 @@ Building gateway...
 Generating loader_gateway.sce...
 Generating cleaner_gateway.sce...
 Building help...
-
 Building the master document:
        TMPDIR/xcos_toolbox_skeleton/help/en_US
-
 Building the manual file [javaHelp] in TMPDIR/xcos_toolbox_skeleton/help/en_US.
 Generating loader.sce...
 Generating unloader.sce...
@@ -69,10 +68,7 @@ Start Xcos toolbox skeleton
        Load demos
 test_run("TMPDIR/xcos_toolbox_skeleton/", [], "short_summary");
    001/001 - [TMPDIR/xcos_toolbox_skeleton/] : 
-
    001/001 - [TMPDIR/xcos_toolbox_skeleton/] tbx_sum............passed
-
-
    --------------------------------------------------------------------------
    Tests:    1,    Passed:    1,    Failed:    0,    Skipped:    0
    --------------------------------------------------------------------------