Merge remote-tracking branch 'origin/master' into graphic 32/4632/1
Bruno JOFRET [Thu, 28 Jul 2011 15:04:34 +0000 (17:04 +0200)]
Conflicts:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
scilab/configure
scilab/modules/Makefile.in
scilab/modules/core/src/c/InitScilab.c
scilab/modules/scicos/sci_gateway/c/sci_permutobj.c
scilab/modules/scicos_blocks/src/c/scoMisc.c
scilab/modules/shell/Makefile.in

Change-Id: I637d2b34a5fc02febd234beaa568ee6baff14409

36 files changed:
1  2 
scilab/CHANGES_5.4.X
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
scilab/build.incl.xml
scilab/configure
scilab/configure.ac
scilab/etc/classpath.xml.in
scilab/etc/classpath.xml.vc
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.in
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/InitScilab.c
scilab/modules/core/src/c/callinterf.c
scilab/modules/elementary_functions/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
scilab/modules/output_stream/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj
scilab/modules/scicos_blocks/src/c/scoMisc.c
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/NavigatorWindow.java
scilab/modules/special_functions/Makefile.in
scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
scilab/scilab-lib.properties.in
scilab/scilab-lib.properties.vc

Simple merge
Simple merge
@@@ -386,14 -383,7 +386,10 @@@ EndProjec
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "javasci-Ant", "modules\javasci\src\java\javasci-JAVA.vcxproj", "{6182A20D-8111-41C1-9713-CD2A4725057C}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gui-Ant", "modules\gui\src\java\gui-JAVA.vcxproj", "{F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {A3193DF3-A764-4B51-B240-9285289C337E} = {A3193DF3-A764-4B51-B240-9285289C337E}
 +      EndProjectSection
  EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shell-Ant", "modules\shell\src\java\shell-JAVA.vcxproj", "{2EA61E81-0F0C-4006-985C-12785093CD2F}"
- EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamiclibrary", "libs\dynamiclibrary\dynamiclibrary.vcxproj", "{77154919-8A20-4F35-B7C7-6B3B957BDCA1}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "localization-Ant", "modules\localization\src\java\localization-JAVA.vcxproj", "{FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}"
@@@ -596,21 -580,8 +592,23 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-all", "Visual-Studio-settings\test-all\test-all.vcxproj", "{439D04EC-A444-48BE-8E55-8CD2BB66B782}"
  EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphic_objects", "modules\graphic_objects\src\c\graphic_objects.vcxproj", "{30F9EE41-587B-4618-8DE7-698D3FBA4985}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
 +              {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
 +              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 +              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphic_objects-Ant", "modules\graphic_objects\src\java\graphic_objects-JAVA.vcxproj", "{A3193DF3-A764-4B51-B240-9285289C337E}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
 +              {4235A847-ED0E-43A3-B62B-E59CB857EDE9} = {4235A847-ED0E-43A3-B62B-E59CB857EDE9}
 +              {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
 +      EndProjectSection
 +EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noui_data", "modules\ui_data\src\noui_data\noui_data.vcxproj", "{337A52F8-310E-49E3-A2BA-F19CA32EB617}"
+ EndProject
  Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
                {439D04EC-A444-48BE-8E55-8CD2BB66B782}.Debug|x64.ActiveCfg = Debug|x64
                {439D04EC-A444-48BE-8E55-8CD2BB66B782}.Release|Win32.ActiveCfg = Release|Win32
                {439D04EC-A444-48BE-8E55-8CD2BB66B782}.Release|x64.ActiveCfg = Release|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|Win32.Build.0 = Debug|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|x64.ActiveCfg = Debug|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|x64.Build.0 = Debug|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|Win32.ActiveCfg = Release|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|Win32.Build.0 = Release|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|x64.ActiveCfg = Release|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|x64.Build.0 = Release|x64
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Debug|Win32.Build.0 = Debug|Win32
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Debug|x64.ActiveCfg = Debug|x64
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Debug|x64.Build.0 = Debug|x64
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Release|Win32.ActiveCfg = Release|Win32
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Release|Win32.Build.0 = Release|Win32
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Release|x64.ActiveCfg = Release|x64
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Release|x64.Build.0 = Release|x64
+               {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Debug|Win32.ActiveCfg = Debug|Win32
+               {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Debug|Win32.Build.0 = Debug|Win32
+               {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Debug|x64.ActiveCfg = Debug|x64
+               {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Debug|x64.Build.0 = Debug|x64
+               {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|Win32.ActiveCfg = Release|Win32
+               {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|Win32.Build.0 = Release|Win32
+               {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|x64.ActiveCfg = Release|x64
+               {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
@@@ -364,10 -357,8 +360,12 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-all", "Visual-Studio-settings\test-all\test-all.vcxproj", "{439D04EC-A444-48BE-8E55-8CD2BB66B782}"
  EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphic_objects", "modules\graphic_objects\src\c\graphic_objects.vcxproj", "{30F9EE41-587B-4618-8DE7-698D3FBA4985}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphic_objects-Ant", "modules\graphic_objects\src\java\graphic_objects-JAVA.vcxproj", "{A3193DF3-A764-4B51-B240-9285289C337E}"
 +EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noui_data", "modules\ui_data\src\noui_data\noui_data.vcxproj", "{337A52F8-310E-49E3-A2BA-F19CA32EB617}"
+ EndProject
  Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
                {439D04EC-A444-48BE-8E55-8CD2BB66B782}.Debug|x64.ActiveCfg = Debug|x64
                {439D04EC-A444-48BE-8E55-8CD2BB66B782}.Release|Win32.ActiveCfg = Release|Win32
                {439D04EC-A444-48BE-8E55-8CD2BB66B782}.Release|x64.ActiveCfg = Release|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|Win32.Build.0 = Debug|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|x64.ActiveCfg = Debug|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|x64.Build.0 = Debug|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|Win32.ActiveCfg = Release|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|Win32.Build.0 = Release|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|x64.ActiveCfg = Release|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|x64.Build.0 = Release|x64
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Debug|Win32.Build.0 = Debug|Win32
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Debug|x64.ActiveCfg = Debug|x64
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Debug|x64.Build.0 = Debug|x64
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Release|Win32.ActiveCfg = Release|Win32
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Release|Win32.Build.0 = Release|Win32
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Release|x64.ActiveCfg = Release|x64
 +              {A3193DF3-A764-4B51-B240-9285289C337E}.Release|x64.Build.0 = Release|x64
+               {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Debug|Win32.ActiveCfg = Debug|Win32
+               {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Debug|Win32.Build.0 = Debug|Win32
+               {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Debug|x64.ActiveCfg = Debug|x64
+               {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Debug|x64.Build.0 = Debug|x64
+               {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|Win32.ActiveCfg = Release|Win32
+               {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|Win32.Build.0 = Release|Win32
+               {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|x64.ActiveCfg = Release|x64
+               {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
@@@ -1,4 -1,4 +1,4 @@@
--<?xml version="1.0" encoding="utf-8"?>
++<?xml version="1.0" encoding="utf-8"?>
  <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
      <ProjectConfiguration Include="Debug|Win32">
  set PATH=$(SolutionDir)java\ant\bin;%PATH%;
  cd $(SolutionDir)modules\localization &amp;&amp; call ant
  cd $(SolutionDir)modules\renderer &amp;&amp; call ant
 +cd $(SolutionDir)modules\graphic_objects &amp;&amp; call ant
- cd $(SolutionDir)modules\shell &amp;&amp; call ant
- cd $(SolutionDir)modules\jvm &amp;&amp; call ant
  cd $(SolutionDir)modules\commons &amp;&amp; call ant
+ cd $(SolutionDir)modules\jvm &amp;&amp; call ant
  cd $(SolutionDir)modules\action_binding &amp;&amp; call ant
  cd $(SolutionDir)modules\history_manager &amp;&amp; call ant
  cd $(SolutionDir)modules\completion &amp;&amp; call ant
@@@ -97,11 -95,9 +96,10 @@@ cd $(SolutionDir)modules\core &amp;&amp
      <NMakeReBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
  set PATH=$(SolutionDir)java\ant\bin;%PATH%;
  cd $(SolutionDir)modules\localization &amp;&amp; call ant clean &amp;&amp; call ant
 +cd $(SolutionDir)modules\graphic_objects &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\renderer &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\shell &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\commons &amp;&amp; call ant clean &amp;&amp;  call ant
+ cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\action_binding &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\history_manager &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\completion &amp;&amp; call ant clean &amp;&amp;  call ant
@@@ -124,11 -120,9 +122,10 @@@ cd $(SolutionDir)modules\core &amp;&amp
      <NMakeCleanCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
  set PATH=$(SolutionDir)java\ant\bin;%PATH%;
  cd $(SolutionDir)modules\localization &amp;&amp; call ant clean
 +cd $(SolutionDir)modules\graphic_objects &amp;&amp; call ant clean
  cd $(SolutionDir)modules\renderer &amp;&amp; call ant clean
- cd $(SolutionDir)modules\shell &amp;&amp; call ant clean
- cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean
  cd $(SolutionDir)modules\commons &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean
  cd $(SolutionDir)modules\action_binding &amp;&amp; call ant clean
  cd $(SolutionDir)modules\history_manager &amp;&amp; call ant clean
  cd $(SolutionDir)modules\completion &amp;&amp; call ant clean
@@@ -157,10 -151,8 +154,9 @@@ cd $(SolutionDir)modules\core &amp;&amp
  set PATH=$(SolutionDir)java\ant\bin;%PATH%;
  cd $(SolutionDir)modules\localization &amp;&amp; call ant
  cd $(SolutionDir)modules\renderer &amp;&amp; call ant
 +cd $(SolutionDir)modules\graphic_objects &amp;&amp; call ant
- cd $(SolutionDir)modules\shell &amp;&amp; call ant
- cd $(SolutionDir)modules\jvm &amp;&amp; call ant
  cd $(SolutionDir)modules\commons &amp;&amp; call ant
+ cd $(SolutionDir)modules\jvm &amp;&amp; call ant
  cd $(SolutionDir)modules\action_binding &amp;&amp; call ant
  cd $(SolutionDir)modules\history_manager &amp;&amp; call ant
  cd $(SolutionDir)modules\completion &amp;&amp; call ant
@@@ -182,11 -174,9 +178,10 @@@ cd $(SolutionDir)modules\core &amp;&amp
      <NMakeReBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
  set PATH=$(SolutionDir)java\ant\bin;%PATH%;
  cd $(SolutionDir)modules\localization &amp;&amp; call ant clean &amp;&amp; call ant
 +cd $(SolutionDir)modules\graphic_objects &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\renderer &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\shell &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\commons &amp;&amp; call ant clean &amp;&amp;  call ant
+ cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\action_binding &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\history_manager &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\completion &amp;&amp; call ant clean &amp;&amp;  call ant
@@@ -209,11 -199,9 +204,10 @@@ cd $(SolutionDir)modules\core &amp;&amp
      <NMakeCleanCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
  set PATH=$(SolutionDir)java\ant\bin;%PATH%;
  cd $(SolutionDir)modules\localization &amp;&amp; call ant clean
 +cd $(SolutionDir)modules\graphic_objects &amp;&amp; call ant clean
  cd $(SolutionDir)modules\renderer &amp;&amp; call ant clean
- cd $(SolutionDir)modules\shell &amp;&amp; call ant clean
- cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean
  cd $(SolutionDir)modules\commons &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean
  cd $(SolutionDir)modules\action_binding &amp;&amp; call ant clean
  cd $(SolutionDir)modules\history_manager &amp;&amp; call ant clean
  cd $(SolutionDir)modules\completion &amp;&amp; call ant clean
@@@ -242,10 -230,8 +236,9 @@@ cd $(SolutionDir)modules\core &amp;&amp
  set PATH=$(SolutionDir)java\ant\bin;%PATH%;
  cd $(SolutionDir)modules\localization &amp;&amp; call ant
  cd $(SolutionDir)modules\renderer &amp;&amp; call ant
 +cd $(SolutionDir)modules\graphic_objects &amp;&amp; call ant
- cd $(SolutionDir)modules\shell &amp;&amp; call ant
- cd $(SolutionDir)modules\jvm &amp;&amp; call ant
  cd $(SolutionDir)modules\commons &amp;&amp; call ant
+ cd $(SolutionDir)modules\jvm &amp;&amp; call ant
  cd $(SolutionDir)modules\action_binding &amp;&amp; call ant
  cd $(SolutionDir)modules\history_manager &amp;&amp; call ant
  cd $(SolutionDir)modules\completion &amp;&amp; call ant
@@@ -267,11 -253,9 +260,10 @@@ cd $(SolutionDir)modules\core &amp;&amp
      <NMakeReBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
  set PATH=$(SolutionDir)java\ant\bin;%PATH%;
  cd $(SolutionDir)modules\localization &amp;&amp; call ant clean &amp;&amp; call ant
 +cd $(SolutionDir)modules\graphic_objects &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\renderer &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\shell &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\commons &amp;&amp; call ant clean &amp;&amp;  call ant
+ cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\action_binding &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\history_manager &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\completion &amp;&amp; call ant clean &amp;&amp;  call ant
@@@ -294,11 -278,9 +286,10 @@@ cd $(SolutionDir)modules\core &amp;&amp
      <NMakeCleanCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
  set PATH=$(SolutionDir)java\ant\bin;%PATH%;
  cd $(SolutionDir)modules\localization &amp;&amp; call ant clean
 +cd $(SolutionDir)modules\graphic_objects &amp;&amp; call ant clean
  cd $(SolutionDir)modules\renderer &amp;&amp; call ant clean
- cd $(SolutionDir)modules\shell &amp;&amp; call ant clean
- cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean
  cd $(SolutionDir)modules\commons &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean
  cd $(SolutionDir)modules\action_binding &amp;&amp; call ant clean
  cd $(SolutionDir)modules\history_manager &amp;&amp; call ant clean
  cd $(SolutionDir)modules\completion &amp;&amp; call ant clean
@@@ -327,10 -309,8 +318,9 @@@ cd $(SolutionDir)modules\core &amp;&amp
  set PATH=$(SolutionDir)java\ant\bin;%PATH%;
  cd $(SolutionDir)modules\localization &amp;&amp; call ant
  cd $(SolutionDir)modules\renderer &amp;&amp; call ant
 +cd $(SolutionDir)modules\graphic_objects &amp;&amp; call ant
- cd $(SolutionDir)modules\shell &amp;&amp; call ant
- cd $(SolutionDir)modules\jvm &amp;&amp; call ant
  cd $(SolutionDir)modules\commons &amp;&amp; call ant
+ cd $(SolutionDir)modules\jvm &amp;&amp; call ant
  cd $(SolutionDir)modules\action_binding &amp;&amp; call ant
  cd $(SolutionDir)modules\history_manager &amp;&amp; call ant
  cd $(SolutionDir)modules\completion &amp;&amp; call ant
@@@ -352,11 -332,9 +342,10 @@@ cd $(SolutionDir)modules\core &amp;&amp
      <NMakeReBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
  set PATH=$(SolutionDir)java\ant\bin;%PATH%;
  cd $(SolutionDir)modules\localization &amp;&amp; call ant clean &amp;&amp; call ant
 +cd $(SolutionDir)modules\graphic_objects &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\renderer &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\shell &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\commons &amp;&amp; call ant clean &amp;&amp;  call ant
+ cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\action_binding &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\history_manager &amp;&amp; call ant clean &amp;&amp;  call ant
  cd $(SolutionDir)modules\completion &amp;&amp; call ant clean &amp;&amp;  call ant
@@@ -379,11 -357,9 +368,10 @@@ cd $(SolutionDir)modules\core &amp;&amp
      <NMakeCleanCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
  set PATH=$(SolutionDir)java\ant\bin;%PATH%;
  cd $(SolutionDir)modules\localization &amp;&amp; call ant clean
 +cd $(SolutionDir)modules\graphic_objects &amp;&amp; call ant clean
  cd $(SolutionDir)modules\renderer &amp;&amp; call ant clean
- cd $(SolutionDir)modules\shell &amp;&amp; call ant clean
- cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean
  cd $(SolutionDir)modules\commons &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean
  cd $(SolutionDir)modules\action_binding &amp;&amp; call ant clean
  cd $(SolutionDir)modules\history_manager &amp;&amp; call ant clean
  cd $(SolutionDir)modules\completion &amp;&amp; call ant clean
Simple merge
@@@ -37594,7 -37364,7 +37594,7 @@@ if test "$enable_stop_on_warning" = yes
     CXXFLAGS="$CXXFLAGS -Werror=implicit-function-declaration -O0"
  fi
  
- ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
 -ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
++ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
  
  
  # Detection of the module for the future version of Scilab 6
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -30,9 -30,7 +30,8 @@@ localization 
  commons \
  jvm \
  action_binding \
 +graphic_objects \
  renderer \
- shell \
  completion \
  console \
  graphic_export \
@@@ -157,10 -157,10 +157,10 @@@ ETAGS = etag
  CTAGS = ctags
  DIST_SUBDIRS = output_stream arnoldi elementary_functions string \
        api_scilab dynamic_link fileio history_manager spreadsheet \
 -      tclsci localization commons jvm action_binding renderer \
 -      completion console graphic_export gui graphics optimization \
 -      symbolic randlib statistics special_functions interpolation \
 -      linear_algebra integer data_structures mexlib \
 +      tclsci localization commons jvm action_binding graphic_objects \
-       renderer shell completion console graphic_export gui graphics \
++      renderer completion console graphic_export gui graphics \
 +      optimization symbolic randlib statistics special_functions \
 +      interpolation linear_algebra integer data_structures mexlib \
        differential_equations cacsd polynomials boolean double pvm io \
        intersci signal_processing core call_scilab sound time sparse \
        windows_tools functions overloading maple2scilab m2sci texmacs \
@@@ -451,10 -450,10 +451,10 @@@ top_builddir = @top_builddir
  top_srcdir = @top_srcdir@
  SUBDIRS = output_stream arnoldi elementary_functions string api_scilab \
        dynamic_link fileio history_manager spreadsheet tclsci \
 -      localization commons jvm action_binding renderer completion \
 -      console graphic_export gui graphics optimization symbolic \
 -      randlib statistics special_functions interpolation \
 -      linear_algebra integer data_structures mexlib \
 +      localization commons jvm action_binding graphic_objects \
-       renderer shell completion console graphic_export gui graphics \
++      renderer completion console graphic_export gui graphics \
 +      optimization symbolic randlib statistics special_functions \
 +      interpolation linear_algebra integer data_structures mexlib \
        differential_equations cacsd polynomials boolean double pvm io \
        intersci signal_processing core call_scilab interpolation \
        sound time randlib sparse windows_tools functions overloading \
Simple merge
Simple merge
  int C2F(initscilab)(void)
  {
  
 -      SetScilabEnvironment();
 +    SetScilabEnvironment();
  
 -      InitializeString();
 +    InitializeString();
  
 -      InitializeLocalization();
 +    InitializeLocalization();
  
 -      #ifdef _MSC_VER
 -      InitializeWindows_tools();
 -      #endif
 +#ifdef _MSC_VER
 +    InitializeWindows_tools();
 +#endif
  
 -      InitializeCore();
 +    InitializeCore();
  
-     InitializeShell();
 -    if ( getScilabMode() != SCILAB_NWNI ) 
 +    if ( getScilabMode() != SCILAB_NWNI )
-     {
-         InitializeJVM();
-         /* create needed data structure if not already created */
-         loadGraphicModule() ;
+       {
+               InitializeJVM();
 +
-         InitializeGUI();
++              /* create needed data structure if not already created */
++              loadGraphicModule() ;
 +
-         /* Standard mode -> init Java Console */
-         if ( getScilabMode() == SCILAB_STD )
-         {
-             /* Initialize console: lines... */
-             InitializeConsole();
-         }
+               InitializeGUI();
 -              
 +
-         loadBackGroundClassPath();
+               /* create needed data structure if not already created */
+               loadGraphicModule() ;
      }
-     return 0;
+     /* Initialize console: lines... */
+     InitializeConsole();
 -      if ( getScilabMode() != SCILAB_NWNI ) 
++      if ( getScilabMode() != SCILAB_NWNI )
+     {
+               loadBackGroundClassPath();
+       }
+       return 0;
  }
  /*--------------------------------------------------------------------------*/
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge