Merge remote-tracking branch 'refs/remotes/origin/master' into preferences 88/5888/2
Allan CORNET [Thu, 12 Jan 2012 11:24:37 +0000 (12:24 +0100)]
Conflicts:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/gui/etc/main_menubar.xml
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/ConfigSciNotesManager.java
scilab/scilab-lib.properties.in

Change-Id: I4b5a4cbb218a3cf2923640e45fc2e8d4599de1b8

21 files changed:
1  2 
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
scilab/build.incl.xml
scilab/configure.ac
scilab/contrib/toolbox_skeleton/etc/toolbox_skeleton.start
scilab/etc/classpath.xml.in
scilab/etc/classpath.xml.vc
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/libs/MALLOC/src/win_mem_alloc.c
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/gui/etc/main_menubar.xml
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabEditorPane.java
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/ConfigSciNotesManager.java
scilab/scilab-lib.properties.in
scilab/scilab-lib.properties.vc
scilab/tools/innosetup/code_modules.iss
scilab/tools/innosetup/files.iss

@@@ -579,12 -629,10 +629,17 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types-JAVA-tests", "modules\types\tests\java\types-JAVA-tests.vcxproj", "{3F4504A3-1116-40BD-9612-F5E83D09CC99}"
  EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "modules\xml\xml.vcxproj", "{EF5402DA-29FD-4F1B-B98B-D284D4E27C15}"
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types", "modules\types\types.vcxproj", "{626B9142-13A1-4765-A072-FB08952E7BB8}"
+ EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preferences", "modules\preferences\src\c\preferences.vcxproj", "{7B893E9F-D032-44DE-9B71-197A29C4989B}"
++      ProjectSection(ProjectDependencies) = postProject
++              {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E} = {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}
++      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preferences-Ant", "modules\preferences\src\java\preferences-JAVA.vcxproj", "{32352BC0-9D50-4479-8B77-698287CCB8DE}"
 +EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "modules\xml\xml.vcxproj", "{EF5402DA-29FD-4F1B-B98B-D284D4E27C15}"
- EndProject
  Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
                {3F4504A3-1116-40BD-9612-F5E83D09CC99}.Debug|x64.ActiveCfg = Debug|x64
                {3F4504A3-1116-40BD-9612-F5E83D09CC99}.Release|Win32.ActiveCfg = Release|Win32
                {3F4504A3-1116-40BD-9612-F5E83D09CC99}.Release|x64.ActiveCfg = Release|x64
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|Win32.ActiveCfg = Debug|Win32
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|Win32.Build.0 = Debug|Win32
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|x64.ActiveCfg = Debug|x64
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|x64.Build.0 = Debug|x64
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|Win32.ActiveCfg = Release|Win32
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|Win32.Build.0 = Release|Win32
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|x64.ActiveCfg = Release|x64
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|x64.Build.0 = Release|x64
+               {626B9142-13A1-4765-A072-FB08952E7BB8}.Debug|Win32.ActiveCfg = Debug|Win32
+               {626B9142-13A1-4765-A072-FB08952E7BB8}.Debug|Win32.Build.0 = Debug|Win32
+               {626B9142-13A1-4765-A072-FB08952E7BB8}.Debug|x64.ActiveCfg = Debug|x64
+               {626B9142-13A1-4765-A072-FB08952E7BB8}.Debug|x64.Build.0 = Debug|x64
+               {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|Win32.ActiveCfg = Release|Win32
+               {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|Win32.Build.0 = Release|Win32
+               {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|x64.ActiveCfg = Release|x64
+               {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|x64.Build.0 = Release|x64
 +              {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|Win32.Build.0 = Debug|Win32
 +              {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|x64.ActiveCfg = Debug|x64
 +              {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|x64.Build.0 = Debug|x64
 +              {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|Win32.ActiveCfg = Release|Win32
 +              {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|Win32.Build.0 = Release|Win32
 +              {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|x64.ActiveCfg = Release|x64
 +              {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|x64.Build.0 = Release|x64
 +              {32352BC0-9D50-4479-8B77-698287CCB8DE}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {32352BC0-9D50-4479-8B77-698287CCB8DE}.Debug|Win32.Build.0 = Debug|Win32
 +              {32352BC0-9D50-4479-8B77-698287CCB8DE}.Debug|x64.ActiveCfg = Debug|x64
 +              {32352BC0-9D50-4479-8B77-698287CCB8DE}.Debug|x64.Build.0 = Debug|x64
 +              {32352BC0-9D50-4479-8B77-698287CCB8DE}.Release|Win32.ActiveCfg = Release|Win32
 +              {32352BC0-9D50-4479-8B77-698287CCB8DE}.Release|Win32.Build.0 = Release|Win32
 +              {32352BC0-9D50-4479-8B77-698287CCB8DE}.Release|x64.ActiveCfg = Release|x64
 +              {32352BC0-9D50-4479-8B77-698287CCB8DE}.Release|x64.Build.0 = Release|x64
-               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|Win32.ActiveCfg = Debug|Win32
-               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|Win32.Build.0 = Debug|Win32
-               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|x64.ActiveCfg = Debug|x64
-               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|x64.Build.0 = Debug|x64
-               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|Win32.ActiveCfg = Release|Win32
-               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|Win32.Build.0 = Release|Win32
-               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|x64.ActiveCfg = Release|x64
-               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
@@@ -577,12 -627,10 +627,17 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types-JAVA-tests", "modules\types\tests\java\types-JAVA-tests.vcxproj", "{3F4504A3-1116-40BD-9612-F5E83D09CC99}"
  EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "modules\xml\xml.vcxproj", "{EF5402DA-29FD-4F1B-B98B-D284D4E27C15}"
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types", "modules\types\types.vcxproj", "{626B9142-13A1-4765-A072-FB08952E7BB8}"
+ EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preferences", "modules\preferences\src\c\preferences.vcxproj", "{7B893E9F-D032-44DE-9B71-197A29C4989B}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preferences-Ant", "modules\preferences\src\java\preferences-JAVA.vcxproj", "{32352BC0-9D50-4479-8B77-698287CCB8DE}"
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "modules\xml\xml.vcxproj", "{EF5402DA-29FD-4F1B-B98B-D284D4E27C15}"
++      ProjectSection(ProjectDependencies) = postProject
++              {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E} = {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}
++      EndProjectSection
 +EndProject
  Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
                {3F4504A3-1116-40BD-9612-F5E83D09CC99}.Debug|x64.ActiveCfg = Debug|x64
                {3F4504A3-1116-40BD-9612-F5E83D09CC99}.Release|Win32.ActiveCfg = Release|Win32
                {3F4504A3-1116-40BD-9612-F5E83D09CC99}.Release|x64.ActiveCfg = Release|x64
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|Win32.ActiveCfg = Debug|Win32
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|Win32.Build.0 = Debug|Win32
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|x64.ActiveCfg = Debug|x64
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|x64.Build.0 = Debug|x64
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|Win32.ActiveCfg = Release|Win32
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|Win32.Build.0 = Release|Win32
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|x64.ActiveCfg = Release|x64
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|x64.Build.0 = Release|x64
+               {626B9142-13A1-4765-A072-FB08952E7BB8}.Debug|Win32.ActiveCfg = Debug|Win32
+               {626B9142-13A1-4765-A072-FB08952E7BB8}.Debug|Win32.Build.0 = Debug|Win32
+               {626B9142-13A1-4765-A072-FB08952E7BB8}.Debug|x64.ActiveCfg = Debug|x64
+               {626B9142-13A1-4765-A072-FB08952E7BB8}.Debug|x64.Build.0 = Debug|x64
+               {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|Win32.ActiveCfg = Release|Win32
+               {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|Win32.Build.0 = Release|Win32
+               {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|x64.ActiveCfg = Release|x64
+               {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|x64.Build.0 = Release|x64
 +              {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|Win32.Build.0 = Debug|Win32
 +              {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|x64.ActiveCfg = Debug|x64
 +              {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|x64.Build.0 = Debug|x64
 +              {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|Win32.ActiveCfg = Release|Win32
 +              {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|Win32.Build.0 = Release|Win32
 +              {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|x64.ActiveCfg = Release|x64
 +              {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|x64.Build.0 = Release|x64
 +              {32352BC0-9D50-4479-8B77-698287CCB8DE}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {32352BC0-9D50-4479-8B77-698287CCB8DE}.Debug|Win32.Build.0 = Debug|Win32
 +              {32352BC0-9D50-4479-8B77-698287CCB8DE}.Debug|x64.ActiveCfg = Debug|x64
 +              {32352BC0-9D50-4479-8B77-698287CCB8DE}.Debug|x64.Build.0 = Debug|x64
 +              {32352BC0-9D50-4479-8B77-698287CCB8DE}.Release|Win32.ActiveCfg = Release|Win32
 +              {32352BC0-9D50-4479-8B77-698287CCB8DE}.Release|Win32.Build.0 = Release|Win32
 +              {32352BC0-9D50-4479-8B77-698287CCB8DE}.Release|x64.ActiveCfg = Release|x64
 +              {32352BC0-9D50-4479-8B77-698287CCB8DE}.Release|x64.Build.0 = Release|x64
-               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|Win32.ActiveCfg = Debug|Win32
-               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|Win32.Build.0 = Debug|Win32
-               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|x64.ActiveCfg = Debug|x64
-               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|x64.Build.0 = Debug|x64
-               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|Win32.ActiveCfg = Release|Win32
-               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|Win32.Build.0 = Release|Win32
-               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|x64.ActiveCfg = Release|x64
-               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
@@@ -88,60 -89,54 +89,56 @@@ cd $(SolutionDir)modules\helptools &amp
  cd $(SolutionDir)modules\javasci && call ant
  cd $(SolutionDir)modules\ui_data && call ant
  cd $(SolutionDir)modules\history_browser && call ant
- cd $(SolutionDir)modules\output_stream && call ant
- cd $(SolutionDir)modules\core && call ant
+ cd $(SolutionDir)modules\scinotes && call ant
++cd $(SolutionDir)modules\preferences && call ant
  </NMakeBuildCommandLine>
      <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\renderer &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
- cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\console &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\gui &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\types &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\graph &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\output_stream &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\core &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\renderer &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\jvm &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
+ cd $(SolutionDir)modules\console &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\types &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\gui &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\graph &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\core &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean &amp;&amp; call ant
++cd $(SolutionDir)modules\preferences &amp;&amp; call ant clean &amp;&amp; call ant
  </NMakeReBuildCommandLine>
      <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\renderer &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
- cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean
- cd $(SolutionDir)modules\console &amp;&amp; call ant clean
- cd $(SolutionDir)modules\gui &amp;&amp; call ant clean
- cd $(SolutionDir)modules\types &amp;&amp; call ant clean
- cd $(SolutionDir)modules\graph &amp;&amp; call ant clean
- cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean
- cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean
- cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean
- cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean
- cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean
- cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean
- cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean
- cd $(SolutionDir)modules\output_stream &amp;&amp; call ant clean
- cd $(SolutionDir)modules\core &amp;&amp; call ant clean
- </NMakeCleanCommandLine>
+ cd $(SolutionDir)modules\localization  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\commons  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\renderer  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\action_binding  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\jvm  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\history_manager  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\completion  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\console  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\graphic_export  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\types  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\gui  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\graph  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\hdf5  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\core  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\xcos  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\helptools  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\javasci  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\ui_data  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\history_browser  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\scinotes  &amp;&amp; call ant clean
 -</NMakeCleanCommandLine>
++cd $(SolutionDir)modules\preferences  &amp;&amp; call ant clean</NMakeCleanCommandLine>
      <NMakeOutput>
      </NMakeOutput>
    </PropertyGroup>
@@@ -167,60 -163,54 +165,56 @@@ cd $(SolutionDir)modules\helptools &amp
  cd $(SolutionDir)modules\javasci &amp;&amp; call ant
  cd $(SolutionDir)modules\ui_data &amp;&amp; call ant
  cd $(SolutionDir)modules\history_browser &amp;&amp; call ant
- cd $(SolutionDir)modules\output_stream &amp;&amp; call ant
- cd $(SolutionDir)modules\core &amp;&amp; call ant
+ cd $(SolutionDir)modules\scinotes &amp;&amp; call ant
++cd $(SolutionDir)modules\preferences &amp;&amp; call ant
  </NMakeBuildCommandLine>
      <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\renderer &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
- cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\console &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\gui &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\types &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\graph &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\output_stream &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\core &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\renderer &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\jvm &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
+ cd $(SolutionDir)modules\console &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\types &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\gui &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\graph &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\core &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean &amp;&amp; call ant
++cd $(SolutionDir)modules\preferences &amp;&amp; call ant clean &amp;&amp; call ant
  </NMakeReBuildCommandLine>
      <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\renderer &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
- cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean
- cd $(SolutionDir)modules\console &amp;&amp; call ant clean
- cd $(SolutionDir)modules\gui &amp;&amp; call ant clean
- cd $(SolutionDir)modules\types &amp;&amp; call ant clean
- cd $(SolutionDir)modules\graph &amp;&amp; call ant clean
- cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean
- cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean
- cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean
- cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean
- cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean
- cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean
- cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean
- cd $(SolutionDir)modules\output_stream &amp;&amp; call ant clean
- cd $(SolutionDir)modules\core &amp;&amp; call ant clean
- </NMakeCleanCommandLine>
+ cd $(SolutionDir)modules\localization  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\commons  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\renderer  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\action_binding  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\jvm  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\history_manager  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\completion  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\console  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\graphic_export  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\types  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\gui  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\graph  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\hdf5  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\core  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\xcos  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\helptools  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\javasci  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\ui_data  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\history_browser  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\scinotes  &amp;&amp; call ant clean
 -</NMakeCleanCommandLine>
++cd $(SolutionDir)modules\preferences  &amp;&amp; call ant clean</NMakeCleanCommandLine>
      <NMakeOutput>
      </NMakeOutput>
    </PropertyGroup>
@@@ -246,60 -237,54 +241,56 @@@ cd $(SolutionDir)modules\helptools &amp
  cd $(SolutionDir)modules\javasci &amp;&amp; call ant
  cd $(SolutionDir)modules\ui_data &amp;&amp; call ant
  cd $(SolutionDir)modules\history_browser &amp;&amp; call ant
- cd $(SolutionDir)modules\output_stream &amp;&amp; call ant
- cd $(SolutionDir)modules\core &amp;&amp; call ant
+ cd $(SolutionDir)modules\scinotes &amp;&amp; call ant
++cd $(SolutionDir)modules\preferences &amp;&amp; call ant
  </NMakeBuildCommandLine>
      <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\renderer &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
- cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\console &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\gui &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\types &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\graph &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\output_stream &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\core &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\renderer &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\jvm &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
+ cd $(SolutionDir)modules\console &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\types &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\gui &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\graph &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\core &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean &amp;&amp; call ant
++cd $(SolutionDir)modules\preferences &amp;&amp; call ant clean &amp;&amp; call ant
  </NMakeReBuildCommandLine>
      <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\renderer &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
- cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean
- cd $(SolutionDir)modules\console &amp;&amp; call ant clean
- cd $(SolutionDir)modules\gui &amp;&amp; call ant clean
- cd $(SolutionDir)modules\types &amp;&amp; call ant clean
- cd $(SolutionDir)modules\graph &amp;&amp; call ant clean
- cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean
- cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean
- cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean
- cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean
- cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean
- cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean
- cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean
- cd $(SolutionDir)modules\output_stream &amp;&amp; call ant clean
- cd $(SolutionDir)modules\core &amp;&amp; call ant clean
- </NMakeCleanCommandLine>
+ cd $(SolutionDir)modules\localization  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\commons  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\renderer  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\action_binding  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\jvm  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\history_manager  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\completion  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\console  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\graphic_export  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\types  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\gui  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\graph  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\hdf5  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\core  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\xcos  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\helptools  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\javasci  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\ui_data  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\history_browser  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\scinotes  &amp;&amp; call ant clean
 -</NMakeCleanCommandLine>
++cd $(SolutionDir)modules\preferences  &amp;&amp; call ant clean</NMakeCleanCommandLine>
      <NMakeOutput>
      </NMakeOutput>
    </PropertyGroup>
@@@ -325,60 -311,54 +317,56 @@@ cd $(SolutionDir)modules\helptools &amp
  cd $(SolutionDir)modules\javasci &amp;&amp; call ant
  cd $(SolutionDir)modules\ui_data &amp;&amp; call ant
  cd $(SolutionDir)modules\history_browser &amp;&amp; call ant
- cd $(SolutionDir)modules\output_stream &amp;&amp; call ant
- cd $(SolutionDir)modules\core &amp;&amp; call ant
+ cd $(SolutionDir)modules\scinotes &amp;&amp; call ant
++cd $(SolutionDir)modules\preferences &amp;&amp; call ant
  </NMakeBuildCommandLine>
      <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\renderer &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
- cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\console &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\gui &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\types &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\graph &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\output_stream &amp;&amp; call ant clean &amp;&amp;  call ant
- cd $(SolutionDir)modules\core &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\renderer &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\jvm &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
+ cd $(SolutionDir)modules\console &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\types &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\gui &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\graph &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\core &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean &amp;&amp; call ant
+ cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean &amp;&amp; call ant
++cd $(SolutionDir)modules\preferences &amp;&amp; call ant clean &amp;&amp; call ant
  </NMakeReBuildCommandLine>
      <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\renderer &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
- cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean
- cd $(SolutionDir)modules\console &amp;&amp; call ant clean
- cd $(SolutionDir)modules\gui &amp;&amp; call ant clean
- cd $(SolutionDir)modules\types &amp;&amp; call ant clean
- cd $(SolutionDir)modules\graph &amp;&amp; call ant clean
- cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean
- cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean
- cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean
- cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean
- cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean
- cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean
- cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean
- cd $(SolutionDir)modules\output_stream &amp;&amp; call ant clean
- cd $(SolutionDir)modules\core &amp;&amp; call ant clean
- </NMakeCleanCommandLine>
+ cd $(SolutionDir)modules\localization  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\commons  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\renderer  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\action_binding  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\jvm  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\history_manager  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\completion  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\console  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\graphic_export  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\types  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\gui  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\graph  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\hdf5  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\core  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\xcos  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\helptools  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\javasci  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\ui_data  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\history_browser  &amp;&amp; call ant clean
+ cd $(SolutionDir)modules\scinotes  &amp;&amp; call ant clean
 -</NMakeCleanCommandLine>
++cd $(SolutionDir)modules\preferences  &amp;&amp; call ant clean</NMakeCleanCommandLine>
      <NMakeOutput>
      </NMakeOutput>
    </PropertyGroup>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -18,8 -18,8 +18,6 @@@
  /* an interesting article about HeapAlloc,malloc, and OctAlloc */
  /* bench show that HeapAlloc is faster than malloc on Windows */
  /* http://denisbider.blogspot.com/2007/10/heap-allocation-on-multi-core-systems.html */
--/* With VS 2010, we no more need to use heap, standard malloc is enough fast and compatible */
--/* since malloc of VC runtime uses heapAlloc in internal */
  /*-----------------------------------------------------------------------------------*/
  #define FREE_FLAGS 0
  /*-----------------------------------------------------------------------------------*/
@@@ -32,7 -32,7 +30,7 @@@ IMPORT_EXPORT_MALLOC_DLL LPVOID MyHeapR
        {
                _try
                {
--                      NewPointer = realloc(lpAddress, dwSize);
++                      NewPointer = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,lpAddress,dwSize);
                }
                _except (EXCEPTION_EXECUTE_HANDLER)
                {
@@@ -40,8 -40,8 +38,7 @@@
        }
        else
        {
--              NewPointer = malloc(dwSize);
--        NewPointer = memset (NewPointer, 0, dwSize);
++              NewPointer = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,dwSize);
  
                if (NewPointer == NULL)
                {
@@@ -63,8 -63,8 +60,7 @@@ IMPORT_EXPORT_MALLOC_DLL LPVOID MyHeapA
        {
                _try
                {
--                      NewPointer = malloc(dwSize);
--            NewPointer = memset (NewPointer, 0, dwSize);
++                      NewPointer = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,dwSize);
                }
                _except (EXCEPTION_EXECUTE_HANDLER)
                {
@@@ -88,8 -88,8 +84,7 @@@
                #endif
                _try
                {
--            NewPointer = malloc(dwSize);
--            NewPointer = memset (NewPointer, 0, dwSize);
++                      NewPointer = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,dwSize);
                }
                _except (EXCEPTION_EXECUTE_HANDLER)
                {
@@@ -102,7 -102,7 +97,7 @@@ IMPORT_EXPORT_MALLOC_DLL void MyHeapFre
  {
        _try
        {
--        free(lpAddress);
++              HeapFree(GetProcessHeap(),FREE_FLAGS,lpAddress);
        }
        _except (EXCEPTION_EXECUTE_HANDLER)
        {
  /*-----------------------------------------------------------------------------------*/
  IMPORT_EXPORT_MALLOC_DLL LPVOID MyVirtualAlloc(SIZE_T dwSize,char *fichier,int ligne)
  {
--      LPVOID NewPointer = NULL;
++      LPVOID NewPointer=NULL;
  
        if (dwSize>0)
        {
                _try
                {
--            NewPointer = malloc(dwSize);
--            NewPointer = memset (NewPointer, 0, dwSize);
++                      NewPointer = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,dwSize);
                }
                _except (EXCEPTION_EXECUTE_HANDLER)
                {
                }
  
--              if (NewPointer == NULL)
++              if (NewPointer==NULL)
                {
                        #ifdef _DEBUG
                        char MsgError[1024];
--                      wsprintf(MsgError,"MALLOC ( 1) Error File %s Line %d ",fichier,ligne);
++                      wsprintf(MsgError,"MALLOC (VirtualAlloc 1) Error File %s Line %d ",fichier,ligne);
                        MessageBox(NULL,MsgError,"Error",MB_ICONSTOP | MB_OK);
                        #endif
                }
        {
                #ifdef _DEBUG
                char MsgError[1024];
--              wsprintf(MsgError,"MALLOC (2) Error File %s Line %d ",fichier,ligne);
++              wsprintf(MsgError,"MALLOC (VirtualAlloc 2) Error File %s Line %d ",fichier,ligne);
                MessageBox(NULL,MsgError,"Error",MB_ICONSTOP | MB_OK);
                #endif
  
                _try
                {
--            NewPointer = malloc(dwSize);
--            NewPointer = memset (NewPointer, 0, dwSize);
++                      NewPointer = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,dwSize);
                }
                _except (EXCEPTION_EXECUTE_HANDLER)
                {
@@@ -166,7 -166,7 +159,7 @@@ IMPORT_EXPORT_MALLOC_DLL void MyVirtual
        {
                _try
                {
--            free(lpAddress);
++                      HeapFree(GetProcessHeap(),FREE_FLAGS,lpAddress);
                }
                _except (EXCEPTION_EXECUTE_HANDLER)
                {
        }
  }
  /*-----------------------------------------------------------------------------------*/
++
@@@ -87,15 -85,9 +85,10 @@@ parallel 
  modules_manager \
  ui_data \
  history_browser \
 +preferences \
- xml
- #umfpack
- #if MPI
- #SUBDIRS += mpi
- #endif
+ xml \
+ libscilab-cli \
+ types
  
  if XCOS
  SUBDIRS += scicos_blocks
@@@ -214,8 -205,8 +206,9 @@@ ENGINE_LIBS_DYNAMIC_LOAD = 
        $(top_builddir)/modules/umfpack/libsciumfpack.la \
        $(top_builddir)/modules/matio/libscimatio.la \
        $(top_builddir)/modules/helptools/libscihelptools.la \
 -      $(top_builddir)/modules/xml/libscixml.la \
 -      $(top_builddir)/modules/parallel/libsciparallel.la
++        $(top_builddir)/modules/xml/libscixml.la \
 +      $(top_builddir)/modules/parallel/libsciparallel.la \
 +      $(top_builddir)/modules/preferences/libscipreferences.la
  
  
  # Core modules
@@@ -156,21 -146,20 +146,20 @@@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARG
        distdir
  ETAGS = etags
  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 \
-       differential_equations cacsd polynomials boolean double io \
-       intersci signal_processing core call_scilab sound time sparse \
-       windows_tools functions overloading maple2scilab m2sci texmacs \
-       development_tools compatibility_functions helptools fftw \
-       umfpack demo_tools genetic_algorithms simulated_annealing \
-       parameters matio atoms types hdf5 graph xcos scinotes parallel \
-       modules_manager ui_data history_browser xml preferences \
-       scicos_blocks scicos . javasci
+ DIST_SUBDIRS = prebuildjava fileio mexlib functions parameters boolean \
+       cacsd signal_processing core call_scilab api_scilab \
+       data_structures differential_equations double \
+       elementary_functions integer intersci io linear_algebra \
+       localization polynomials special_functions time windows_tools \
+       sparse completion history_manager output_stream string hdf5 \
+       fftw statistics dynamic_link console arnoldi spreadsheet \
+       tclsci commons jvm action_binding renderer graphic_export gui \
+       graphics optimization symbolic randlib interpolation sound \
+       overloading m2sci development_tools compatibility_functions \
+       helptools umfpack demo_tools genetic_algorithms \
+       simulated_annealing matio atoms graph xcos scinotes parallel \
 -      modules_manager ui_data history_browser xml libscilab-cli \
 -      types scicos_blocks scicos . javasci
++      modules_manager ui_data history_browser preferences xml \
++      libscilab-cli types scicos_blocks scicos . javasci
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
    dir0=`pwd`; \
@@@ -229,6 -220,6 +220,7 @@@ CYGPATH_W = @CYGPATH_W
  DEFS = @DEFS@
  DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
  DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
  DOCBOOK_ROOT = @DOCBOOK_ROOT@
  DSYMUTIL = @DSYMUTIL@
  DUMPBIN = @DUMPBIN@
@@@ -307,6 -299,6 +300,7 @@@ LTLIBINTL = @LTLIBINTL
  LTLIBOBJS = @LTLIBOBJS@
  MAINT = @MAINT@
  MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
  MATIO_CFLAGS = @MATIO_CFLAGS@
  MATIO_ENABLE = @MATIO_ENABLE@
  MATIO_LIBS = @MATIO_LIBS@
@@@ -395,6 -387,6 +389,7 @@@ abs_builddir = @abs_builddir
  abs_srcdir = @abs_srcdir@
  abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
  ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@@ -445,21 -437,20 +440,21 @@@ target_alias = @target_alias
  top_build_prefix = @top_build_prefix@
  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 \
-       differential_equations cacsd polynomials boolean double io \
-       intersci signal_processing core call_scilab interpolation \
-       sound time randlib sparse windows_tools functions overloading \
-       maple2scilab m2sci texmacs development_tools \
-       compatibility_functions helptools fftw umfpack demo_tools \
-       genetic_algorithms simulated_annealing parameters matio atoms \
-       types hdf5 graph xcos scinotes parallel modules_manager \
-       ui_data history_browser xml preferences $(am__append_1) scicos . \
+ SUBDIRS = prebuildjava fileio mexlib functions parameters boolean \
+       cacsd signal_processing core call_scilab api_scilab \
+       data_structures differential_equations double \
+       elementary_functions integer intersci io linear_algebra \
+       localization polynomials special_functions time windows_tools \
+       sparse completion history_manager output_stream string hdf5 \
+       fftw statistics dynamic_link console arnoldi spreadsheet \
+       tclsci commons jvm action_binding renderer graphic_export gui \
+       graphics optimization symbolic randlib interpolation sound \
+       overloading m2sci development_tools compatibility_functions \
+       helptools umfpack demo_tools genetic_algorithms \
+       simulated_annealing matio atoms hdf5 graph xcos scinotes \
 -      parallel modules_manager ui_data history_browser xml \
 -      libscilab-cli types $(am__append_1) scicos . $(am__append_2)
++      parallel modules_manager ui_data history_browser preferences \
++      xml libscilab-cli types $(am__append_1) scicos . \
 +      $(am__append_2)
  
  #### Basic files ####
  libscilab_la_rootdir = $(mydatadir)
@@@ -554,8 -543,8 +547,9 @@@ ENGINE_LIBS_DYNAMIC_LOAD = 
        $(top_builddir)/modules/umfpack/libsciumfpack.la \
        $(top_builddir)/modules/matio/libscimatio.la \
        $(top_builddir)/modules/helptools/libscihelptools.la \
 -      $(top_builddir)/modules/xml/libscixml.la \
 -      $(top_builddir)/modules/parallel/libsciparallel.la
++        $(top_builddir)/modules/xml/libscixml.la \
 +      $(top_builddir)/modules/parallel/libsciparallel.la \
 +      $(top_builddir)/modules/preferences/libscipreferences.la
  
  
  # Core modules
  <?xml version="1.0"?>
  <menubar>
-    <!-- All "main" menus are disabled when created and then enabled in scilab.start file after all macros are loaded -->
-    <!-- The accelerator can be "control shift A" or "control A" or "meta A" or "OSSCKEY A" where oskey means "OS ShortCut key"
+   <!-- All "main" menus are disabled when created and then enabled in scilab.start file after all macros are loaded -->
+   <!-- The accelerator can be "control shift A" or "control A" or "meta A" or "OSSCKEY A" where oskey means "OS ShortCut key"
        and is replaced by the good key (control for Unix/Windows OS and meta for Mac) -->
-  
-    <!-- File menu -->
-    <menu label="&amp;File" enabled="false">
-         <submenu label="&amp;Execute..." accelerator="OSSCKEY E">
-             <callback
-             instruction='
-               %fileToExec = uigetfile("*.sc*", "", gettext("Select a file to execute"));
-               if ~(%fileToExec == "") then
-                 exec(%fileToExec);
-                 disp(msprintf(gettext("Execution done.\n")));
-               end
-               clear("%fileToExec");'
-             type="0"/>
-         </submenu>
-         <separator/>
-         <submenu label="&amp;Open a file..." accelerator="OSSCKEY O">
-             <callback
-             instruction='
-               %fileToOpen = uigetfile("*.sc*", "", gettext("Select a file to open with SciNotes"));
-               if ~(%fileToOpen == "") then
-                 editor(%fileToOpen);
-               end
-               clear("%fileToOpen");'
-             type="0"/>
-         </submenu>
-         <submenu label="&amp;Load environment..." accelerator="OSSCKEY L">
-             <callback
-             instruction='
-               %fileToLoad = uigetfile("*.sav", "", gettext("Select a file to load"));
-               if ~(%fileToLoad == "") then
-                 load(%fileToLoad);
-                 disp(msprintf(gettext("Environment loaded.\n")));
-               end
-               clear("%fileToLoad");'
-             type="0"/>
-         </submenu>
-         <submenu label="&amp;Save environment..." accelerator="OSSCKEY S">
-             <callback
-             instruction='
-               %fileToSave = uiputfile("*.sav", "", gettext("Select a file to write"));
-               if ~(%fileToSave == "") then
-                 if (fileparts(%fileToSave, "extension") == "") then
-                   %fileToSave = %fileToSave + ".sav";
-                 end
-                 save(%fileToSave);
-                 disp(msprintf(gettext("Environment saved.\n")));
-               end
-               clear("%fileToSave");'
-             type="0"/>
-         </submenu>
-         <separator/>
-         <submenu label="&amp;Change current directory...">
-             <callback
-             instruction='
-               %newDir = uigetdir(pwd(), gettext("Select a directory"));
-               if ~(%newDir == "") then
-                 cd(%newDir);
-               end
-               clear("%newDir");'
-             type="0"/>
-         </submenu>
-         <submenu label="&amp;Display current directory">
-             <callback instruction='if iswaitingforinput() then printf("\n%s\n\n%s\n",prompt(),pwd()); else printf("\n\n%s\n\n",pwd());end' type="0"/>
-         </submenu>
-         <separator/>
-         <submenu label="P&amp;age setup...">
-             <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.pageSetup' type="3"/>
-         </submenu>
-         <submenu label="&amp;Print..." accelerator="OSSCKEY P">
-             <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.printConsoleContents' type="3"/>
-         </submenu>
-         <separator/>
-         <submenu label="&amp;Quit" accelerator="OSSCKEY Q">
-             <callback instruction='exit();' type="0"/>
-         </submenu>
-     </menu>
-     <!-- Edit menu -->
-     <menu label="&amp;Edit" enabled="false">
-         <submenu label="C&amp;ut" accelerator="OSSCKEY X">
-             <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.cutConsoleSelection' type="3"/>
-         </submenu>
-         <submenu label="&amp;Copy" accelerator="OSSCKEY C">
-             <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.copyConsoleSelection' type="3"/>
-         </submenu>
-         <submenu label="&amp;Paste" accelerator="OSSCKEY V">
-             <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.pasteClipboardIntoConsole' type="3"/>
-         </submenu>
-         <separator/>
-         <submenu label="&amp;Empty clipboard">
-             <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.emptyClipboard' type="3"/>
-         </submenu>
-         <separator/>
-         <submenu label="&amp;Select all" accelerator="OSSCKEY A">
-             <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.selectAllConsoleContents' type="3"/>
-         </submenu>
-         <submenu label="P&amp;references">
-             <callback instruction='org.scilab.modules.preferences.XConfigManager.openPreferences' type="3"/>
-         </submenu>
-         <submenu label="User block W&amp;izard (tmp)">
-             <callback instruction='org.scilab.modules.preferences.XWizardManager.openUserBlockWizard' type="3"/>
-         </submenu>
-     </menu>
-     <!-- Preferences menu -->
-     <menu label="&amp;Preferences" enabled="false">
-         <submenu label="&amp;Colors">
-             <submenu label="Console &amp;Background...">
-                 <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.changeConsoleBackground' type="3"/>
-             </submenu>
-             <submenu label="Console &amp;Font...">
-                 <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.changeConsoleForeground' type="3"/>
-             </submenu>
-         </submenu>
-         <submenu label="&amp;Font...">
-             <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.changeConsoleFont' type="3"/>
-         </submenu>
-         <submenu label="Show/Hide &amp;Toolbar">
-               <callback
-               instruction='
-                 if toolbar(-1)=="on" then
-                   toolbar(-1, "off");
-                 else
-                   toolbar(-1, "on");
-                 end'
-               type="0"/>
-         </submenu>
-         <separator/>
-         <submenu label="Clear &amp;History">
-            <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.clearHistory' type="3"/>
-         </submenu>
-         <submenu label="Clear C&amp;onsole">
-           <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.clear' type="3"/>
-         </submenu>
-     </menu>
-     <!-- Control menu -->
-     <menu label="&amp;Control" enabled="false">
-         <submenu label="&amp;Resume">
-             <callback instruction='resume;' type="-2"/>
-         </submenu>
-         <submenu label="&amp;Abort">
-             <callback instruction='abort;' type="-2"/>
-         </submenu>
-         <submenu label="&amp;Interrupt">
-             <callback instruction='pause;' type="-2"/>
-         </submenu>
-     </menu>
-     <!-- Applications menu -->
-     <menu label="&amp;Applications" enabled="false">
-         <submenu label="&amp;SciNotes">
-             <callback instruction='editor();' type="0"/>
-         </submenu>
-         <separator/>
-         <submenu label="&amp;Xcos">
-             <callback instruction='if with_module("xcos") then xcos(); else disp(gettext("Please install xcos module.")); end' type="0"/>
-         </submenu>
-         <separator/>
-         <submenu label="&amp;Matlab to Scilab translator">
-             <callback instruction='if with_module("m2sci") then mfile2sci(); else disp(gettext("Please install m2sci module.")); end' type="0"/>
-         </submenu>
-         <separator/>
-         <submenu label="M&amp;odule manager - ATOMS">
-             <callback instruction='if with_module("atoms") then atomsGui(); else disp(gettext("Please install atoms module.")); end' type="0"/>
-         </submenu>
-         <separator/>
-         <submenu label="&amp;Variable Browser">
-             <callback instruction='browsevar()' type="0"/>
-         </submenu>
-         <separator/>
-         <submenu label="&amp;Command History">
-             <callback instruction='org.scilab.modules.history_browser.CommandHistory.toggleVisibility' type="3"/>
-         </submenu>
-     </menu>
-     <!-- Help menu -->
-     <menu label="&amp;?" enabled="false">
-         <submenu label="Scilab &amp;Help" accelerator="F1">
-             <callback instruction='help();' type="0"/>
-         </submenu>
-         <separator/>
-         <submenu label="Scilab &amp;Demonstrations">
-              <callback instruction='demo_gui();' type="0"/>
-         </submenu>
-         <separator/>
-         <submenu label="&amp;Links">
-             <submenu label="Scilab &amp;Web Site">
-                 <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.openScilabWebSite' type="3"/>
-             </submenu>
-             <separator/>
-             <submenu label="Scilab &amp;Online Help">
-                 <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.openOnlineHelp' type="3"/>
-             </submenu>
-             <submenu label="Scilab &amp;Wiki">
-                 <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.openWiki' type="3"/>
-             </submenu>
-             <separator/>
-             <submenu label="Scilab &amp;ATOMS Web Site">
-                 <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.openAtomsScilab' type="3"/>
-             </submenu>
-             <submenu label="&amp;File Exchange">
-                 <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.openFileExchange' type="3"/>
-             </submenu>
-             <submenu label="&amp;Mailing lists">
-                 <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.openMailingList' type="3"/>
-             </submenu>
-             <separator/>
-             <submenu label="&amp;Forge">
-                 <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.openForge' type="3"/>
-             </submenu>
-             <submenu label="&amp;Bugs And Requests">
-                 <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.openBugzilla' type="3"/>
-             </submenu>
-         </submenu>
-         <separator/>
-         <submenu label="&amp;About Scilab..." accelerator="shift F1">
-               <callback instruction='about()' type="0"/>
-         </submenu>
-     </menu>
+   <!-- File menu -->
+   <menu label="&amp;File" enabled="false">
+     <submenu label="&amp;Execute..." accelerator="OSSCKEY E">
+       <callback instruction="               %fileToExec = uigetfile(&quot;*.sc*&quot;, &quot;&quot;, gettext(&quot;Select a file to execute&quot;));               if ~(%fileToExec == &quot;&quot;) then                 exec(%fileToExec);                 disp(msprintf(gettext(&quot;Execution done.\n&quot;)));               end               clear(&quot;%fileToExec&quot;);" type="0"/>
+     </submenu>
+     <separator/>
+     <submenu label="&amp;Open a file..." accelerator="OSSCKEY O">
+       <callback instruction="               %fileToOpen = uigetfile(&quot;*.sc*&quot;, &quot;&quot;, gettext(&quot;Select a file to open with SciNotes&quot;));               if ~(%fileToOpen == &quot;&quot;) then                 editor(%fileToOpen);               end               clear(&quot;%fileToOpen&quot;);" type="0"/>
+     </submenu>
+     <submenu label="&amp;Load environment..." accelerator="OSSCKEY L">
+       <callback instruction="               %fileToLoad = uigetfile(&quot;*.sav&quot;, &quot;&quot;, gettext(&quot;Select a file to load&quot;));               if ~(%fileToLoad == &quot;&quot;) then                 load(%fileToLoad);                 disp(msprintf(gettext(&quot;Environment loaded.\n&quot;)));               end               clear(&quot;%fileToLoad&quot;);" type="0"/>
+     </submenu>
+     <submenu label="&amp;Save environment..." accelerator="OSSCKEY S">
+       <callback instruction="               %fileToSave = uiputfile(&quot;*.sav&quot;, &quot;&quot;, gettext(&quot;Select a file to write&quot;));               if ~(%fileToSave == &quot;&quot;) then                 if (fileparts(%fileToSave, &quot;extension&quot;) == &quot;&quot;) then                   %fileToSave = %fileToSave + &quot;.sav&quot;;                 end                 save(%fileToSave);                 disp(msprintf(gettext(&quot;Environment saved.\n&quot;)));               end               clear(&quot;%fileToSave&quot;);" type="0"/>
+     </submenu>
+     <separator/>
+     <submenu label="&amp;Change current directory...">
+       <callback instruction="               %newDir = uigetdir(pwd(), gettext(&quot;Select a directory&quot;));               if ~(%newDir == &quot;&quot;) then                 cd(%newDir);               end               clear(&quot;%newDir&quot;);" type="0"/>
+     </submenu>
+     <submenu label="&amp;Display current directory">
+       <callback instruction="if iswaitingforinput() then printf(&quot;\n%s\n\n%s\n&quot;,prompt(),pwd()); else printf(&quot;\n\n%s\n\n&quot;,pwd());end" type="0"/>
+     </submenu>
+     <separator/>
+     <submenu label="P&amp;age setup...">
+       <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.pageSetup" type="3"/>
+     </submenu>
+     <submenu label="&amp;Print..." accelerator="OSSCKEY P">
+       <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.printConsoleContents" type="3"/>
+     </submenu>
+     <separator/>
+     <submenu label="&amp;Quit" accelerator="OSSCKEY Q">
+       <callback instruction="exit();" type="0"/>
+     </submenu>
+   </menu>
+   <!-- Edit menu -->
+   <menu label="&amp;Edit" enabled="false">
+     <submenu label="C&amp;ut" accelerator="OSSCKEY X">
+       <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.cutConsoleSelection" type="3"/>
+     </submenu>
+     <submenu label="&amp;Copy" accelerator="OSSCKEY C">
+       <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.copyConsoleSelection" type="3"/>
+     </submenu>
+     <submenu label="&amp;Paste" accelerator="OSSCKEY V">
+       <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.pasteClipboardIntoConsole" type="3"/>
+     </submenu>
+     <separator/>
+     <submenu label="&amp;Empty clipboard">
+       <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.emptyClipboard" type="3"/>
+     </submenu>
+     <separator/>
+     <submenu label="&amp;Select all" accelerator="OSSCKEY A">
+       <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.selectAllConsoleContents" type="3"/>
+     </submenu>
++    <submenu label="P&amp;references">
++      <callback instruction='org.scilab.modules.preferences.XConfigManager.openPreferences' type="3"/>
++    </submenu>
++    <submenu label="User block W&amp;izard (tmp)">
++      <callback instruction='org.scilab.modules.preferences.XWizardManager.openUserBlockWizard' type="3"/>
++    </submenu>    
+   </menu>
+   <!-- Preferences menu -->
+   <menu label="&amp;Preferences" enabled="false">
+     <submenu label="&amp;Colors">
+       <submenu label="Console &amp;Background...">
+         <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.changeConsoleBackground" type="3"/>
+       </submenu>
+       <submenu label="Console &amp;Font...">
+         <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.changeConsoleForeground" type="3"/>
+       </submenu>
+     </submenu>
+     <submenu label="&amp;Font...">
+       <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.changeConsoleFont" type="3"/>
+     </submenu>
+     <submenu label="Show/Hide &amp;Toolbar">
+       <callback instruction="                 if toolbar(-1)==&quot;on&quot; then                   toolbar(-1, &quot;off&quot;);                 else                   toolbar(-1, &quot;on&quot;);                 end" type="0"/>
+     </submenu>
+     <separator/>
+     <submenu label="Clear &amp;History">
+       <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.clearHistory" type="3"/>
+     </submenu>
+     <submenu label="Clear C&amp;onsole">
+       <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.clear" type="3"/>
+     </submenu>
+   </menu>
+   <!-- Control menu -->
+   <menu label="&amp;Control" enabled="false">
+     <submenu label="&amp;Resume">
+       <callback instruction="resume;" type="-2"/>
+     </submenu>
+     <submenu label="&amp;Abort">
+       <callback instruction="abort;" type="-2"/>
+     </submenu>
+     <submenu label="&amp;Interrupt">
+       <callback instruction="pause;" type="-2"/>
+     </submenu>
+   </menu>
+   <!-- Applications menu -->
+   <menu label="&amp;Applications" enabled="false">
+     <submenu label="&amp;SciNotes">
+       <callback instruction="editor();" type="0"/>
+     </submenu>
+     <separator/>
+     <submenu label="&amp;Xcos">
+       <callback instruction="if with_module(&quot;xcos&quot;) then xcos(); else disp(gettext(&quot;Please install xcos module.&quot;)); end" type="0"/>
+     </submenu>
+     <separator/>
+     <submenu label="&amp;Matlab to Scilab translator">
+       <callback instruction="if with_module(&quot;m2sci&quot;) then mfile2sci(); else disp(gettext(&quot;Please install m2sci module.&quot;)); end" type="0"/>
+     </submenu>
+     <separator/>
+     <submenu label="M&amp;odule manager - ATOMS">
+       <callback instruction="if with_module(&quot;atoms&quot;) then atomsGui(); else disp(gettext(&quot;Please install atoms module.&quot;)); end" type="0"/>
+     </submenu>
+     <separator/>
+     <submenu label="&amp;Variable Browser">
+       <callback instruction="browsevar()" type="0"/>
+     </submenu>
+     <separator/>
+     <submenu label="&amp;Command History">
+       <callback instruction="org.scilab.modules.history_browser.CommandHistory.setVisible" type="3"/>
+     </submenu>
+     <separator/>
+     <submenu label="&amp;File Browser">
+       <callback instruction="filebrowser()" type="0"/>
+     </submenu>
+   </menu>
+   <!-- Help menu -->
+   <menu label="&amp;?" enabled="false">
+     <submenu label="Scilab &amp;Help" accelerator="F1">
+       <callback instruction="help();" type="0"/>
+     </submenu>
+     <separator/>
+     <submenu label="Scilab &amp;Demonstrations">
+       <callback instruction="demo_gui();" type="0"/>
+     </submenu>
+     <separator/>
+     <submenu label="&amp;Links">
+       <submenu label="Scilab &amp;Web Site">
+         <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.openScilabWebSite" type="3"/>
+       </submenu>
+       <separator/>
+       <submenu label="Scilab &amp;Online Help">
+         <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.openOnlineHelp" type="3"/>
+       </submenu>
+       <submenu label="Scilab &amp;Wiki">
+         <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.openWiki" type="3"/>
+       </submenu>
+       <separator/>
+       <submenu label="Scilab &amp;ATOMS Web Site">
+         <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.openAtomsScilab" type="3"/>
+       </submenu>
+       <submenu label="&amp;File Exchange">
+         <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.openFileExchange" type="3"/>
+       </submenu>
+       <submenu label="&amp;Mailing Lists">
+         <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.openMailingList" type="3"/>
+       </submenu>
+       <submenu label="Mailing Lists &amp;Archives">
+         <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.openMailingListArchives" type="3"/>
+       </submenu>
+       <separator/>
+       <submenu label="&amp;Forge">
+         <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.openForge" type="3"/>
+       </submenu>
+       <submenu label="&amp;Bugs And Requests">
+         <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.openBugzilla" type="3"/>
+       </submenu>
+     </submenu>
+     <separator/>
+     <submenu label="&amp;Scilab Enterprises">
+       <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.openSE" type="3"/>
+     </submenu>
+     <separator/>
+     <submenu label="&amp;About Scilab..." accelerator="shift F1">
+       <callback instruction="about()" type="0"/>
+     </submenu>
+   </menu>
  </menubar>
++
@@@ -100,6 -102,9 +102,13 @@@ library.history_browser.name=org.scilab
  library.output_stream.dir=${modules.dir}/output_stream/${build.jar.dir}/
  library.output_stream.name=org.scilab.modules.output_stream.jar
  
 +library.preferences.dir=${modules.dir}/preferences/${build.jar.dir}/
 +library.preferences.name=org.scilab.modules.preferences.jar
 +
+ build_hdf5=@HDF5_ENABLE@
+ build_javasci=@JAVASCI_ENABLE@
+ build_xcos=@xcos_ENABLE@
++
Simple merge
Simple merge