Merge remote-tracking branch 'refs/remotes/origin/master' into preferences 83/5183/1
Allan CORNET [Mon, 10 Oct 2011 09:38:06 +0000 (11:38 +0200)]
Conflicts:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure
scilab/configure.ac
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/tools/innosetup/files.iss

Change-Id: Ibb82afcd6cfdc6393d043f8e61a67ff02cc20251

16 files changed:
1  2 
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/build.incl.xml
scilab/configure
scilab/configure.ac
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/etc/scilab.start
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/preferences/sci_gateway/preferences_gateway.xml
scilab/tools/innosetup/files.iss

@@@ -579,10 -631,8 +579,12 @@@ 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}") = "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}"
+ 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
 +              {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,10 -629,8 +577,12 @@@ 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}") = "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}"
+ 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
 +              {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
Simple merge
@@@ -36851,8 -37176,8 +37176,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/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/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/preferences/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/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/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/xml/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/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/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/xml/Makefile modules/preferences/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
  # ie we detect module which ends with _yasp
      "modules/parallel/Makefile") CONFIG_FILES="$CONFIG_FILES modules/parallel/Makefile" ;;
      "modules/modules_manager/Makefile") CONFIG_FILES="$CONFIG_FILES modules/modules_manager/Makefile" ;;
      "modules/history_browser/Makefile") CONFIG_FILES="$CONFIG_FILES modules/history_browser/Makefile" ;;
 +    "modules/preferences/Makefile") CONFIG_FILES="$CONFIG_FILES modules/preferences/Makefile" ;;
+     "modules/xml/Makefile") CONFIG_FILES="$CONFIG_FILES modules/xml/Makefile" ;;
      "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
      "libs/Makefile") CONFIG_FILES="$CONFIG_FILES libs/Makefile" ;;
      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
@@@ -1787,7 -1791,7 +1791,8 @@@ modules/graph/Makefil
  modules/parallel/Makefile
  modules/modules_manager/Makefile
  modules/history_browser/Makefile
 +modules/preferences/Makefile
+ modules/xml/Makefile
  modules/Makefile
  libs/Makefile
  Makefile
@@@ -87,6 -87,6 +87,7 @@@
  <module name="parallel" activate="yes"/>
  <module name="modules_manager" activate="yes"/>
  <module name="history_browser" activate="@JAVA_ENABLE@"/>
 +<module name="preferences" activate="@GUI_ENABLE@"/>
+ <module name="xml" activate="yes"/>
  </modules>
  
@@@ -89,6 -89,6 +89,7 @@@
  <module name="parallel" activate="yes"/>
  <module name="modules_manager" activate="yes"/>
  <module name="history_browser" activate="yes"/>
 +<module name="preferences" activate="yes"/>
+ <module name="xml" activate="yes"/>
  <!-- comments -->
  </modules>
Simple merge
@@@ -87,8 -87,8 +87,10 @@@ parallel 
  modules_manager \
  ui_data \
  history_browser \
- preferences
++preferences \
+ xml
 +
  #umfpack
  
  #if MPI
@@@ -167,8 -168,8 +168,9 @@@ DIST_SUBDIRS = output_stream arnoldi el
        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 preferences \
 -      modules_manager ui_data history_browser xml scicos_blocks \
 -      scicos . javasci
++      modules_manager ui_data history_browser xml preferences \
 +      scicos_blocks scicos . javasci
++
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
    dir0=`pwd`; \
@@@ -456,7 -457,7 +458,7 @@@ SUBDIRS = output_stream arnoldi element
        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 preferences $(am__append_1) scicos . \
 -      ui_data history_browser xml $(am__append_1) scicos . \
++      ui_data history_browser xml preferences $(am__append_1) scicos . \
        $(am__append_2)
  
  #### Basic files ####
@@@ -89,7 -89,7 +89,8 @@@
  /* 65 */                                              #include "dynamic_gateways.h" /* action_binding */
  /* 66 */                        #include "dynamic_parallel.h" /* parallel */
  /* 67 */                        #include "dynamic_gateways.h" /* ui_data */
- /* 68 */                        #include "dynamic_gateways.h" /* preferences */
+ /* 68 */                        #include "dynamic_gateways.h" /* xml */
++/* 69 */                        #include "dynamic_gateways.h" /* preferences */
  
  
  
@@@ -34,7 -34,7 +34,7 @@@ jmp_buf jmp_env
   ** Watch out the positions are crutial !!!
   ** @TODO : Make this less crappy...
   **/
--#define INTERFACES_MAX 68
++#define INTERFACES_MAX 69
  static OpTab Interfaces[INTERFACES_MAX] = {
      /* 01  */ {gw_user}, /* free position may be used */
      /* 02  */ {gw_linear_algebra},
      /* 65  */ {gw_dynamic_action_binding},
      /* 66  */ {gw_dynamic_parallel},
      /* 67  */ {gw_dynamic_ui_data},
-     /* 68  */ {gw_dynamic_preferences},
 -    /* 68  */ {gw_dynamic_xml}
++    /* 68  */ {gw_dynamic_xml},
++    /* 69  */ {gw_dynamic_preferences}
++
  };
  /*--------------------------------------------------------------------------*/
  /**
@@@ -385,21 -385,21 +385,37 @@@ int gw_dynamic_ui_data(void
          &ptr_gw_ui_data);
  }
  /*--------------------------------------------------------------------------*/
 +/* preferences module */
 +#define PREFERENCES_MODULE_NAME "preferences"
 +static DynLibHandle hPreferencesLib = NULL;
 +static PROC_GATEWAY ptr_gw_preferences = NULL;
 +static char* dynlibname_preferences = NULL;
 +static char* gatewayname_preferences = NULL;
 +/*--------------------------------------------------------------------------*/
 +int gw_dynamic_preferences(void)
 +{
 +    return gw_dynamic_generic(PREFERENCES_MODULE_NAME,
 +        &dynlibname_preferences,
 +        &gatewayname_preferences,
 +        &hPreferencesLib,
 +        &ptr_gw_preferences);
 +}
++/*--------------------------------------------------------------------------*/       
+ /* xml module */
+ #define XML_MODULE_NAME "xml"
+ static DynLibHandle hXmlLib = NULL;
+ static PROC_GATEWAY ptr_gw_xml = NULL;
+ static char* dynlibname_xml = NULL;
+ static char* gatewayname_xml = NULL;
+ /*--------------------------------------------------------------------------*/
+ int gw_dynamic_xml(void)
+ {
+     return gw_dynamic_generic(XML_MODULE_NAME,
+         &dynlibname_xml,
+         &gatewayname_xml,
+         &hXmlLib,
+         &ptr_gw_xml);
+ }
  /*--------------------------------------------------------------------------*/
  void freeAllDynamicGateways(void)
  {
          &hUi_dataLib,
          &ptr_gw_ui_data);
  
 +    freeDynamicGateway(&dynlibname_preferences,
 +        &gatewayname_preferences,
 +        &hPreferencesLib,
 +        &ptr_gw_preferences);
++
+     freeDynamicGateway(&dynlibname_xml,
+         &gatewayname_xml,
+         &hXmlLib,
+         &ptr_gw_xml);
++
  }
  /*--------------------------------------------------------------------------*/
  
@@@ -169,12 -169,13 +169,21 @@@ int gw_dynamic_graphic_export(void)
  int gw_dynamic_action_binding(void);
  
  /**
 +* preferences gateway
 +* preferences is loaded dynamically at runtime
 +* load gw_preferences in SCI/modules/preferences/sci_gateway/gw_preferences.c
 +*/
 +int gw_dynamic_preferences(void);
 +
++/**
+ * action_binding gateway
+ * action_binding is loaded dynamically at runtime
+ * load gw_action_binding in SCI/modules/xml/sci_gateway/gw_xml.c
+ */
+ int gw_dynamic_xml(void);
++
  #endif /* __DYNAMIC_GATEWAYS_H__ */
  /*--------------------------------------------------------------------------*/
  
index 64f0d1e,0000000..cfc0853
mode 100644,000000..100644
--- /dev/null
@@@ -1,27 -1,0 +1,27 @@@
 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 +
 +<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
 +<GATEWAY name="preferences">
 +<!-- =================== -->
 +<!--
 + Scilab
 + Interface description. In this file, we define the list of the function which
 + will be available into Scilab and the link to the "native" function.
 +
 + gatewayId is the position in the hashtable 'Interfaces' defined in the
 + file SCI/modules/core/src/c/callinterf.h
 +
 + primitiveId is the position in the hashtable '<module>Table Tab[]' defined
 + in the file modules/<module>/sci_gateway/c/gw_<module>.c
 +
 + primitiveName is the name of the Scilab function
 +
 + @author Allan CORNET
 + @date DIGITEO 2009
 + ===================
 + Don't touch if you do not know what you are doing
 +-->
 +<!-- =================== -->
- <PRIMITIVE gatewayId="68" primitiveId="1" primitiveName="addToolboxInfos" />
- <PRIMITIVE gatewayId="68" primitiveId="2" primitiveName="removeToolboxInfos" />
++<PRIMITIVE gatewayId="69" primitiveId="1" primitiveName="addToolboxInfos" />
++<PRIMITIVE gatewayId="69" primitiveId="2" primitiveName="removeToolboxInfos" />
 +</GATEWAY>
@@@ -93,6 -93,6 +93,7 @@@
  #include BinariesSourcePath + "\modules\modules_manager\modules_manager.iss"
  #include BinariesSourcePath + "\modules\ui_data\ui_data.iss"
  #include BinariesSourcePath + "\modules\history_browser\history_browser.iss"
+ #include BinariesSourcePath + "\modules\xml\xml.iss"
 +#include BinariesSourcePath + "\modules\preferences\preferences.iss"
  ;-------------------------------------------------------------------------------
  ;