move input() from [io] => [console]

Change-Id: I87d4c387d08cb9b4184b218061b862745f437b56

diff --git a/scilab/modules/console/console.iss b/scilab/modules/console/console.iss
index 9f247e4..5e5bee5 100644 (file)
--- a/scilab/modules/console/console.iss
+++ b/scilab/modules/console/console.iss
@@ -46,6 +46,9 @@ Source: modules\{#CONSOLE}\etc\*.xsl; DestDir: {app}\modules\{#CONSOLE}\etc; Com
 Source: modules\{#CONSOLE}\macros\buildmacros.sce; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: modules\{#CONSOLE}\macros\buildmacros.bat; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: modules\{#CONSOLE}\macros\cleanmacros.bat; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#CONSOLE}\macros\lib; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#CONSOLE}\macros\*.sci; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#CONSOLE}\macros\*.bin; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB}
 ;
 ;Source: modules\{#CONSOLE}\demos\*.*; DestDir: {app}\modules\{#CONSOLE}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;

diff --git a/scilab/modules/console/etc/console.start b/scilab/modules/console/etc/console.start
index a5e5ca9..c3ee95e 100644 (file)
--- a/scilab/modules/console/etc/console.start
+++ b/scilab/modules/console/etc/console.start
@@ -10,3 +10,6 @@
 // For more information, see the COPYING file which you should have received
 // along with this program.
 
+//Load  functions libraries
+// =============================================================================
+load("SCI/modules/console/macros/lib");

diff --git a/scilab/modules/io/help/en_US/input.xml b/scilab/modules/console/help/en_US/input.xml
similarity index 100%
rename from scilab/modules/io/help/en_US/input.xml
rename to scilab/modules/console/help/en_US/input.xml

diff --git a/scilab/modules/io/help/ja_JP/input.xml b/scilab/modules/console/help/ja_JP/input.xml
similarity index 100%
rename from scilab/modules/io/help/ja_JP/input.xml
rename to scilab/modules/console/help/ja_JP/input.xml

diff --git a/scilab/modules/io/help/pt_BR/input.xml b/scilab/modules/console/help/pt_BR/input.xml
similarity index 100%
rename from scilab/modules/io/help/pt_BR/input.xml
rename to scilab/modules/console/help/pt_BR/input.xml

diff --git a/scilab/modules/console/macros/buildmacros.sce b/scilab/modules/console/macros/buildmacros.sce
index bfab74c..4f81fac 100644 (file)
--- a/scilab/modules/console/macros/buildmacros.sce
+++ b/scilab/modules/console/macros/buildmacros.sce
@@ -17,5 +17,5 @@ if (isdef("genlib") == %f) then
     exec(SCI+"/modules/functions/scripts/buildmacros/loadgenlib.sce");
 end
 //------------------------------------
-//genlib("consolelib","SCI/modules/console/macros",%f,%t);
+genlib("consolelib","SCI/modules/console/macros",%f,%t);
 //------------------------------------

diff --git a/scilab/modules/io/macros/input.sci b/scilab/modules/console/macros/input.sci
similarity index 100%
rename from scilab/modules/io/macros/input.sci
rename to scilab/modules/console/macros/input.sci

diff --git a/scilab/modules/io/tests/nonreg_tests/bug_14375.tst b/scilab/modules/console/tests/nonreg_tests/bug_14375.tst
similarity index 100%
rename from scilab/modules/io/tests/nonreg_tests/bug_14375.tst
rename to scilab/modules/console/tests/nonreg_tests/bug_14375.tst

diff --git a/scilab/modules/io/tests/nonreg_tests/bug_14978.tst b/scilab/modules/console/tests/nonreg_tests/bug_14978.tst
similarity index 100%
rename from scilab/modules/io/tests/nonreg_tests/bug_14978.tst
rename to scilab/modules/console/tests/nonreg_tests/bug_14978.tst

diff --git a/scilab/modules/io/tests/nonreg_tests/bug_3666.tst b/scilab/modules/console/tests/nonreg_tests/bug_3666.tst
similarity index 100%
rename from scilab/modules/io/tests/nonreg_tests/bug_3666.tst
rename to scilab/modules/console/tests/nonreg_tests/bug_3666.tst

diff --git a/scilab/modules/io/tests/nonreg_tests/bug_5368.tst b/scilab/modules/console/tests/nonreg_tests/bug_5368.tst
similarity index 100%
rename from scilab/modules/io/tests/nonreg_tests/bug_5368.tst
rename to scilab/modules/console/tests/nonreg_tests/bug_5368.tst

diff --git a/scilab/modules/io/tests/nonreg_tests/bug_5513.tst b/scilab/modules/console/tests/nonreg_tests/bug_5513.tst
similarity index 100%
rename from scilab/modules/io/tests/nonreg_tests/bug_5513.tst
rename to scilab/modules/console/tests/nonreg_tests/bug_5513.tst

diff --git a/scilab/modules/io/tests/nonreg_tests/bug_576.tst b/scilab/modules/console/tests/nonreg_tests/bug_576.tst
similarity index 100%
rename from scilab/modules/io/tests/nonreg_tests/bug_576.tst
rename to scilab/modules/console/tests/nonreg_tests/bug_576.tst