move sci_gateway/<module> to sci_gateway/<module>_gateway.xml
Allan Cornet [Wed, 11 Apr 2007 07:53:52 +0000 (07:53 +0000)]
update LoadFunctionsTab.c (use libxml2)

106 files changed:
scilab/modules/arnoldi/Makefile.am
scilab/modules/arnoldi/arnoldi.iss
scilab/modules/arnoldi/sci_gateway/arnoldi_gateway.xml
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/boolean.iss
scilab/modules/boolean/sci_gateway/boolean_gateway.xml
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/cacsd.iss
scilab/modules/cacsd/sci_gateway/cacsd_gateway.xml
scilab/modules/core/Makefile.am
scilab/modules/core/core.iss
scilab/modules/core/includes/GetXmlFileEncoding.h [new file with mode: 0644]
scilab/modules/core/sci_gateway/core_gateway.xml
scilab/modules/core/src/c/GetXmlFileEncoding.c [new file with mode: 0644]
scilab/modules/core/src/c/LoadFunctionsTab.c
scilab/modules/core/src/c/LoadFunctionsTab.h
scilab/modules/core/src/c/core.vcproj
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/data_structures.iss
scilab/modules/data_structures/sci_gateway/data_structures_gateway.xml
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/differential_equations.iss
scilab/modules/differential_equations/sci_gateway/differential_equations_gateway.xml
scilab/modules/elementaries_functions/Makefile.am
scilab/modules/elementaries_functions/elementaries_functions.iss
scilab/modules/elementaries_functions/sci_gateway/elementaries_functions_gateway.xml
scilab/modules/fftw/Makefile.am
scilab/modules/fftw/fftw.iss
scilab/modules/fftw/sci_gateway/fftw_gateway.xml
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/fileio.iss
scilab/modules/fileio/sci_gateway/fileio_gateway.xml
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/graphics.iss
scilab/modules/graphics/sci_gateway/graphics_gateway.xml
scilab/modules/gui/Makefile.am
scilab/modules/gui/gui.iss
scilab/modules/gui/sci_gateway/gui_gateway.xml
scilab/modules/integer/Makefile.am
scilab/modules/integer/integer.iss
scilab/modules/integer/sci_gateway/integer_gateway.xml
scilab/modules/interpolation/Makefile.am
scilab/modules/interpolation/interpolation.iss
scilab/modules/interpolation/sci_gateway/interpolation_gateway.xml
scilab/modules/io/Makefile.am
scilab/modules/io/io.iss
scilab/modules/io/sci_gateway/io_gateway.xml
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/linear_algebra.iss
scilab/modules/linear_algebra/sci_gateway/linear_algebra_gateway.xml
scilab/modules/localization/Makefile.am
scilab/modules/localization/localization.iss
scilab/modules/localization/sci_gateway/localization_gateway.xml
scilab/modules/localization/src/LibScilab_Import.def
scilab/modules/localization/src/c/loadhashtableslocalization.c
scilab/modules/metanet/Makefile.am
scilab/modules/metanet/metanet.iss
scilab/modules/metanet/sci_gateway/metanet_gateway.xml
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/optimization.iss
scilab/modules/optimization/sci_gateway/optimization_gateway.xml
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/polynomials.iss
scilab/modules/polynomials/sci_gateway/polynomials_gateway.xml
scilab/modules/pvm/Makefile.am
scilab/modules/pvm/pvm.iss
scilab/modules/pvm/sci_gateway/pvm_gateway.xml
scilab/modules/randlib/Makefile.am
scilab/modules/randlib/randlib.iss
scilab/modules/randlib/sci_gateway/randlib_gateway.xml
scilab/modules/sci2c/Makefile.am
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/sci_gateway/scicos_gateway.xml
scilab/modules/scicos/scicos.iss
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/sci_gateway/signal_processing_gateway.xml
scilab/modules/signal_processing/signal_processing.iss
scilab/modules/sound/Makefile.am
scilab/modules/sound/sci_gateway/sound_gateway.xml
scilab/modules/sound/sound.iss
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/sci_gateway/sparse_gateway.xml
scilab/modules/sparse/sparse.iss
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/sci_gateway/special_functions_gateway.xml
scilab/modules/special_functions/special_functions.iss
scilab/modules/statistics/sci_gateway/statistics_gateway.xml
scilab/modules/statistics/statistics.iss
scilab/modules/string/Makefile.am
scilab/modules/string/sci_gateway/string_gateway.xml
scilab/modules/string/string.iss
scilab/modules/string_V2/Makefile.am
scilab/modules/string_V2/sci_gateway/string_V2_gateway.xml
scilab/modules/string_V2/string.iss
scilab/modules/symbolic/Makefile.am
scilab/modules/symbolic/sci_gateway/symbolic_gateway.xml
scilab/modules/symbolic/symbolic.iss
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/sci_gateway/tclsci_gateway.xml
scilab/modules/tclsci/tclsci.iss
scilab/modules/time/Makefile.am
scilab/modules/time/sci_gateway/time_gateway.xml
scilab/modules/time/time.iss
scilab/modules/wintools/Makefile.am
scilab/modules/wintools/sci_gateway/wintools_gateway.xml
scilab/modules/wintools/wintools.iss

index 38e1a42..3eb0576 100644 (file)
@@ -102,6 +102,6 @@ libsciarnoldi_la_etc_DATA = etc/arnoldi.quit etc/arnoldi.start
 
 #### arnoldi : gateway declaration #### 
 libsciarnoldi_la_sci_gatewaydir = $(target)/sci_gateway
-libsciarnoldi_la_sci_gateway_DATA = sci_gateway/arnoldi
+libsciarnoldi_la_sci_gateway_DATA = sci_gateway/arnoldi_gateway.xml
 
 include $(top_srcdir)/Makefile.incl.am
index e402463..c0252b0 100644 (file)
@@ -19,7 +19,7 @@ Source: modules\{#ARNOLDI}\readme.txt; DestDir: {app}\modules\{#ARNOLDI}; Compon
 Source: modules\{#ARNOLDI}\licence.txt; DestDir: {app}\modules\{#ARNOLDI}; Components: {#COMPN_ARNOLDI}
 Source: modules\{#ARNOLDI}\changelog.txt; DestDir: {app}\modules\{#ARNOLDI}; Components: {#COMPN_ARNOLDI}
 ;
-Source: modules\{#ARNOLDI}\sci_gateway\arnoldi; DestDir: {app}\modules\{#ARNOLDI}\sci_gateway; Components: {#COMPN_ARNOLDI}
+Source: modules\{#ARNOLDI}\sci_gateway\arnoldi_gateway.xml; DestDir: {app}\modules\{#ARNOLDI}\sci_gateway; Components: {#COMPN_ARNOLDI}
 ;
 Source: modules\{#ARNOLDI}\etc\{#ARNOLDI}.quit; DestDir: {app}\modules\{#ARNOLDI}\etc; Components: {#COMPN_ARNOLDI}
 Source: modules\{#ARNOLDI}\etc\{#ARNOLDI}.start; DestDir: {app}\modules\{#ARNOLDI}\etc; Components: {#COMPN_ARNOLDI}
index ca97575..0e1e9ef 100644 (file)
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +12,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>35</GATEWAY_ID>\r
 <PRIMITIVE>\r
   <GATEWAY_ID>35</GATEWAY_ID>\r
   <PRIMITIVE_ID>4</PRIMITIVE_ID>\r
-       <PRIMITIVE_NAME>znaupd</PRIMITIVE_NAME>\r
+       <PRIMITIVE_NAME>dseupd</PRIMITIVE_NAME>\r
 </PRIMITIVE>   \r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>35</GATEWAY_ID>\r
   <PRIMITIVE_ID>5</PRIMITIVE_ID>\r
-       <PRIMITIVE_NAME>dseupd</PRIMITIVE_NAME>\r
+       <PRIMITIVE_NAME>dneupd</PRIMITIVE_NAME>\r
 </PRIMITIVE>   \r
 \r
 <PRIMITIVE>\r
index ed6bb5c..90db42a 100644 (file)
@@ -51,7 +51,7 @@ libsciboolean_la_etc_DATA = etc/boolean.quit etc/boolean.start
 
 #### boolean : gateway declaration #### 
 libsciboolean_la_sci_gatewaydir = $(target)/sci_gateway
-libsciboolean_la_sci_gateway_DATA = sci_gateway/boolean
+libsciboolean_la_sci_gateway_DATA = sci_gateway/boolean_gateway.xml
 
 #### boolean : include files ####
 libsciboolean_la_includedir=$(sciincludedir)/boolean
index 241cd39..d39c6dc 100644 (file)
@@ -15,7 +15,7 @@ Source: modules\{#BOOLEAN}\readme.txt; DestDir: {app}\modules\{#BOOLEAN}; Compon
 Source: modules\{#BOOLEAN}\licence.txt; DestDir: {app}\modules\{#BOOLEAN}; Components: {#COMPN_SCILAB}
 Source: modules\{#BOOLEAN}\changelog.txt; DestDir: {app}\modules\{#BOOLEAN}; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#BOOLEAN}\sci_gateway\boolean; DestDir: {app}\modules\{#BOOLEAN}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#BOOLEAN}\sci_gateway\boolean_gateway.xml; DestDir: {app}\modules\{#BOOLEAN}\sci_gateway; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#BOOLEAN}\etc\{#BOOLEAN}.quit; DestDir: {app}\modules\{#BOOLEAN}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#BOOLEAN}\etc\{#BOOLEAN}.start; DestDir: {app}\modules\{#BOOLEAN}\etc; Components: {#COMPN_SCILAB}
index bf191d8..bfa3448 100644 (file)
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +12,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>23</GATEWAY_ID>\r
index 1aed899..bbb8737 100644 (file)
@@ -247,7 +247,7 @@ libscicacsd_la_etc_DATA = etc/cacsd.quit etc/cacsd.start
 
 #### cacsd : gateway declaration ####
 libscicacsd_la_sci_gatewaydir = $(target)/sci_gateway
-libscicacsd_la_sci_gateway_DATA = sci_gateway/cacsd
+libscicacsd_la_sci_gateway_DATA = sci_gateway/cacsd_gateway.xml
 
 #### cacsd : include files ####
 libscicacsd_la_includedir=$(sciincludedir)/cacsd
index b30c25e..827a3d2 100644 (file)
@@ -17,7 +17,7 @@ Source: modules\{#CACSD}\readme.txt; DestDir: {app}\modules\{#CACSD}; Components
 Source: modules\{#CACSD}\licence.txt; DestDir: {app}\modules\{#CACSD}; Components: {#COMPN_CACSD}
 Source: modules\{#CACSD}\changelog.txt; DestDir: {app}\modules\{#CACSD}; Components: {#COMPN_CACSD}
 ;
-Source: modules\{#CACSD}\sci_gateway\cacsd; DestDir: {app}\modules\{#CACSD}\sci_gateway; Components: {#COMPN_CACSD}
+Source: modules\{#CACSD}\sci_gateway\cacsd_gateway.xml; DestDir: {app}\modules\{#CACSD}\sci_gateway; Components: {#COMPN_CACSD}
 ;
 Source: modules\{#CACSD}\etc\{#CACSD}.quit; DestDir: {app}\modules\{#CACSD}\etc; Components: {#COMPN_CACSD}
 Source: modules\{#CACSD}\etc\{#CACSD}.start; DestDir: {app}\modules\{#CACSD}\etc; Components: {#COMPN_CACSD}
index 139f14b..581243a 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,10 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
-<!-- =================== -->\r
 <!-- 1 gschur obsolete -->\r
 <!-- 2 gspec obsolete -->\r
 <PRIMITIVE>\r
index 5bbd589..31f814a 100644 (file)
@@ -76,7 +76,8 @@ src/c/force_link.c \
 src/c/returnProperty.c \
 src/c/returnPropertyList.c \
 src/c/scilabmode.c \
-src/c/diary.c
+src/c/diary.c \
+src/c/GetXmlFileEncoding.c
 
 CORE_FORTRAN_SOURCES = src/fortran/algebre.f \
 src/fortran/clunit.f \
@@ -320,8 +321,8 @@ CORE_C_SOURCES+=src/c/getarg.c
 endif
 
 
-libscicore_la_CFLAGS=  -Iincludes/ -Isrc/c/ -I$(top_srcdir)/libs/MALLOC/includes/ 
-libscicore_la_LDFLAGS = 
+libscicore_la_CFLAGS=  -Iincludes/ -Isrc/c/ -I$(top_srcdir)/libs/MALLOC/includes/ $(XML_FLAGS)
+libscicore_la_LDFLAGS = $(XML_LIBS)
 pkglib_LTLIBRARIES = libscicore.la
 
 libscicore_la_SOURCES = $(CORE_C_SOURCES) $(CORE_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
@@ -359,7 +360,7 @@ libscicore_la_etc_DATA = etc/core.quit etc/core.start
 
 #### core : gateway declaration #### 
 libscicore_la_sci_gatewaydir = $(target)/sci_gateway
-libscicore_la_sci_gateway_DATA = sci_gateway/core
+libscicore_la_sci_gateway_DATA = sci_gateway/core_gateway.xml
 
 
 #### core : include files ####
@@ -406,7 +407,8 @@ includes/fromjava.h \
 includes/getarg.h \
 includes/inisci-c.h \
 includes/cvstr.h \
-includes/error_scilab.h
+includes/error_scilab.h \
+includes/GetXmlFileEncoding.h
 
 #### core : demos files ####
 libscicore_la_demosintrodir=$(target)/demos/intro/
index 4b8a2de..4c039cb 100644 (file)
@@ -15,7 +15,7 @@ Source: modules\{#CORE}\readme.txt; DestDir: {app}\modules\{#CORE}; Components:
 Source: modules\{#CORE}\licence.txt; DestDir: {app}\modules\{#CORE}; Components: {#COMPN_SCILAB}
 Source: modules\{#CORE}\changelog.txt; DestDir: {app}\modules\{#CORE}; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#CORE}\sci_gateway\core; DestDir: {app}\modules\{#CORE}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#CORE}\sci_gateway\core_gateway.xml; DestDir: {app}\modules\{#CORE}\sci_gateway; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#CORE}\etc\{#CORE}.quit; DestDir: {app}\modules\{#CORE}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#CORE}\etc\{#CORE}.start; DestDir: {app}\modules\{#CORE}\etc; Components: {#COMPN_SCILAB}
diff --git a/scilab/modules/core/includes/GetXmlFileEncoding.h b/scilab/modules/core/includes/GetXmlFileEncoding.h
new file mode 100644 (file)
index 0000000..285ea04
--- /dev/null
@@ -0,0 +1,17 @@
+/*-----------------------------------------------------------------------------------*/\r
+/* INRIA 2007 */\r
+/* Allan CORNET */\r
+/*-----------------------------------------------------------------------------------*/\r
+#ifndef __GETXMLFILEENCODING_H__\r
+#define __GETXMLFILEENCODING_H__\r
+\r
+/**\r
+* Get xml file encoding\r
+* @param filename\r
+* @return a string as UTF-8\r
+*/\r
+\r
+char *GetXmlFileEncoding(const char *filename);\r
+\r
+#endif /* __GETXMLFILEENCODING_H__ */\r
+/*-----------------------------------------------------------------------------------*/\r
index eb82a45..5161691 100644 (file)
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +12,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>13</GATEWAY_ID>\r
diff --git a/scilab/modules/core/src/c/GetXmlFileEncoding.c b/scilab/modules/core/src/c/GetXmlFileEncoding.c
new file mode 100644 (file)
index 0000000..094a4d6
--- /dev/null
@@ -0,0 +1,33 @@
+/*-----------------------------------------------------------------------------------*/\r
+/* INRIA 2007 */\r
+/* Allan CORNET */\r
+/*-----------------------------------------------------------------------------------*/\r
+#include "GetXmlFileEncoding.h"\r
+#include "libxml/xmlreader.h"\r
+#include "MALLOC.h"\r
+/*-----------------------------------------------------------------------------------*/ \r
+char *GetXmlFileEncoding(const char *filename)\r
+{\r
+#define DEFAULT_ENCODING "UTF-8"\r
+       char *encoding=NULL;\r
+       xmlDocPtr doc = NULL;\r
+\r
+       /* default */\r
+       encoding=(char *)MALLOC(sizeof(char)*(strlen(DEFAULT_ENCODING)+1));\r
+       strcpy(encoding,DEFAULT_ENCODING);\r
+\r
+       doc = xmlParseFile (filename);\r
+       if (doc) \r
+       {\r
+               if (doc->encoding)\r
+               {\r
+                       if (encoding) {FREE(encoding);encoding=NULL;}\r
+                       encoding=(char *)MALLOC(sizeof(char)*(strlen(doc->encoding)+1));\r
+                       strcpy(encoding,doc->encoding);\r
+               }\r
+       }\r
+\r
+       xmlFreeDoc (doc);\r
+       return encoding;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
index 4ef732b..cab592d 100644 (file)
@@ -11,6 +11,8 @@
 #include "getmodules.h"
 #include "setgetSCIpath.h"
 #include "LoadFunctionsTab.h"
+#include "libxml/xmlreader.h"
+#include "GetXmlFileEncoding.h"
 /*-----------------------------------------------------------------------------------*/  
 static int firstentry = 0;
 /*-----------------------------------------------------------------------------------*/  
@@ -36,7 +38,7 @@ void LoadFunctionsTab(void)
 
        for (j=0;j<Modules->numberofModules;j++)
        {
-               #define FORMATFILENAME "%s/modules/%s/sci_gateway/%s"
+               #define FORMATFILENAME "%s/modules/%s/sci_gateway/%s_gateway.xml"
                char *filename_primitives_list=NULL;
                int len=strlen(FORMATFILENAME)+strlen(SciPath)+strlen(Modules->ModuleList[j])*2;
 
@@ -66,31 +68,102 @@ static int Add_a_Scilab_primitive_in_hashtable(char *str, int *dataI, int *data)
 static int Load_primitives_from_file(char *filename)
 {
        BOOL bOK=FALSE;
+
        if (FileExist(filename))
        {
-               #define LineMaxSize 1024
-               char Line[LineMaxSize];
-               FILE *pFile;
-               int dataI=0;
-               int data=0;
-               char namefunction[MAXLENGHTFUNCTIONNAME];
-
-               pFile=fopen(filename,"rt");
-               while (fgets(Line, LineMaxSize,pFile))
+               char *encoding=GetXmlFileEncoding(filename);
+
+               /* Don't care about line return / empty line */
+               xmlKeepBlanksDefault(0); 
+
+               /* check if the XML file has been encoded with utf8 (unicode) or not */
+               if ( (strcmp("utf-8", encoding)!=0) || (strcmp("UTF-8", encoding)==0) )
                {
-                       if (Line[0]!=';')
+                       xmlNodePtr node;
+                       xmlDocPtr doc;
+
+                       int GATEWAY_ID=0;
+                       int PRIMITIVE_ID=0;
+                       char *PRIMITIVE_NAME=NULL;
+
+                       doc = xmlParseFile (filename);
+
+                       if (doc == NULL) 
                        {
-                               int retval=0;
-                               retval=sscanf(Line,"%d %d %s",&dataI,&data,namefunction);
-                               if (retval == 3)
+                               printf("Error: could not parse file %s\n", filename);
+                               return bOK;
+                       }
+
+                       node = doc->children;
+                       if (!xmlStrEqual(node->name,(const xmlChar*)"GATEWAY"))
+                       { 
+                               /* Check if the first tag is valid */
+                               printf("Error : Not a valid gateway file %s (should start with <GATEWAY>)\n", filename);
+                               return bOK;
+                       }
+
+                       /* browse all the <PRIMITIVE> */
+                       for (node = node->next->children; node != NULL; node = node->next)
+                       {
+
+                               xmlNodePtr child=node->children;
+
+                               /* browse elements in <PRIMITIVE> */
+                               while (child != NULL)
+                               {
+                                       if (child->children != NULL)
+                                       { 
+                                               if (xmlStrEqual (child->name, (const xmlChar*) "GATEWAY_ID"))
+                                               { 
+                                                       /* we found <GATEWAY_ID> */
+                                                       const char *str=(const char*)child->children->content;
+                                                       GATEWAY_ID=atoi(str);
+                                               }
+                                               else if (xmlStrEqual (child->name, (const xmlChar*)"PRIMITIVE_ID"))
+                                               { 
+                                                       /* we found <PRIMITIVE_ID> */
+                                                       const char *str=(const char*)child->children->content;
+                                                       PRIMITIVE_ID=atoi(str);
+                                               }
+                                               else if (xmlStrEqual (child->name, (const xmlChar*)"PRIMITIVE_NAME"))
+                                               {
+                                                       /* we found <PRIMITIVE_NAME> */
+                                                       const char *str=(const char*)child->children->content;
+                                                       PRIMITIVE_NAME=(char*)MALLOC(sizeof(char)*(strlen((const char*)str)+1));
+                                                       strcpy(PRIMITIVE_NAME,str);
+                                               }
+                                       }
+                               
+                                       child = child->next;
+                               }
+
+                               if ( (GATEWAY_ID != 0) && (PRIMITIVE_ID != 0) && (PRIMITIVE_NAME) )
                                {
-                                       Add_a_Scilab_primitive_in_hashtable(namefunction,&dataI,&data);
+                                       if (strlen(PRIMITIVE_NAME) > 0)
+                                       {
+                                               Add_a_Scilab_primitive_in_hashtable(PRIMITIVE_NAME,&GATEWAY_ID,&PRIMITIVE_ID);
+                                       }
                                }
+
+                               if (PRIMITIVE_NAME) {FREE(PRIMITIVE_NAME); PRIMITIVE_NAME =NULL;}
+                               GATEWAY_ID = 0;
+                               PRIMITIVE_ID = 0;
                        }
+
+                       xmlFreeDoc (doc);
+
+                       /*
+                       * Cleanup function for the XML library.
+                       */
+                       xmlCleanupParser();
+               }
+               else
+               {
+                       printf("Error : Not a valid gateway file %s (encoding not 'utf-8') Encoding '%s' found\n", filename, encoding);
                }
-               fclose(pFile);
-               bOK=TRUE;
+
+               if (encoding) {FREE(encoding);encoding=NULL;}
        }
        return bOK;
 }
-/*-----------------------------------------------------------------------------------*/
+/*-----------------------------------------------------------------------------------*/ 
index 25c94d0..953c61d 100644 (file)
@@ -6,7 +6,7 @@
 #define __LOADFUNCTIONSTAB_H__
 
 /**
- * load all the functions from modules/xxxx/sci_gateway/xxxx where xxxx is 
+ * load all the functions from modules/xxxx/sci_gateway/xxxx_gateway.xml where xxxx is 
  * the name of the module
  */
 void LoadFunctionsTab(void);
index 85b4539..72234a4 100644 (file)
@@ -41,7 +41,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../gui/src/c/wsci"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../gui/src/c/wsci;../../../../libs/libxml2;../../../../libs/libxml2/libxml"
                                PreprocessorDefinitions="_DEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="1"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../gui/src/c/wsci"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../gui/src/c/wsci;../../../../libs/libxml2;../../../../libs/libxml2/libxml"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                StringPooling="true"
                                RuntimeLibrary="0"
                                >
                        </File>
                        <File
+                               RelativePath=".\GetXmlFileEncoding.c"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\sci_gateway\c\gw_core.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath="..\..\includes\GetXmlFileEncoding.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\includes\gw_core.h"
                                >
                        </File>
index 543b918..28890ee 100644 (file)
@@ -76,7 +76,7 @@ libscidata_structures_la_etc_DATA = etc/data_structures.quit etc/data_structures
 
 #### data_structures : gateway declaration #### 
 libscidata_structures_la_sci_gatewaydir = $(target)/sci_gateway
-libscidata_structures_la_sci_gateway_DATA = sci_gateway/data_structures
+libscidata_structures_la_sci_gateway_DATA = sci_gateway/data_structures_gateway.xml
 
 
 
index c71b386..6b3409e 100644 (file)
@@ -15,7 +15,7 @@ Source: modules\{#DATASTRUCT}\readme.txt; DestDir: {app}\modules\{#DATASTRUCT};
 Source: modules\{#DATASTRUCT}\licence.txt; DestDir: {app}\modules\{#DATASTRUCT}; Components: {#COMPN_SCILAB}
 Source: modules\{#DATASTRUCT}\changelog.txt; DestDir: {app}\modules\{#DATASTRUCT}; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#DATASTRUCT}\sci_gateway\data_structures; DestDir: {app}\modules\{#DATASTRUCT}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#DATASTRUCT}\sci_gateway\data_structures_gateway.xml; DestDir: {app}\modules\{#DATASTRUCT}\sci_gateway; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#DATASTRUCT}\etc\{#DATASTRUCT}.quit; DestDir: {app}\modules\{#DATASTRUCT}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#DATASTRUCT}\etc\{#DATASTRUCT}.start; DestDir: {app}\modules\{#DATASTRUCT}\etc; Components: {#COMPN_SCILAB}
index b474247..429639b 100644 (file)
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+<GATEWAY>\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +10,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>17</GATEWAY_ID>\r
index 4966150..69ec379 100644 (file)
@@ -148,6 +148,6 @@ libscidifferential_equations_la_etc_DATA = etc/differential_equations.quit etc/d
 
 #### differential_equations : gateway declaration #### 
 libscidifferential_equations_la_sci_gatewaydir = $(target)/sci_gateway
-libscidifferential_equations_la_sci_gateway_DATA = sci_gateway/differential_equations
+libscidifferential_equations_la_sci_gateway_DATA = sci_gateway/differential_equations_gateway.xml
 
 include $(top_srcdir)/Makefile.incl.am
index d52e4ca..35f5835 100644 (file)
@@ -15,7 +15,7 @@ Source: modules\{#DIFFEQU}\readme.txt; DestDir: {app}\modules\{#DIFFEQU}; Compon
 Source: modules\{#DIFFEQU}\licence.txt; DestDir: {app}\modules\{#DIFFEQU}; Components: {#COMPN_EQUDIF}
 Source: modules\{#DIFFEQU}\changelog.txt; DestDir: {app}\modules\{#DIFFEQU}; Components: {#COMPN_EQUDIF}
 ;
-Source: modules\{#DIFFEQU}\sci_gateway\differential_equations; DestDir: {app}\modules\{#DIFFEQU}\sci_gateway; Components: {#COMPN_EQUDIF}
+Source: modules\{#DIFFEQU}\sci_gateway\differential_equations_gateway.xml; DestDir: {app}\modules\{#DIFFEQU}\sci_gateway; Components: {#COMPN_EQUDIF}
 ;
 Source: modules\{#DIFFEQU}\etc\{#DIFFEQU}.quit; DestDir: {app}\modules\{#DIFFEQU}\etc; Components: {#COMPN_EQUDIF}
 Source: modules\{#DIFFEQU}\etc\{#DIFFEQU}.start; DestDir: {app}\modules\{#DIFFEQU}\etc; Components: {#COMPN_EQUDIF}
index 2bb3d0f..d042491 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>12</GATEWAY_ID>\r
index b631af2..b12aab1 100644 (file)
@@ -403,7 +403,7 @@ libscielementaries_functions_la_etc_DATA = etc/elementaries_functions.quit etc/e
 
 #### elementaries_functions : gateway declaration #### 
 libscielementaries_functions_la_sci_gatewaydir = $(target)/sci_gateway
-libscielementaries_functions_la_sci_gateway_DATA = sci_gateway/elementaries_functions
+libscielementaries_functions_la_sci_gateway_DATA = sci_gateway/elementaries_functions_gateway.xml
 
 
 #### elementaries_functions : include files ####
index 6491713..92535f2 100644 (file)
@@ -17,7 +17,7 @@ Source: modules\{#ELEMFUNCTIONS}\readme.txt; DestDir: {app}\modules\{#ELEMFUNCTI
 Source: modules\{#ELEMFUNCTIONS}\licence.txt; DestDir: {app}\modules\{#ELEMFUNCTIONS}; Components: {#COMPN_SCILAB}
 Source: modules\{#ELEMFUNCTIONS}\changelog.txt; DestDir: {app}\modules\{#ELEMFUNCTIONS}; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#ELEMFUNCTIONS}\sci_gateway\elementaries_functions; DestDir: {app}\modules\{#ELEMFUNCTIONS}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#ELEMFUNCTIONS}\sci_gateway\elementaries_functions_gateway.xml; DestDir: {app}\modules\{#ELEMFUNCTIONS}\sci_gateway; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#ELEMFUNCTIONS}\etc\{#ELEMFUNCTIONS}.quit; DestDir: {app}\modules\{#ELEMFUNCTIONS}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#ELEMFUNCTIONS}\etc\{#ELEMFUNCTIONS}.start; DestDir: {app}\modules\{#ELEMFUNCTIONS}\etc; Components: {#COMPN_SCILAB}
index 524f91a..aaf8e97 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>6</GATEWAY_ID>\r
index 320f9f0..9044b21 100644 (file)
@@ -37,7 +37,7 @@ libscifftw_la_etc_DATA = etc/fftw.quit etc/fftw.start
 
 #### fftw : gateway declaration #### 
 libscifftw_la_sci_gatewaydir = $(target)/sci_gateway
-libscifftw_la_sci_gateway_DATA = sci_gateway/fftw
+libscifftw_la_sci_gateway_DATA = sci_gateway/fftw_gateway.xml
 
 libscifftw_la_SOURCES = $(FFTW_C_SOURCES) $(GATEWAY_C_SOURCES)
 
index 1ebd1da..82a0acb 100644 (file)
@@ -16,7 +16,7 @@ Source: modules\{#FFTW}\readme.txt; DestDir: {app}\modules\{#FFTW}; Components:
 Source: modules\{#FFTW}\licence.txt; DestDir: {app}\modules\{#FFTW}; Components: {#COMPN_FFTW}
 Source: modules\{#FFTW}\changelog.txt; DestDir: {app}\modules\{#FFTW}; Components: {#COMPN_FFTW}
 ;
-Source: modules\{#FFTW}\sci_gateway\fftw; DestDir: {app}\modules\{#FFTW}\sci_gateway; Components: {#COMPN_FFTW}
+Source: modules\{#FFTW}\sci_gateway\fftw_gateway.xml; DestDir: {app}\modules\{#FFTW}\sci_gateway; Components: {#COMPN_FFTW}
 ;
 Source: modules\{#FFTW}\etc\{#FFTW}.quit; DestDir: {app}\modules\{#FFTW}\etc; Components: {#COMPN_FFTW}
 Source: modules\{#FFTW}\etc\{#FFTW}.start; DestDir: {app}\modules\{#FFTW}\etc; Components: {#COMPN_FFTW}
index aa144e2..7a7e998 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>51</GATEWAY_ID>\r
index 9ca774f..25e845f 100644 (file)
@@ -65,7 +65,7 @@ libscifileio_la_etc_DATA = etc/fileio.quit etc/fileio.start
 
 #### fileio : gateway declaration #### 
 libscifileio_la_sci_gatewaydir = $(target)/sci_gateway
-libscifileio_la_sci_gateway_DATA = sci_gateway/fileio
+libscifileio_la_sci_gateway_DATA = sci_gateway/fileio_gateway.xml
 
 #### fileio : include files ####
 libscifileio_la_includedir=$(sciincludedir)/fileio
index 5450b89..491ef31 100644 (file)
@@ -15,7 +15,7 @@ Source: modules\{#FILEIO}\readme.txt; DestDir: {app}\modules\{#FILEIO}; Componen
 Source: modules\{#FILEIO}\licence.txt; DestDir: {app}\modules\{#FILEIO}; Components: {#COMPN_SCILAB}
 Source: modules\{#FILEIO}\changelog.txt; DestDir: {app}\modules\{#FILEIO}; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#FILEIO}\sci_gateway\fileio; DestDir: {app}\modules\{#FILEIO}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#FILEIO}\sci_gateway\fileio_gateway.xml; DestDir: {app}\modules\{#FILEIO}\sci_gateway; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#FILEIO}\etc\{#FILEIO}.quit; DestDir: {app}\modules\{#FILEIO}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#FILEIO}\etc\fileio.start; DestDir: {app}\modules\{#FILEIO}\etc; Components: {#COMPN_SCILAB}
index a735d90..f07b466 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>34</GATEWAY_ID>\r
index d8c90ac..c0960f4 100644 (file)
@@ -460,7 +460,7 @@ libscigraphics_la_etc_DATA = etc/graphics.quit etc/graphics.start
 
 #### graphics : gateway declaration #### 
 libscigraphics_la_sci_gatewaydir = $(target)/sci_gateway
-libscigraphics_la_sci_gateway_DATA = sci_gateway/graphics
+libscigraphics_la_sci_gateway_DATA = sci_gateway/graphics_gateway.xml
 
 #### graphics : include files ####
 libscigraphics_la_includedir=$(sciincludedir)/graphics
index 06d1359..650a83d 100644 (file)
@@ -15,7 +15,7 @@ Source: modules\{#GRAPHICS}\readme.txt; DestDir: {app}\modules\{#GRAPHICS}; Comp
 Source: modules\{#GRAPHICS}\licence.txt; DestDir: {app}\modules\{#GRAPHICS}; Components: {#COMPN_GRAPHICS}
 Source: modules\{#GRAPHICS}\changelog.txt; DestDir: {app}\modules\{#GRAPHICS}; Components: {#COMPN_GRAPHICS}
 ;
-Source: modules\{#GRAPHICS}\sci_gateway\graphics; DestDir: {app}\modules\{#GRAPHICS}\sci_gateway; Components: {#COMPN_GRAPHICS}
+Source: modules\{#GRAPHICS}\sci_gateway\graphics_gateway.xml; DestDir: {app}\modules\{#GRAPHICS}\sci_gateway; Components: {#COMPN_GRAPHICS}
 ;
 Source: modules\{#GRAPHICS}\etc\{#GRAPHICS}.quit; DestDir: {app}\modules\{#GRAPHICS}\etc; Components: {#COMPN_GRAPHICS}
 Source: modules\{#GRAPHICS}\etc\{#GRAPHICS}.start; DestDir: {app}\modules\{#GRAPHICS}\etc; Components: {#COMPN_GRAPHICS}
index 1d0e12f..9323d29 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>7</GATEWAY_ID>\r
index 6730b96..fc4312a 100644 (file)
@@ -138,7 +138,7 @@ libscigui_la_etc_DATA = etc/gui.quit etc/gui.start
 
 #### gui : gateway declaration #### 
 libscigui_la_sci_gatewaydir = $(target)/sci_gateway
-libscigui_la_sci_gateway_DATA = sci_gateway/gui
+libscigui_la_sci_gateway_DATA = sci_gateway/gui_gateway.xml
 
 
 #### gui : include files ####
index 9ab6932..f44d48d 100644 (file)
@@ -15,7 +15,7 @@ Source: modules\{#GUI}\readme.txt; DestDir: {app}\modules\{#GUI}; Components: {#
 Source: modules\{#GUI}\licence.txt; DestDir: {app}\modules\{#GUI}; Components: {#COMPN_SCILAB}
 Source: modules\{#GUI}\changelog.txt; DestDir: {app}\modules\{#GUI}; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#GUI}\sci_gateway\gui; DestDir: {app}\modules\{#GUI}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#GUI}\sci_gateway\gui_gateway.xml; DestDir: {app}\modules\{#GUI}\sci_gateway; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#GUI}\etc\{#GUI}.quit; DestDir: {app}\modules\{#GUI}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#GUI}\etc\{#GUI}.start; DestDir: {app}\modules\{#GUI}\etc; Components: {#COMPN_SCILAB}
index 444e8ab..2669d3d 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>25</GATEWAY_ID>\r
index 8f5d190..a6e0323 100644 (file)
@@ -145,7 +145,7 @@ libsciinteger_la_etc_DATA = etc/integer.quit etc/integer.start
 
 #### integer : gateway declaration #### 
 libsciinteger_la_sci_gatewaydir = $(target)/sci_gateway
-libsciinteger_la_sci_gateway_DATA = sci_gateway/integer
+libsciinteger_la_sci_gateway_DATA = sci_gateway/integer_gateway.xml
 
 #### integer : include files ####
 libsciinteger_la_includedir=$(sciincludedir)/integer
index 49e436d..173b49f 100644 (file)
@@ -17,7 +17,7 @@ Source: modules\{#INTEGER}\readme.txt; DestDir: {app}\modules\{#INTEGER}; Compon
 Source: modules\{#INTEGER}\licence.txt; DestDir: {app}\modules\{#INTEGER}; Components: {#COMPN_SCILAB}
 Source: modules\{#INTEGER}\changelog.txt; DestDir: {app}\modules\{#INTEGER}; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#INTEGER}\sci_gateway\integer; DestDir: {app}\modules\{#INTEGER}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#INTEGER}\sci_gateway\integer_gateway.xml; DestDir: {app}\modules\{#INTEGER}\sci_gateway; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#INTEGER}\etc\{#INTEGER}.quit; DestDir: {app}\modules\{#INTEGER}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#INTEGER}\etc\{#INTEGER}.start; DestDir: {app}\modules\{#INTEGER}\etc; Components: {#COMPN_SCILAB}
index 113ce53..af4e0c5 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>43</GATEWAY_ID>\r
index ead3e77..a4dd464 100644 (file)
@@ -54,7 +54,7 @@ libsciinterpolation_la_etc_DATA = etc/interpolation.quit etc/interpolation.start
 
 #### interpolation : gateway declaration #### 
 libsciinterpolation_la_sci_gatewaydir = $(target)/sci_gateway
-libsciinterpolation_la_sci_gateway_DATA = sci_gateway/interpolation
+libsciinterpolation_la_sci_gateway_DATA = sci_gateway/interpolation_gateway.xml
 
 #### interpolation : include files ####
 libsciinterpolation_la_includedir=$(sciincludedir)/interpolation
index a114962..c971e69 100644 (file)
@@ -15,7 +15,7 @@ Source: modules\{#INTERPOLATION}\readme.txt; DestDir: {app}\modules\{#INTERPOLAT
 Source: modules\{#INTERPOLATION}\licence.txt; DestDir: {app}\modules\{#INTERPOLATION}; Components: {#COMPN_INTERP}
 Source: modules\{#INTERPOLATION}\changelog.txt; DestDir: {app}\modules\{#INTERPOLATION}; Components: {#COMPN_INTERP}
 ;
-Source: modules\{#INTERPOLATION}\sci_gateway\interpolation; DestDir: {app}\modules\{#INTERPOLATION}\sci_gateway; Components: {#COMPN_INTERP}
+Source: modules\{#INTERPOLATION}\sci_gateway\interpolation_gateway.xml; DestDir: {app}\modules\{#INTERPOLATION}\sci_gateway; Components: {#COMPN_INTERP}
 ;
 Source: modules\{#INTERPOLATION}\etc\{#INTERPOLATION}.quit; DestDir: {app}\modules\{#INTERPOLATION}\etc; Components: {#COMPN_INTERP}
 Source: modules\{#INTERPOLATION}\etc\{#INTERPOLATION}.start; DestDir: {app}\modules\{#INTERPOLATION}\etc; Components: {#COMPN_INTERP}
index 4683106..8468bb7 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>19</GATEWAY_ID>\r
index 0315cac..2cf1b7a 100644 (file)
@@ -109,7 +109,7 @@ libsciio_la_etc_DATA = etc/io.quit etc/io.start
 
 #### io : gateway declaration #### 
 libsciio_la_sci_gatewaydir = $(target)/sci_gateway
-libsciio_la_sci_gateway_DATA = sci_gateway/io
+libsciio_la_sci_gateway_DATA = sci_gateway/io_gateway.xml
 
 #### io : include files ####
 libsciio_la_includedir=$(sciincludedir)/io
index 954d3a1..e074054 100644 (file)
@@ -18,7 +18,7 @@ Source: modules\{#IO}\readme.txt; DestDir: {app}\modules\{#IO}; Components: {#CO
 Source: modules\{#IO}\licence.txt; DestDir: {app}\modules\{#IO}; Components: {#COMPN_SCILAB}
 Source: modules\{#IO}\changelog.txt; DestDir: {app}\modules\{#IO}; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#IO}\sci_gateway\io; DestDir: {app}\modules\{#IO}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#IO}\sci_gateway\io_gateway.xml; DestDir: {app}\modules\{#IO}\sci_gateway; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#IO}\etc\{#IO}.quit; DestDir: {app}\modules\{#IO}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#IO}\etc\{#IO}.start; DestDir: {app}\modules\{#IO}\etc; Components: {#COMPN_SCILAB}
index fa5ba14..9213b40 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>5</GATEWAY_ID>\r
index 8bee9cd..583e99f 100644 (file)
@@ -115,7 +115,7 @@ libscilinear_algebra_la_etcdir = $(target)/etc
 libscilinear_algebra_la_etc_DATA = etc/linear_algebra.quit etc/linear_algebra.start
 #### linear_algebra : gateway declaration #### 
 libscilinear_algebra_la_sci_gatewaydir = $(target)/sci_gateway
-libscilinear_algebra_la_sci_gateway_DATA = sci_gateway/linear_algebra
+libscilinear_algebra_la_sci_gateway_DATA = sci_gateway/linear_algebra_gateway.xml
 
 
 #### linear_algebra : include files ####
index 30b2377..a1d9a58 100644 (file)
@@ -18,7 +18,7 @@ Source: modules\{#LINALG}\readme.txt; DestDir: {app}\modules\{#LINALG}; Componen
 Source: modules\{#LINALG}\licence.txt; DestDir: {app}\modules\{#LINALG}; Components: {#COMPN_LINALG}
 Source: modules\{#LINALG}\changelog.txt; DestDir: {app}\modules\{#LINALG}; Components: {#COMPN_LINALG}
 ;
-Source: modules\{#LINALG}\sci_gateway\linear_algebra; DestDir: {app}\modules\{#LINALG}\sci_gateway; Components: {#COMPN_LINALG}
+Source: modules\{#LINALG}\sci_gateway\linear_algebra_gateway.xml; DestDir: {app}\modules\{#LINALG}\sci_gateway; Components: {#COMPN_LINALG}
 ;
 Source: modules\{#LINALG}\etc\{#LINALG}.quit; DestDir: {app}\modules\{#LINALG}\etc; Components: {#COMPN_LINALG}
 Source: modules\{#LINALG}\etc\{#LINALG}.start; DestDir: {app}\modules\{#LINALG}\etc; Components: {#COMPN_LINALG}
index ebe3657..2caa15c 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>2</GATEWAY_ID>\r
index 02de882..94a61f2 100644 (file)
@@ -45,6 +45,10 @@ libscilocalization_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 libscilocalization_la_etcdir = $(target)/etc
 libscilocalization_la_etc_DATA = etc/localization.quit etc/localization.start
 
+#### localization : gateway declaration #### 
+libscilocalization_la_sci_gatewaydir = $(target)/sci_gateway
+libscilocalization_la_sci_gateway_DATA = sci_gateway/localization_gateway.xml
+
 
 ####localization : include files ####
 libscilocalization_la_includedir=$(sciincludedir)/localization
index d1caae8..470983b 100644 (file)
@@ -20,7 +20,7 @@ Source: modules\{#LOCALIZATION}\changelog.txt; DestDir: {app}\modules\{#LOCALIZA
 Source: modules\{#LOCALIZATION}\etc\{#LOCALIZATION}.quit; DestDir: {app}\modules\{#LOCALIZATION}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#LOCALIZATION}\etc\{#LOCALIZATION}.start; DestDir: {app}\modules\{#LOCALIZATION}\etc; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#LOCALIZATION}\sci_gateway\{#LOCALIZATION}; DestDir: {app}\modules\{#LOCALIZATION}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#LOCALIZATION}\sci_gateway\{#LOCALIZATION}_gateway.xml; DestDir: {app}\modules\{#LOCALIZATION}\sci_gateway; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#LOCALIZATION}\help\addchapter.sce; DestDir: {app}\modules\{#LOCALIZATION}\help; Flags: recursesubdirs; Components:  {#COMPN_SCILAB}
 Source: modules\{#LOCALIZATION}\help\removechapter.sce; DestDir: {app}\modules\{#LOCALIZATION}\help; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
index 74c6e8f..2b02455 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>50</GATEWAY_ID>\r
index f389972..0256d16 100644 (file)
@@ -10,6 +10,7 @@
 #include "setgetSCIpath.h"
 #include "libxml/xmlreader.h"
 #include "../../fileio/includes/FileExist.h"
+#include "GetXmlFileEncoding.h"
 /*-----------------------------------------------------------------------------------*/ 
 #define FILEERRORS "errors"
 #define FILEMSGS "messages"
@@ -17,7 +18,6 @@
 #define FILEFORMATPATH "%s/modules/%s/languages/%s/%s.xml"
 /*-----------------------------------------------------------------------------------*/ 
 static BOOL LoadHashTableLocalization(struct hashtable *table,char *filenamexml);
-static char *GetXmlFileEncoding(const char *filename);
 /*-----------------------------------------------------------------------------------*/ 
 BOOL LoadHashTablesLocalization(char *language)
 {
@@ -160,28 +160,3 @@ BOOL LoadHashTableLocalization(struct hashtable *table,char *filenamexml)
        return bOK;
 }
 /*-----------------------------------------------------------------------------------*/ 
-static char *GetXmlFileEncoding(const char *filename)
-{
-       #define DEFAULT_ENCODING "UTF-8"
-       char *encoding=NULL;
-       xmlDocPtr doc = NULL;
-
-       /* default */
-       encoding=(char *)MALLOC(sizeof(char)*(strlen(DEFAULT_ENCODING)+1));
-       strcpy(encoding,DEFAULT_ENCODING);
-
-       doc = xmlParseFile (filename);
-       if (doc) 
-       {
-               if (doc->encoding)
-               {
-                       if (encoding) {FREE(encoding);encoding=NULL;}
-                       encoding=(char *)MALLOC(sizeof(char)*(strlen(doc->encoding)+1));
-                       strcpy(encoding,doc->encoding);
-               }
-       }
-
-       xmlFreeDoc (doc);
-       return encoding;
-}
-/*-----------------------------------------------------------------------------------*/ 
index 8aa1b1d..77519ca 100644 (file)
@@ -148,7 +148,7 @@ libscimetanet_la_etc_DATA = etc/metanet.quit etc/metanet.start
 
 #### metanet : gateway declaration #### 
 libscimetanet_la_sci_gatewaydir = $(target)/sci_gateway
-libscimetanet_la_sci_gateway_DATA = sci_gateway/metanet
+libscimetanet_la_sci_gateway_DATA = sci_gateway/metanet_gateway.xml
 
 #### metanet : include files ####
 libscimetanet_la_includedir=$(sciincludedir)/metanet
index 5c4fb06..cf93b8d 100644 (file)
@@ -19,7 +19,7 @@ Source: modules\{#METANET}\readme.txt; DestDir: {app}\modules\{#METANET}; Compon
 Source: modules\{#METANET}\licence.txt; DestDir: {app}\modules\{#METANET}; Components: {#COMPN_METANET}
 Source: modules\{#METANET}\changelog.txt; DestDir: {app}\modules\{#METANET}; Components: {#COMPN_METANET}
 ;
-Source: modules\{#METANET}\sci_gateway\metanet; DestDir: {app}\modules\{#METANET}\sci_gateway; Components: {#COMPN_METANET}
+Source: modules\{#METANET}\sci_gateway\metanet_gateway.xml; DestDir: {app}\modules\{#METANET}\sci_gateway; Components: {#COMPN_METANET}
 ;
 Source: modules\{#METANET}\etc\{#METANET}.quit; DestDir: {app}\modules\{#METANET}\etc; Components: {#COMPN_METANET}
 Source: modules\{#METANET}\etc\{#METANET}.start; DestDir: {app}\modules\{#METANET}\etc; Components: {#COMPN_METANET}
index b3cc1f9..d577882 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>15</GATEWAY_ID>\r
index 8f37a2e..0b7e43f 100644 (file)
@@ -167,7 +167,7 @@ libscioptimization_la_etc_DATA = etc/optimization.quit etc/optimization.start
 
 #### optimization : gateway declaration #### 
 libscioptimization_la_sci_gatewaydir = $(target)/sci_gateway
-libscioptimization_la_sci_gateway_DATA = sci_gateway/optimization
+libscioptimization_la_sci_gateway_DATA = sci_gateway/optimization_gateway.xml
 #### optimization : include files ####
 libscioptimization_la_includedir=$(sciincludedir)/optimization
 libscioptimization_la_include_HEADERS = includes/gw_optim.h \
index 96c8989..62129c5 100644 (file)
@@ -15,7 +15,7 @@ Source: modules\{#OPTIMIZATION}\readme.txt; DestDir: {app}\modules\{#OPTIMIZATIO
 Source: modules\{#OPTIMIZATION}\licence.txt; DestDir: {app}\modules\{#OPTIMIZATION}; Components: {#COMPN_OPTIM}
 Source: modules\{#OPTIMIZATION}\changelog.txt; DestDir: {app}\modules\{#OPTIMIZATION}; Components: {#COMPN_OPTIM}
 ;
-Source: modules\{#OPTIMIZATION}\sci_gateway\optimization; DestDir: {app}\modules\{#OPTIMIZATION}\sci_gateway; Components: {#COMPN_OPTIM}
+Source: modules\{#OPTIMIZATION}\sci_gateway\optimization_gateway.xml; DestDir: {app}\modules\{#OPTIMIZATION}\sci_gateway; Components: {#COMPN_OPTIM}
 ;
 Source: modules\{#OPTIMIZATION}\etc\{#OPTIMIZATION}.quit; DestDir: {app}\modules\{#OPTIMIZATION}\etc; Components: {#COMPN_OPTIM}
 Source: modules\{#OPTIMIZATION}\etc\{#OPTIMIZATION}.start; DestDir: {app}\modules\{#OPTIMIZATION}\etc; Components: {#COMPN_OPTIM}
index cfe17c4..b383dfa 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>11</GATEWAY_ID>\r
index 5ff8ba8..8f061b0 100644 (file)
@@ -134,7 +134,7 @@ libscipolynomials_la_etc_DATA = etc/polynomials.quit etc/polynomials.start
 
 #### polynomials : gateway declaration #### 
 libscipolynomials_la_sci_gatewaydir = $(target)/sci_gateway
-libscipolynomials_la_sci_gateway_DATA = sci_gateway/polynomials
+libscipolynomials_la_sci_gateway_DATA = sci_gateway/polynomials_gateway.xml
 
 
 
index b6b60ff..149d67a 100644 (file)
@@ -15,7 +15,7 @@ Source: modules\{#POLYNOMIALS}\readme.txt; DestDir: {app}\modules\{#POLYNOMIALS}
 Source: modules\{#POLYNOMIALS}\licence.txt; DestDir: {app}\modules\{#POLYNOMIALS}; Components: {#COMPN_POLY}
 Source: modules\{#POLYNOMIALS}\changelog.txt; DestDir: {app}\modules\{#POLYNOMIALS}; Components: {#COMPN_POLY}
 ;
-Source: modules\{#POLYNOMIALS}\sci_gateway\polynomials; DestDir: {app}\modules\{#POLYNOMIALS}\sci_gateway; Components: {#COMPN_POLY}
+Source: modules\{#POLYNOMIALS}\sci_gateway\polynomials_gateway.xml; DestDir: {app}\modules\{#POLYNOMIALS}\sci_gateway; Components: {#COMPN_POLY}
 ;
 Source: modules\{#POLYNOMIALS}\etc\{#POLYNOMIALS}.quit; DestDir: {app}\modules\{#POLYNOMIALS}\etc; Components: {#COMPN_POLY}
 Source: modules\{#POLYNOMIALS}\etc\{#POLYNOMIALS}.start; DestDir: {app}\modules\{#POLYNOMIALS}\etc; Components: {#COMPN_POLY}
index b861a20..f8845bd 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>16</GATEWAY_ID>\r
index 8e8056e..f891b6f 100644 (file)
@@ -77,7 +77,7 @@ libscipvm_la_etc_DATA = etc/pvm.quit etc/pvm.start
 
 #### pvm : gateway declaration #### 
 libscipvm_la_sci_gatewaydir = $(target)/sci_gateway
-libscipvm_la_sci_gateway_DATA = sci_gateway/pvm
+libscipvm_la_sci_gateway_DATA = sci_gateway/pvm_gateway.xml
 
 #### pvm : include files ####
 libscipvm_la_includedir=$(sciincludedir)/pvm
index c16bcc2..4c1cc82 100644 (file)
@@ -17,7 +17,7 @@ Source: modules\{#PVM}\VERSION; DestDir: {app}\modules\{#PVM}; Components: {#COM
 ;
 Source: modules\{#PVM}\includes\*.h; DestDir: {app}\modules\{#PVM}\includes; Components: {#COMPN_PVM}
 ;
-Source: modules\{#PVM}\sci_gateway\pvm; DestDir: {app}\modules\{#PVM}\sci_gateway; Components: {#COMPN_PVM}
+Source: modules\{#PVM}\sci_gateway\pvm_gateway.xml; DestDir: {app}\modules\{#PVM}\sci_gateway; Components: {#COMPN_PVM}
 ;
 Source: modules\{#PVM}\etc\{#PVM}.quit; DestDir: {app}\modules\{#PVM}\etc; Components: {#COMPN_PVM}
 Source: modules\{#PVM}\etc\{#PVM}.start; DestDir: {app}\modules\{#PVM}\etc; Components: {#COMPN_PVM}
index b5264ab..8f7706b 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>42</GATEWAY_ID>\r
index af14bad..e83dc5b 100644 (file)
@@ -71,7 +71,7 @@ libscirandlib_la_etc_DATA = etc/randlib.quit etc/randlib.start
 
 #### randlib : gateway declaration #### 
 libscirandlib_la_sci_gatewaydir = $(target)/sci_gateway
-libscirandlib_la_sci_gateway_DATA = sci_gateway/randlib
+libscirandlib_la_sci_gateway_DATA = sci_gateway/randlib_gateway.xml
 
 #### randlib : include files ####
 libscirandlib_la_includedir=$(sciincludedir)/randlib
index 1fc0d21..3df7dfb 100644 (file)
@@ -20,7 +20,7 @@ Source: modules\{#RANDLIB}\readme.txt; DestDir: {app}\modules\{#RANDLIB}; Compon
 Source: modules\{#RANDLIB}\licence.txt; DestDir: {app}\modules\{#RANDLIB}; Components: {#COMPN_RANDLIB}
 Source: modules\{#RANDLIB}\changelog.txt; DestDir: {app}\modules\{#RANDLIB}; Components: {#COMPN_RANDLIB}
 ;
-Source: modules\{#RANDLIB}\sci_gateway\randlib; DestDir: {app}\modules\{#RANDLIB}\sci_gateway; Components: {#COMPN_RANDLIB}
+Source: modules\{#RANDLIB}\sci_gateway\randlib_gateway.xml; DestDir: {app}\modules\{#RANDLIB}\sci_gateway; Components: {#COMPN_RANDLIB}
 ;
 Source: modules\{#RANDLIB}\etc\{#RANDLIB}.quit; DestDir: {app}\modules\{#RANDLIB}\etc; Components: {#COMPN_RANDLIB}
 Source: modules\{#RANDLIB}\etc\{#RANDLIB}.start; DestDir: {app}\modules\{#RANDLIB}\etc; Components: {#COMPN_RANDLIB}
index 5b9a990..76e3bb9 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>38</GATEWAY_ID>\r
index 36a7ec3..a58e111 100644 (file)
@@ -15,7 +15,7 @@ libsci2c_la_etc_DATA = etc/sci2c.quit etc/sci2c.start
 
 #### sci2c : gateway declaration #### 
 libsci2c_la_sci_gatewaydir = $(target)/sci_gateway
-libsci2c_la_sci_gateway_DATA = sci_gateway/sci2c
+libsci2c_la_sci_gateway_DATA = sci_gateway/sci2c_gateway.xml
 
 
 include $(top_srcdir)/Makefile.incl.am
index 3e7baa2..323e5bc 100644 (file)
@@ -243,7 +243,7 @@ libsciscicos_la_etc_DATA = etc/scicos.quit etc/scicos.start
 
 #### scicos : gateway declaration #### 
 libsciscicos_la_sci_gatewaydir = $(target)/sci_gateway
-libsciscicos_la_sci_gateway_DATA = sci_gateway/scicos
+libsciscicos_la_sci_gateway_DATA = sci_gateway/scicos_gateway.xml
 
 
 #### scicos : include files ####
index 1b0d90a..d18fc7d 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>45</GATEWAY_ID>\r
index d3c85c0..26f7f4d 100644 (file)
@@ -23,7 +23,7 @@ Source: bin\scicos.dll; DestDir: {app}\bin; DestName: scicos.dll
 ;Source: modules\{#SCICOS}\licence.txt; DestDir: {app}\modules\{#SCICOS}; Components: {#COMPN_SCICOS}
 ;Source: modules\{#SCICOS}\changelog.txt; DestDir: {app}\modules\{#SCICOS}; Components: {#COMPN_SCICOS}
 ;
-;Source: modules\{#SCICOS}\sci_gateway\scicos; DestDir: {app}\modules\{#SCICOS}\sci_gateway; Components: {#COMPN_SCICOS}
+;Source: modules\{#SCICOS}\sci_gateway\scicos_gateway.xml; DestDir: {app}\modules\{#SCICOS}\sci_gateway; Components: {#COMPN_SCICOS}
 ;
 ;Source: modules\{#SCICOS}\etc\{#SCICOS}.quit; DestDir: {app}\modules\{#SCICOS}\etc; Components: {#COMPN_SCICOS}
 ;Source: modules\{#SCICOS}\etc\{#SCICOS}.start; DestDir: {app}\modules\{#SCICOS}\etc; Components: {#COMPN_SCICOS}
index a5008a0..f283101 100644 (file)
@@ -121,7 +121,7 @@ libscisignal_processing_la_etc_DATA = etc/signal_processing.quit etc/signal_proc
 
 #### signal_processing : gateway declaration #### 
 libscisignal_processing_la_sci_gatewaydir = $(target)/sci_gateway
-libscisignal_processing_la_sci_gateway_DATA = sci_gateway/signal_processing
+libscisignal_processing_la_sci_gateway_DATA = sci_gateway/signal_processing_gateway.xml
 
 
 
index aa41eb7..97f2921 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <!-- ffir 1 -->\r
 \r
index 0d3005f..3532451 100644 (file)
@@ -15,7 +15,7 @@ Source: modules\{#SIGPROC}\readme.txt; DestDir: {app}\modules\signal_processing;
 Source: modules\{#SIGPROC}\licence.txt; DestDir: {app}\modules\signal_processing; Components: {#COMPN_SIGPROC}
 Source: modules\{#SIGPROC}\changelog.txt; DestDir: {app}\modules\signal_processing; Components: {#COMPN_SIGPROC}
 ;
-Source: modules\{#SIGPROC}\sci_gateway\signal_processing; DestDir: {app}\modules\signal_processing\sci_gateway; Components: {#COMPN_SIGPROC}
+Source: modules\{#SIGPROC}\sci_gateway\signal_processing_gateway.xml; DestDir: {app}\modules\signal_processing\sci_gateway; Components: {#COMPN_SIGPROC}
 ;
 Source: modules\{#SIGPROC}\etc\{#SIGPROC}.quit; DestDir: {app}\modules\{#SIGPROC}\etc; Components: {#COMPN_SIGPROC}
 Source: modules\{#SIGPROC}\etc\{#SIGPROC}.start; DestDir: {app}\modules\{#SIGPROC}\etc; Components: {#COMPN_SIGPROC}
index 0276eb4..792aa1e 100644 (file)
@@ -43,7 +43,7 @@ libscisound_la_etc_DATA = etc/sound.quit etc/sound.start
 
 #### sound : gateway declaration #### 
 libscisound_la_sci_gatewaydir = $(target)/sci_gateway
-libscisound_la_sci_gateway_DATA = sci_gateway/sound
+libscisound_la_sci_gateway_DATA = sci_gateway/sound_gateway.xml
 
 #### sound : include files ####
 libscisound_la_includedir=$(sciincludedir)/sound
index 33f7e65..8210e9d 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>49</GATEWAY_ID>\r
index 086fb34..c6967c8 100644 (file)
@@ -19,7 +19,7 @@ Source: modules\{#SOUND}\licence.txt; DestDir: {app}\modules\{#SOUND}; Component
 Source: modules\{#SOUND}\readme.txt; DestDir: {app}\modules\{#SOUND}; Components: {#COMPN_SOUND}
 Source: modules\{#SOUND}\VERSION; DestDir: {app}\modules\{#SOUND}; Components: {#COMPN_SOUND}
 ;
-Source: modules\{#SOUND}\sci_gateway\sound; DestDir: {app}\modules\{#SOUND}\sci_gateway; Components: {#COMPN_SOUND}
+Source: modules\{#SOUND}\sci_gateway\sound_gateway.xml; DestDir: {app}\modules\{#SOUND}\sci_gateway; Components: {#COMPN_SOUND}
 ;
 Source: modules\{#SOUND}\includes\*.h; DestDir: {app}\modules\{#SOUND}\includes; Components: {#COMPN_SOUND}
 ;
index 86ff0d4..5a13cb8 100644 (file)
@@ -190,7 +190,7 @@ libscisparse_la_etc_DATA = etc/sparse.quit etc/sparse.start
 
 #### sparse : gateway declaration #### 
 libscisparse_la_sci_gatewaydir = $(target)/sci_gateway
-libscisparse_la_sci_gateway_DATA = sci_gateway/sparse
+libscisparse_la_sci_gateway_DATA = sci_gateway/sparse_gateway.xml
 
 #### sparse : include files ####
 libscisparse_la_includedir=$(sciincludedir)/sparse
index 4528067..4359979 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>27</GATEWAY_ID>\r
index bb3cadf..1f568bb 100644 (file)
@@ -17,7 +17,7 @@ Source: modules\{#SPARSE}\readme.txt; DestDir: {app}\modules\{#SPARSE}; Componen
 Source: modules\{#SPARSE}\licence.txt; DestDir: {app}\modules\{#SPARSE}; Components: {#COMPN_SPARSE}
 Source: modules\{#SPARSE}\changelog.txt; DestDir: {app}\modules\{#SPARSE}; Components: {#COMPN_SPARSE}
 ;
-Source: modules\{#SPARSE}\sci_gateway\sparse; DestDir: {app}\modules\{#SPARSE}\sci_gateway; Components: {#COMPN_SPARSE}
+Source: modules\{#SPARSE}\sci_gateway\sparse_gateway.xml; DestDir: {app}\modules\{#SPARSE}\sci_gateway; Components: {#COMPN_SPARSE}
 ;
 Source: modules\{#SPARSE}\etc\{#SPARSE}.quit; DestDir: {app}\modules\{#SPARSE}\etc; Components: {#COMPN_SPARSE}
 Source: modules\{#SPARSE}\etc\{#SPARSE}.start; DestDir: {app}\modules\{#SPARSE}\etc; Components: {#COMPN_SPARSE}
index aaad566..67010e8 100644 (file)
@@ -66,6 +66,6 @@ libscispecial_functions_la_etc_DATA = etc/special_functions.quit etc/special_fun
 
 #### special_functions : gateway declaration #### 
 libscispecial_functions_la_sci_gatewaydir = $(target)/sci_gateway
-libscispecial_functions_la_sci_gateway_DATA = sci_gateway/special_functions
+libscispecial_functions_la_sci_gateway_DATA = sci_gateway/special_functions_gateway.xml
 
 include $(top_srcdir)/Makefile.incl.am
index f232a8f..cd61970 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>36</GATEWAY_ID>\r
index c5f497c..a18af1c 100644 (file)
@@ -15,7 +15,7 @@ Source: modules\{#SPFUNCTIONS}\readme.txt; DestDir: {app}\modules\{#SPFUNCTIONS}
 Source: modules\{#SPFUNCTIONS}\licence.txt; DestDir: {app}\modules\{#SPFUNCTIONS}; Components: {#COMPN_SCILAB}
 Source: modules\{#SPFUNCTIONS}\changelog.txt; DestDir: {app}\modules\{#SPFUNCTIONS}; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#SPFUNCTIONS}\sci_gateway\special_functions; DestDir: {app}\modules\{#SPFUNCTIONS}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#SPFUNCTIONS}\sci_gateway\special_functions_gateway.xml; DestDir: {app}\modules\{#SPFUNCTIONS}\sci_gateway; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#SPFUNCTIONS}\etc\{#SPFUNCTIONS}.quit; DestDir: {app}\modules\{#SPFUNCTIONS}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#SPFUNCTIONS}\etc\{#SPFUNCTIONS}.start; DestDir: {app}\modules\{#SPFUNCTIONS}\etc; Components: {#COMPN_SCILAB}
index 594aa73..9ca08dd 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>37</GATEWAY_ID>\r
index d3c279c..f869cf1 100644 (file)
@@ -15,7 +15,7 @@ Source: modules\{#STATS}\readme.txt; DestDir: {app}\modules\{#STATS}; Components
 Source: modules\{#STATS}\licence.txt; DestDir: {app}\modules\{#STATS}; Components: {#COMPN_STATS}
 Source: modules\{#STATS}\changelog.txt; DestDir: {app}\modules\{#STATS}; Components: {#COMPN_STATS}
 ;
-Source: modules\{#STATS}\sci_gateway\statistics; DestDir: {app}\modules\{#STATS}\sci_gateway; Components: {#COMPN_STATS}
+Source: modules\{#STATS}\sci_gateway\statistics_gateway.xml; DestDir: {app}\modules\{#STATS}\sci_gateway; Components: {#COMPN_STATS}
 ;
 Source: modules\{#STATS}\etc\{#STATS}.quit; DestDir: {app}\modules\{#STATS}\etc; Components: {#COMPN_STATS}
 Source: modules\{#STATS}\etc\{#STATS}.start; DestDir: {app}\modules\{#STATS}\etc; Components: {#COMPN_STATS}
index 1d5beee..2d7bc0b 100644 (file)
@@ -73,7 +73,7 @@ libscistring_la_etc_DATA = etc/string.quit etc/string.start
 
 #### string : gateway declaration #### 
 libscistring_la_sci_gatewaydir = $(target)/sci_gateway
-libscistring_la_sci_gateway_DATA = sci_gateway/string
+libscistring_la_sci_gateway_DATA = sci_gateway/string_gateway.xml
 
 #### string : include files ####
 libscistring_la_includedir=$(sciincludedir)/string
index 629bb96..0cc3f3c 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>21</GATEWAY_ID>\r
index af33c83..cc31c61 100644 (file)
@@ -18,7 +18,7 @@ Source: modules\{#STRING}\readme.txt; DestDir: {app}\modules\{#STRING}; Componen
 Source: modules\{#STRING}\licence.txt; DestDir: {app}\modules\{#STRING}; Components: {#COMPN_SCILAB}
 Source: modules\{#STRING}\changelog.txt; DestDir: {app}\modules\{#STRING}; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#STRING}\sci_gateway\string; DestDir: {app}\modules\{#STRING}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#STRING}\sci_gateway\string_gateway.xml; DestDir: {app}\modules\{#STRING}\sci_gateway; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#STRING}\etc\{#STRING}.quit; DestDir: {app}\modules\{#STRING}\etc; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#STRING}\etc\{#STRING}.start; DestDir: {app}\modules\{#STRING}\etc; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
index 1154a1e..026ac5e 100644 (file)
@@ -81,7 +81,7 @@ libscistring_la_etc_DATA = etc/string_V2.quit etc/string_V2.start
 
 #### string : gateway declaration #### 
 libscistring_la_sci_gatewaydir = $(target)/sci_gateway
-libscistring_la_sci_gateway_DATA = sci_gateway/string_V2
+libscistring_la_sci_gateway_DATA = sci_gateway/string_V2_gateway.xml
 
 #### string : include files ####
 libscistring_la_includedir=$(sciincludedir)/string
index d979805..2d5ee49 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>21</GATEWAY_ID>\r
index af33c83..cc31c61 100644 (file)
@@ -18,7 +18,7 @@ Source: modules\{#STRING}\readme.txt; DestDir: {app}\modules\{#STRING}; Componen
 Source: modules\{#STRING}\licence.txt; DestDir: {app}\modules\{#STRING}; Components: {#COMPN_SCILAB}
 Source: modules\{#STRING}\changelog.txt; DestDir: {app}\modules\{#STRING}; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#STRING}\sci_gateway\string; DestDir: {app}\modules\{#STRING}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#STRING}\sci_gateway\string_gateway.xml; DestDir: {app}\modules\{#STRING}\sci_gateway; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#STRING}\etc\{#STRING}.quit; DestDir: {app}\modules\{#STRING}\etc; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#STRING}\etc\{#STRING}.start; DestDir: {app}\modules\{#STRING}\etc; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
index ee6e781..65decdf 100644 (file)
@@ -41,7 +41,7 @@ libscisymbolic_la_etc_DATA = etc/symbolic.quit etc/symbolic.start
 
 #### symbolic : gateway declaration #### 
 libscisymbolic_la_sci_gatewaydir = $(target)/sci_gateway
-libscisymbolic_la_sci_gateway_DATA = sci_gateway/symbolic
+libscisymbolic_la_sci_gateway_DATA = sci_gateway/symbolic_gateway.xml 
 
 
 #### symbolic : include files ####
index e29b8ec..63c1ef0 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>22</GATEWAY_ID>\r
index 8193316..d586fdc 100644 (file)
@@ -18,7 +18,7 @@ Source: modules\{#SYMBOLIC}\readme.txt; DestDir: {app}\modules\{#SYMBOLIC}; Comp
 Source: modules\{#SYMBOLIC}\licence.txt; DestDir: {app}\modules\{#SYMBOLIC}; Components: {#COMPN_SYMB}
 Source: modules\{#SYMBOLIC}\changelog.txt; DestDir: {app}\modules\{#SYMBOLIC}; Components: {#COMPN_SYMB}
 ;
-Source: modules\{#SYMBOLIC}\sci_gateway\symbolic; DestDir: {app}\modules\{#SYMBOLIC}\sci_gateway; Components: {#COMPN_SYMB}
+Source: modules\{#SYMBOLIC}\sci_gateway\symbolic_gateway.xml; DestDir: {app}\modules\{#SYMBOLIC}\sci_gateway; Components: {#COMPN_SYMB}
 ;
 Source: modules\{#SYMBOLIC}\etc\{#SYMBOLIC}.quit; DestDir: {app}\modules\{#SYMBOLIC}\etc; Components: {#COMPN_SYMB}
 Source: modules\{#SYMBOLIC}\etc\{#SYMBOLIC}.start; DestDir: {app}\modules\{#SYMBOLIC}\etc; Components: {#COMPN_SYMB}
index a59e884..45b9079 100644 (file)
@@ -256,7 +256,7 @@ libscitclsci_la_etc_DATA = etc/tclsci.quit etc/tclsci.start
 
 #### tclsci : gateway declaration #### 
 libscitclsci_la_sci_gatewaydir = $(target)/sci_gateway
-libscitclsci_la_sci_gateway_DATA = sci_gateway/tclsci
+libscitclsci_la_sci_gateway_DATA = sci_gateway/tclsci_gateway.xml
 
 #### tclsci : include files ####
 libscitclsci_la_includedir=$(sciincludedir)/tclsci
index 9e713cc..f4689a8 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>40</GATEWAY_ID>\r
index 24639ed..3ec4c02 100644 (file)
@@ -15,7 +15,7 @@ Source: modules\{#TCLSCI}\readme.txt; DestDir: {app}\modules\{#TCLSCI}; Componen
 Source: modules\{#TCLSCI}\licence.txt; DestDir: {app}\modules\{#TCLSCI}; Components: {#COMPN_TCLSCI}
 Source: modules\{#TCLSCI}\changelog.txt; DestDir: {app}\modules\{#TCLSCI}; Components: {#COMPN_TCLSCI}
 ;
-Source: modules\{#TCLSCI}\sci_gateway\tclsci; DestDir: {app}\modules\{#TCLSCI}\sci_gateway; Components: {#COMPN_TCLSCI}
+Source: modules\{#TCLSCI}\sci_gateway\tclsci_gateway.xml; DestDir: {app}\modules\{#TCLSCI}\sci_gateway; Components: {#COMPN_TCLSCI}
 ;
 Source: modules\{#TCLSCI}\etc\{#TCLSCI}.quit; DestDir: {app}\modules\{#TCLSCI}\etc; Components: {#COMPN_TCLSCI}
 Source: modules\{#TCLSCI}\etc\{#TCLSCI}.start; DestDir: {app}\modules\{#TCLSCI}\etc; Components: {#COMPN_TCLSCI}
index 2ddd487..7fad697 100644 (file)
@@ -46,7 +46,7 @@ libscitime_la_etc_DATA = etc/time.quit etc/time.start
 
 #### time : gateway declaration #### 
 libscitime_la_sci_gatewaydir = $(target)/sci_gateway
-libscitime_la_sci_gateway_DATA = sci_gateway/time
+libscitime_la_sci_gateway_DATA = sci_gateway/time_gateway.xml
 
 #### time : include files ####
 libscitime_la_includedir=$(sciincludedir)/time
index 0578d7c..44bf4d2 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>48</GATEWAY_ID>\r
index fd3bd42..47f490c 100644 (file)
@@ -20,7 +20,7 @@ Source: modules\{#TIME}\VERSION; DestDir: {app}\modules\{#TIME}; Components: {#C
 ;
 Source: modules\{#TIME}\includes\*.h; DestDir: {app}\modules\{#TIME}\includes; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#TIME}\sci_gateway\time; DestDir: {app}\modules\{#TIME}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#TIME}\sci_gateway\time_gateway.xml; DestDir: {app}\modules\{#TIME}\sci_gateway; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#TIME}\etc\{#TIME}.quit; DestDir: {app}\modules\{#TIME}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#TIME}\etc\{#TIME}.start; DestDir: {app}\modules\{#TIME}\etc; Components: {#COMPN_SCILAB}
index 78c6bf0..16aeaf6 100644 (file)
@@ -51,7 +51,7 @@ libsciwintools_la_etc_DATA = etc/wintools.quit etc/wintools.start
 
 #### wintools : gateway declaration #### 
 libsciwintools_la_sci_gatewaydir = $(target)/sci_gateway
-libsciwintools_la_sci_gateway_DATA = sci_gateway/wintools
+libsciwintools_la_sci_gateway_DATA = sci_gateway/wintools_gateway.xml
 
 #### wintools : include files ####
 libsciwintools_la_includedir=$(sciincludedir)/wintools
index 8424f4d..daf4cdc 100644 (file)
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+\r
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
+\r
+<GATEWAY>\r
+\r
 <!-- =================== -->\r
 <!--\r
  Scilab \r
@@ -8,9 +13,6 @@
  Don't edit if you aren't sure\r
 -->\r
 <!-- =================== -->\r
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">\r
-\r
-<GATEWAY>\r
 \r
 <PRIMITIVE>\r
   <GATEWAY_ID>47</GATEWAY_ID>\r
index 5b60c6b..a3b6a81 100644 (file)
@@ -15,7 +15,7 @@ Source: modules\{#WINTOOLS}\readme.txt; DestDir: {app}\modules\{#WINTOOLS}; Comp
 Source: modules\{#WINTOOLS}\licence.txt; DestDir: {app}\modules\{#WINTOOLS}; Components: {#COMPN_SCILAB}
 Source: modules\{#WINTOOLS}\changelog.txt; DestDir: {app}\modules\{#WINTOOLS}; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#WINTOOLS}\sci_gateway\wintools; DestDir: {app}\modules\{#WINTOOLS}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#WINTOOLS}\sci_gateway\wintools_gateway.xml; DestDir: {app}\modules\{#WINTOOLS}\sci_gateway; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#WINTOOLS}\etc\{#WINTOOLS}.quit; DestDir: {app}\modules\{#WINTOOLS}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#WINTOOLS}\etc\{#WINTOOLS}.start; DestDir: {app}\modules\{#WINTOOLS}\etc; Components: {#COMPN_SCILAB}