build on windows + module dynamically loaded 49/4749/3
Allan CORNET [Thu, 25 Aug 2011 11:28:17 +0000 (13:28 +0200)]
Change-Id: I21560b9c7021f3ff2e2a295497e43b529e4e6442

30 files changed:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
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/xml/LibScilab_Import.def [new file with mode: 0644]
scilab/modules/xml/build.xml [deleted file]
scilab/modules/xml/includes/gw_xml.h
scilab/modules/xml/includes/xml_constants.h
scilab/modules/xml/includes/xml_mlist.h
scilab/modules/xml/sci_gateway/c/gw_xml.c
scilab/modules/xml/sci_gateway/cpp/sci_extraction.cpp
scilab/modules/xml/sci_gateway/cpp/sci_no_xml.cpp [deleted file]
scilab/modules/xml/sci_gateway/cpp/sci_print.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlClose.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlGetOpenStreams.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlRead.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlXPath.cpp
scilab/modules/xml/sci_gateway/xml_gateway.xml
scilab/modules/xml/src/c/DllmainXml.c [new file with mode: 0644]
scilab/modules/xml/src/c/xml.rc [new file with mode: 0644]
scilab/modules/xml/src/c/xmlread.c [deleted file]
scilab/modules/xml/src/cpp/XMLDocument.cpp
scilab/modules/xml/src/cpp/XMLObject.hxx
scilab/modules/xml/src/cpp/extraction.hpp
scilab/modules/xml/xml.iss [new file with mode: 0644]
scilab/modules/xml/xml.vcxproj [new file with mode: 0644]
scilab/modules/xml/xml.vcxproj.filters [new file with mode: 0644]
scilab/tools/innosetup/files.iss

index 1e4404c..f60b6f6 100644 (file)
@@ -577,6 +577,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-all", "Visual-Studio-s
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noui_data", "modules\ui_data\src\noui_data\noui_data.vcxproj", "{337A52F8-310E-49E3-A2BA-F19CA32EB617}"
 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
@@ -1805,6 +1807,14 @@ Global
                {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|Win32.Build.0 = Release|Win32
                {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|x64.ActiveCfg = Release|x64
                {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|x64.Build.0 = Release|x64
+               {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
index 350570e..8dc1736 100644 (file)
@@ -357,6 +357,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-all", "Visual-Studio-s
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noui_data", "modules\ui_data\src\noui_data\noui_data.vcxproj", "{337A52F8-310E-49E3-A2BA-F19CA32EB617}"
 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
@@ -1581,6 +1583,14 @@ Global
                {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|Win32.Build.0 = Release|Win32
                {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|x64.ActiveCfg = Release|x64
                {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|x64.Build.0 = Release|x64
+               {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
index 9a591a8..a604df2 100644 (file)
@@ -89,7 +89,7 @@
 /* 65 */                                               #include "dynamic_gateways.h" /* action_binding */
 /* 66 */                        #include "dynamic_parallel.h" /* parallel */
 /* 67 */                        #include "dynamic_gateways.h" /* ui_data */
-/* 68 */                        #include "../../xml/includes/gw_xml.h" /* xml */
+/* 68 */                        #include "dynamic_gateways.h" /* xml */
 
 
 
index 61a6877..a0697b2 100644 (file)
@@ -103,7 +103,7 @@ static OpTab Interfaces[INTERFACES_MAX] = {
     /* 65  */ {gw_dynamic_action_binding},
     /* 66  */ {gw_dynamic_parallel},
     /* 67  */ {gw_dynamic_ui_data},
-    /* 68  */ {gw_xml},
+    /* 68  */ {gw_dynamic_xml}
 };
 /*--------------------------------------------------------------------------*/
 /**
index d2f8bcf..0eb9b07 100644 (file)
@@ -1,7 +1,7 @@
 /*
 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 * Copyright (C) 2008 - INRIA - Allan CORNET
-* Copyright (C) 2010 - DIGITEO - Allan CORNET
+* Copyright (C) 2010-2011 - DIGITEO - Allan CORNET
 *
 * This file must be used under the terms of the CeCILL.
 * This source file is licensed as described in the file COPYING, which
@@ -385,6 +385,22 @@ int gw_dynamic_ui_data(void)
         &ptr_gw_ui_data);
 }
 /*--------------------------------------------------------------------------*/
+/* 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)
 {
     freeDynamicGateway(&dynlibname_special_functions,
@@ -492,6 +508,11 @@ void freeAllDynamicGateways(void)
         &gatewayname_ui_data,
         &hUi_dataLib,
         &ptr_gw_ui_data);
+
+    freeDynamicGateway(&dynlibname_xml,
+        &gatewayname_xml,
+        &hXmlLib,
+        &ptr_gw_xml);
 }
 /*--------------------------------------------------------------------------*/
 
index 0546480..352f4da 100644 (file)
@@ -168,6 +168,14 @@ int gw_dynamic_graphic_export(void);
 */
 int gw_dynamic_action_binding(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__ */
 /*--------------------------------------------------------------------------*/
 
diff --git a/scilab/modules/xml/LibScilab_Import.def b/scilab/modules/xml/LibScilab_Import.def
new file mode 100644 (file)
index 0000000..db4dac5
--- /dev/null
@@ -0,0 +1,10 @@
+LIBRARY    LibScilab.dll
+
+
+EXPORTS
+ callFunctionFromGateway
+ checkrhs_
+ checklhs_
+ com_
+ intersci_
+ putlhsvar_
\ No newline at end of file
diff --git a/scilab/modules/xml/build.xml b/scilab/modules/xml/build.xml
deleted file mode 100644 (file)
index e869bd9..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2009 - DIGITEO - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- -->
-<project name="hdf5" default="jar">
-  <import file="../../build.incl.xml"/>
-  <property name="library.name" value="${library.hdf5.name}"/>
-  <property name="library.title" value="HDF format support"/>
-  <description>
-       Build the hdf5 Scilab module
-  </description>
-</project>
index b90c852..18dd634 100644 (file)
 #define __GW_XML_H__
 /*--------------------------------------------------------------------------*/ 
 #include "dynlib_xml_scilab.h"
-#include "api_scilab.h"
-
 /*--------------------------------------------------------------------------*/ 
 XML_SCILAB_IMPEXP int gw_xml(void);
 /*--------------------------------------------------------------------------*/ 
-XML_SCILAB_IMPEXP int sci_xmlRead(char *fname, unsigned long fname_len);
-XML_SCILAB_IMPEXP int sci_xmlClose(char *fname, unsigned long fname_len);
-XML_SCILAB_IMPEXP int sci_xmlDump(char *fname, unsigned long fname_len);
-XML_SCILAB_IMPEXP int sci_xmlGetOpenStreams(char *fname, unsigned long fname_len);
-XML_SCILAB_IMPEXP int sci_xmlXPath(char *fname, unsigned long fname_len);
-XML_SCILAB_IMPEXP int sci_percent_XMLDoc_e(char *fname, unsigned long fname_len);
-XML_SCILAB_IMPEXP int sci_percent_XMLElem_e(char *fname, unsigned long fname_len);
-XML_SCILAB_IMPEXP int sci_percent_XMLNs_e(char *fname, unsigned long fname_len);
-XML_SCILAB_IMPEXP int sci_percent_XMLAttr_e(char *fname, unsigned long fname_len);
-XML_SCILAB_IMPEXP int sci_percent_XMLList_e(char *fname, unsigned long fname_len);
-XML_SCILAB_IMPEXP int sci_percent_XMLDoc_p(char *fname, unsigned long fname_len);
-XML_SCILAB_IMPEXP int sci_percent_XMLElem_p(char *fname, unsigned long fname_len);
-XML_SCILAB_IMPEXP int sci_percent_XMLNs_p(char *fname, unsigned long fname_len);
-XML_SCILAB_IMPEXP int sci_percent_XMLList_p(char *fname, unsigned long fname_len);
-XML_SCILAB_IMPEXP int sci_percent_XMLAttr_p(char *fname, unsigned long fname_len);
-XML_SCILAB_IMPEXP int sci_percent_XMLList_size(char *fname, unsigned long fname_len);
+int sci_xmlRead(char *fname, unsigned long fname_len);
+int sci_xmlClose(char *fname, unsigned long fname_len);
+int sci_xmlDump(char *fname, unsigned long fname_len);
+int sci_xmlGetOpenStreams(char *fname, unsigned long fname_len);
+int sci_xmlXPath(char *fname, unsigned long fname_len);
+int sci_percent_XMLDoc_e(char *fname, unsigned long fname_len);
+int sci_percent_XMLElem_e(char *fname, unsigned long fname_len);
+int sci_percent_XMLNs_e(char *fname, unsigned long fname_len);
+int sci_percent_XMLAttr_e(char *fname, unsigned long fname_len);
+int sci_percent_XMLList_e(char *fname, unsigned long fname_len);
+int sci_percent_XMLDoc_p(char *fname, unsigned long fname_len);
+int sci_percent_XMLElem_p(char *fname, unsigned long fname_len);
+int sci_percent_XMLNs_p(char *fname, unsigned long fname_len);
+int sci_percent_XMLList_p(char *fname, unsigned long fname_len);
+int sci_percent_XMLAttr_p(char *fname, unsigned long fname_len);
+int sci_percent_XMLList_size(char *fname, unsigned long fname_len);
 /*--------------------------------------------------------------------------*/ 
 #endif /* __GW_XML_H__ */
 /*--------------------------------------------------------------------------*/
index bcaa5f7..7c48edb 100644 (file)
@@ -10,6 +10,9 @@
  *
  */
 
+#ifndef __XML_CONSTANTS_H__
+#define __XML_CONSTANTS_H__
+
 const char * nodes_type[] = { "XML_ELEMENT_NODE",
                               "XML_ATTRIBUTE_NODE",
                               "XML_TEXT_NODE",
@@ -31,3 +34,5 @@ const char * nodes_type[] = { "XML_ELEMENT_NODE",
                               "XML_XINCLUDE_START",
                               "XML_XINCLUDE_END",
                               "XML_DOCB_DOCUMENT_NODE" };
+
+#endif /* __XML_CONSTANTS_H__ */
index 21651b5..c191306 100644 (file)
@@ -10,6 +10,9 @@
  *
  */
 
+#ifndef __XML_MLIST_H__
+#define __XML_MLIST_H__
+
 #define XMLDOCUMENT 1
 #define XMLELEMENT 2
 #define XMLATTRIBUTE 3
@@ -17,8 +20,6 @@
 #define XMLLIST 5
 #define XMLNOTHANDLED 6
 
-#ifndef XML_MLIST_H
-#define XML_MLIST_H
 int createXMLObjectAtPos(int type, int pos, int id);
 int createXMLObjectAtPosInList(int * list, int stackPos, int type, int pos, int id);
 int isXMLDoc(int * mlist);
@@ -30,4 +31,4 @@ int isXMLObject(int * mlist);
 int isXMLNotHandled(int * mlist);
 int getXMLObjectId(int * mlist);
 
-#endif
+#endif /* __XML_MLIST_H__ */
index 3cad774..5520057 100644 (file)
  */
 /*--------------------------------------------------------------------------*/
 #include "gw_xml.h"
+#include "api_scilab.h"
 #include "callFunctionFromGateway.h"
 #include "stack-c.h"
 #include "MALLOC.h"
-
 /*--------------------------------------------------------------------------*/
 /*  interface function */
 /*--------------------------------------------------------------------------*/
index ac4cf0b..c11b17d 100644 (file)
@@ -16,7 +16,7 @@ using namespace org_modules_xml;
 
 int sci_percent_XMLDoc_e(char *fname, unsigned long fname_len)
 {
-    return sci_extraction<XMLDocument>(fname, fname_len);
+    return sci_extraction<org_modules_xml::XMLDocument>(fname, fname_len);
 }
 /*--------------------------------------------------------------------------*/
 int sci_percent_XMLElem_e(char *fname, unsigned long fname_len)
diff --git a/scilab/modules/xml/sci_gateway/cpp/sci_no_xml.cpp b/scilab/modules/xml/sci_gateway/cpp/sci_no_xml.cpp
deleted file mode 100644 (file)
index 48d46ee..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2009-2009 - DIGITEO - Bruno JOFRET
- *
- *  This file must be used under the terms of the CeCILL.
- *  This source file is licensed as described in the file COPYING, which
- *  you should have received as part of this distribution.  The terms
- *  are also available at
- *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-extern "C" {
-#include "stack-c.h"
-#include "gw_xml.h"
-#include "Scierror.h"
-#include "localization.h"
-}
-
-int gw_xml()
-{
-    Scierror(999, _("XML is not installed"));
-    return 0;
-}
-
-int sci_xmlRead(char *fname, unsigned long fname_len)
-{
-    Scierror(999, _("XML is not installed"));
-    PutLhsVar();
-    return 0;
-}
-
-int sci_xmlXPath(char *fname, unsigned long fname_len)
-{
-    Scierror(999, _("XML is not installed"));
-    PutLhsVar();
-    return 0;
-}
index d316bb9..068466c 100644 (file)
@@ -36,7 +36,6 @@ int sci_print(char * fname, unsigned long fname_len)
     int id;
     SciErr err;
     int *mlistaddr = 0;
-    int ret;
 
     CheckRhs(1, 1);
 
index b3c076a..155b518 100644 (file)
@@ -30,7 +30,7 @@ int sci_xmlClose(char * fname, unsigned long fname_len)
     int id;
     SciErr err;
     int * addr = 0;
-    XMLDocument * doc;
+    org_modules_xml::XMLDocument * doc;
 
     CheckLhs(1, 1);
     CheckRhs(1, 1);
@@ -45,7 +45,7 @@ int sci_xmlClose(char * fname, unsigned long fname_len)
     if (isXMLDoc(addr))
     {
         id = getXMLObjectId(addr);
-        doc = XMLObject::getFromId<XMLDocument>(id);
+        doc = XMLObject::getFromId<org_modules_xml::XMLDocument>(id);
         if (!doc)
         {
             Scierror(999, "%s: XML document does not exist\n", fname);
index 2fa97ee..f277034 100644 (file)
@@ -27,7 +27,6 @@ using namespace org_modules_xml;
 /*--------------------------------------------------------------------------*/
 int sci_xmlGetOpenStreams(char *fname, unsigned long fname_len)
 {
-    int id;
     int j = 1;
     SciErr err;
     int *addr = 0;
@@ -35,16 +34,16 @@ int sci_xmlGetOpenStreams(char *fname, unsigned long fname_len)
     CheckLhs(1, 1);
     CheckRhs(0, 0);
 
-    std::list<XMLDocument *> & openDocs = XMLDocument::getOpenDocuments();
+    std::list<org_modules_xml::XMLDocument *> & openDocs = org_modules_xml::XMLDocument::getOpenDocuments();
 
-    err = createList(pvApiCtx, Rhs + 1, openDocs.size(), &addr);
+    err = createList(pvApiCtx, Rhs + 1, (int)openDocs.size(), &addr);
     if (err.iErr)
     {
         printError(&err, 0);
         return 0;
     }
 
-    for (std::list<XMLDocument *>::iterator i = openDocs.begin(); i != openDocs.end(); i++, j++)
+    for (std::list<org_modules_xml::XMLDocument *>::iterator i = openDocs.begin(); i != openDocs.end(); i++, j++)
     {
         createXMLObjectAtPosInList(addr, Rhs + 1, XMLDOCUMENT, j, (*i)->getId());
     }
index 8ecb3e1..c8f08c1 100644 (file)
  *
  */
 
-#include "XMLObject.hxx"
-#include "XMLDocument.hxx"
 #include <iostream>
 
 extern "C"
 {
+#include "xml.h"
 #include "gw_xml.h"
 #include "stack-c.h"
 #include "Scierror.h"
@@ -23,13 +22,17 @@ extern "C"
 #include "xml_mlist.h"
 }
 
+#include "XMLObject.hxx"
+#include "XMLDocument.hxx"
+
+
 using namespace org_modules_xml;
 
 /*--------------------------------------------------------------------------*/
 int sci_xmlRead(char *fname, unsigned long fname_len)
 {
-    XMLDocument *doc;
-    int id;
+    org_modules_xml::XMLDocument *doc;
+    
     SciErr err;
     int *addr = 0;
     char *path = 0;
@@ -53,7 +56,7 @@ int sci_xmlRead(char *fname, unsigned long fname_len)
     
     getAllocatedSingleString(pvApiCtx, addr, &path);
     
-    doc = new XMLDocument((const char *) path, &error);
+    doc = new org_modules_xml::XMLDocument((const char *) path, &error);
     freeAllocatedSingleString(path);
 
     if (error)
index e1ea0ea..9c203f2 100644 (file)
  *
  */
 
-#include "XMLObject.hxx"
-#include "XMLDocument.hxx"
-#include "XMLXPath.hxx"
-#include "XMLNodeSet.hxx"
 
 extern "C"
 {
+#include "xml.h"
 #include "gw_xml.h"
 #include "stack-c.h"
 #include "Scierror.h"
@@ -24,6 +21,11 @@ extern "C"
 #include "xml_mlist.h"
 }
 
+#include "XMLObject.hxx"
+#include "XMLDocument.hxx"
+#include "XMLXPath.hxx"
+#include "XMLNodeSet.hxx"
+
 using namespace org_modules_xml;
 
 /*--------------------------------------------------------------------------*/
@@ -31,7 +33,7 @@ int sci_xmlXPath(char * fname, unsigned long fname_len)
 {
     int id;
     SciErr err;
-    XMLDocument * doc;
+    org_modules_xml::XMLDocument * doc;
     XMLXPath * xpath;
     XMLNodeSet * set;
     int b;
@@ -58,7 +60,7 @@ int sci_xmlXPath(char * fname, unsigned long fname_len)
     }
 
     id = getXMLObjectId(addr);
-    doc = XMLObject::getFromId<XMLDocument>(id);
+    doc = XMLObject::getFromId<org_modules_xml::XMLDocument>(id);
 
     if (!doc)
     {
index 0ba16f5..6a91e4b 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2009 - DIGITEO - Allan CORNET
+ * Copyright (C) 2011 - DIGITEO - Calixte Denizet
  * 
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
diff --git a/scilab/modules/xml/src/c/DllmainXml.c b/scilab/modules/xml/src/c/DllmainXml.c
new file mode 100644 (file)
index 0000000..c105c9a
--- /dev/null
@@ -0,0 +1,34 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA - Allan CORNET
+ * 
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at    
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+/*--------------------------------------------------------------------------*/ 
+#include <windows.h> 
+/*--------------------------------------------------------------------------*/ 
+#pragma comment(lib,"../../bin/libxml2.lib")
+/*--------------------------------------------------------------------------*/ 
+int WINAPI DllMain (HINSTANCE hInstance , DWORD reason, PVOID pvReserved)
+{
+  switch (reason) 
+    {
+    case DLL_PROCESS_ATTACH:
+      break;
+    case DLL_PROCESS_DETACH:
+      break;
+    case DLL_THREAD_ATTACH:
+      break;
+    case DLL_THREAD_DETACH:
+      break;
+    }
+  return 1;
+}
+/*--------------------------------------------------------------------------*/ 
+
diff --git a/scilab/modules/xml/src/c/xml.rc b/scilab/modules/xml/src/c/xml.rc
new file mode 100644 (file)
index 0000000..fb8c8da
--- /dev/null
@@ -0,0 +1,96 @@
+// Microsoft Visual C++ generated resource script.
+//
+
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+//#include "afxres.h"
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// French (France) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
+#ifdef _WIN32
+LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 5,4,0,0
+ PRODUCTVERSION 5,4,0,0
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040c04b0"
+        BEGIN
+            VALUE "FileDescription", "xml module"
+            VALUE "FileVersion", "5, 4, 0, 0"
+            VALUE "InternalName", "xml module"
+            VALUE "LegalCopyright", "Copyright (C) 2011"
+            VALUE "OriginalFilename", "xml.dll"
+            VALUE "ProductName", " xml module"
+            VALUE "ProductVersion", "5, 4, 0, 0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x40c, 1200
+    END
+END
+
+#endif    // French (France) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/scilab/modules/xml/src/c/xmlread.c b/scilab/modules/xml/src/c/xmlread.c
deleted file mode 100644 (file)
index b5ab5d5..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2011 - DIGITEO - Calixte DENIZET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-
-
-int xmlread(char *path, xmlDoc **doc) 
-{
-    LIBXML_TEST_VERSION
-
-    *doc = xmlReadFile(path, NULL, 0);
-}
index 1796033..1839556 100644 (file)
@@ -187,7 +187,7 @@ namespace org_modules_xml
         va_list args;
 
         va_start(args, msg);
-        std::vsnprintf(str, BUFFER_SIZE, msg, args);
+        vsnprintf(str, BUFFER_SIZE, msg, args);
         va_end(args);
         errorBuffer->append(str);
     }
index 2bd20f8..05aa400 100644 (file)
@@ -29,7 +29,7 @@ namespace org_modules_xml
         virtual ~XMLObject() { }
 
         virtual XMLObject * getXMLObjectParent() = 0;
-       virtual std::string * toString() { }
+       virtual std::string * toString() {return new std::string("");};
        virtual std::string * dump() { return new std::string(""); }
 
        int getId() { return id; }
index 124c305..54b25c0 100644 (file)
@@ -49,7 +49,7 @@ int createStringOnStack(char * fname, const char * str, int pos)
     return 1;
 }
 /*--------------------------------------------------------------------------*/
-int createVariableOnStack(char * fname, XMLDocument & doc, const char * field, int pos)
+int createVariableOnStack(char * fname, org_modules_xml::XMLDocument & doc, const char * field, int pos)
 {
     if (!strcmp("root", field))
     {
@@ -72,7 +72,7 @@ int createVariableOnStack(char * fname, XMLElement & elem, const char * field, i
 {
     if (!strcmp("name", field))
     {
-        createStringOnStack(fname, elem.getNodeName(), pos);
+        return createStringOnStack(fname, elem.getNodeName(), pos);
     }
     else if (!strcmp("namespace", field))
     {
@@ -81,12 +81,13 @@ int createVariableOnStack(char * fname, XMLElement & elem, const char * field, i
     else if (!strcmp("content", field))
     {
         const char * content = elem.getNodeContent();
-        createStringOnStack(fname, content, pos);
+        int ierr = createStringOnStack(fname, content, pos);
         xmlFree(const_cast<char *>(content));
+        return ierr;
     }
     else if (!strcmp("type", field))
     {
-        createStringOnStack(fname, nodes_type[elem.getNodeType() - 1], pos);
+        return createStringOnStack(fname, nodes_type[elem.getNodeType() - 1], pos);
     }
     else if (!strcmp("parent", field))
     {
@@ -103,14 +104,12 @@ int createVariableOnStack(char * fname, XMLElement & elem, const char * field, i
     else
     {
         Scierror(999, "%s: Unknown field: %s\n", fname, field);
-        return 0;
     }
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 int createVariableOnStack(char * fname, XMLNs & ns, const char * field, int pos)
 {
-    SciErr err;
-
     if (!strcmp("uri", field))
     {
         createStringOnStack(fname, ns.getURI(), pos);
diff --git a/scilab/modules/xml/xml.iss b/scilab/modules/xml/xml.iss
new file mode 100644 (file)
index 0000000..9166c1e
--- /dev/null
@@ -0,0 +1,40 @@
+;
+; Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+; Copyright (C) DIGITEO - 2011 - Allan CORNET
+;
+; This file must be used under the terms of the CeCILL.
+; This source file is licensed as described in the file COPYING, which
+; you should have received as part of this distribution.  The terms
+; are also available at
+; http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+;
+;--------------------------------------------------------------------------------------------------------------
+; Inno Setup Script (5.3 and more) for Scilab (UNICODE version required)
+;
+;--------------------------------------------------------------------------------------------------------------
+; xml module
+;--------------------------------------------------------------------------------------------------------------
+;
+#define XML "xml"
+;
+Source: bin\{#xml}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\{#xml}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+;
+Source: modules\{#xml}\license.txt; DestDir: {app}\modules\{#xml}; Components: {#COMPN_SCILAB}
+;
+Source: modules\{#xml}\sci_gateway\{#xml}_gateway.xml; DestDir: {app}\modules\{#xml}\sci_gateway; Components: {#COMPN_SCILAB}
+;
+Source: modules\{#xml}\etc\{#xml}.quit; DestDir: {app}\modules\{#xml}\etc; Components: {#COMPN_SCILAB}
+Source: modules\{#xml}\etc\{#xml}.start; DestDir: {app}\modules\{#xml}\etc; Components: {#COMPN_SCILAB}
+;
+Source: modules\{#xml}\macros\buildmacros.sce; DestDir: {app}\modules\{#xml}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#xml}\macros\buildmacros.bat; DestDir: {app}\modules\{#xml}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#xml}\macros\cleanmacros.bat; DestDir: {app}\modules\{#xml}\macros; Components: {#COMPN_SCILAB}
+;Source: modules\{#xml}\macros\*.bin; DestDir: {app}\modules\{#xml}\macros; Components: {#COMPN_SCILAB}
+;Source: modules\{#xml}\macros\*.sci; DestDir: {app}\modules\{#xml}\macros; Components: {#COMPN_SCILAB}
+;Source: modules\{#xml}\macros\lib; DestDir: {app}\modules\{#xml}\macros; Components: {#COMPN_SCILAB}
+;Source: modules\{#xml}\macros\names; DestDir: {app}\modules\{#xml}\macros; Components: {#COMPN_SCILAB}
+;
+Source: modules\{#xml}\tests\*.*; DestDir: {app}\modules\{#xml}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
+;
+;--------------------------------------------------------------------------------------------------------------
diff --git a/scilab/modules/xml/xml.vcxproj b/scilab/modules/xml/xml.vcxproj
new file mode 100644 (file)
index 0000000..2054440
--- /dev/null
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{EF5402DA-29FD-4F1B-B98B-D284D4E27C15}</ProjectGuid>
+    <RootNamespace>xml</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../core/includes;../output_stream/includes;../fileio/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/libxml2;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;XML_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <PreLinkEvent>
+      <Message>Make dependencies</Message>
+      <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
+</Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalDependencies>LibScilab.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../core/includes;../output_stream/includes;../fileio/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/libxml2;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;XML_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <PreLinkEvent>
+      <Message>Make dependencies</Message>
+      <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
+</Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalDependencies>LibScilab.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../core/includes;../output_stream/includes;../fileio/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/libxml2;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;XML_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <PreLinkEvent>
+      <Message>Make dependencies</Message>
+      <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
+</Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalDependencies>LibScilab.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>
+      </LinkTimeCodeGeneration>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../core/includes;../output_stream/includes;../fileio/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/libxml2;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;XML_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <PreLinkEvent>
+      <Message>Make dependencies</Message>
+      <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
+</Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalDependencies>LibScilab.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>
+      </LinkTimeCodeGeneration>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="src\c\xml.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="locales\en_US\xml.pot" />
+    <None Include="LibScilab_Import.def" />
+    <None Include="Makefile.am" />
+    <None Include="xml.iss" />
+    <None Include="sci_gateway\xml_gateway.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\libs\MALLOC\MALLOC.vcxproj">
+      <Project>{6a84ad8c-ba18-4a3f-9c72-ec3df0939e9e}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\tools\Dumpexts\Dumpexts.vcxproj">
+      <Project>{3170e4c2-1173-4264-a222-7ee8ccb3ddf7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\api_scilab\api_scilab.vcxproj">
+      <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\fileio\fileio.vcxproj">
+      <Project>{4fc72d4a-80ee-4b1a-8724-0201c1a35621}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\localization\src\localization.vcxproj">
+      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\output_stream\src\c\output_stream.vcxproj">
+      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\cpp\extraction.hpp" />
+    <ClInclude Include="src\cpp\VariableScope.hxx" />
+    <ClInclude Include="src\cpp\XMLAttr.hxx" />
+    <ClInclude Include="src\cpp\XMLDocument.hxx" />
+    <ClInclude Include="src\cpp\XMLElement.hxx" />
+    <ClInclude Include="src\cpp\XMLList.hxx" />
+    <ClInclude Include="src\cpp\XMLNodeList.hxx" />
+    <ClInclude Include="src\cpp\XMLNodeSet.hxx" />
+    <ClInclude Include="src\cpp\XMLNotHandledElement.hxx" />
+    <ClInclude Include="src\cpp\XMLNs.hxx" />
+    <ClInclude Include="src\cpp\XMLObject.hxx" />
+    <ClInclude Include="src\cpp\XMLXPath.hxx" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="sci_gateway\cpp\sci_extraction.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_percent_XMLAttr_e.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_percent_XMLList_e.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_percent_XMLList_size.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_print.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_xmlClose.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_xmlDump.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_xmlGetOpenStreams.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_xmlRead.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_xmlXPath.cpp" />
+    <ClCompile Include="sci_gateway\c\gw_xml.c" />
+    <ClCompile Include="src\cpp\VariableScope.cpp" />
+    <ClCompile Include="src\cpp\XMLAttr.cpp" />
+    <ClCompile Include="src\cpp\XMLDocument.cpp" />
+    <ClCompile Include="src\cpp\XMLElement.cpp" />
+    <ClCompile Include="src\cpp\XMLList.cpp" />
+    <ClCompile Include="src\cpp\XMLNodeList.cpp" />
+    <ClCompile Include="src\cpp\XMLNodeSet.cpp" />
+    <ClCompile Include="src\cpp\XMLNotHandledElement.cpp" />
+    <ClCompile Include="src\cpp\XMLNs.cpp" />
+    <ClCompile Include="src\cpp\XMLObject.cpp" />
+    <ClCompile Include="src\cpp\XMLXPath.cpp" />
+    <ClCompile Include="src\c\createMlists.c" />
+    <ClCompile Include="src\c\DllmainXml.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/scilab/modules/xml/xml.vcxproj.filters b/scilab/modules/xml/xml.vcxproj.filters
new file mode 100644 (file)
index 0000000..4790be1
--- /dev/null
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+    <Filter Include="localization">
+      <UniqueIdentifier>{60ed7a50-028b-4c50-b452-1f55bbd73b30}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Libraries Dependencies">
+      <UniqueIdentifier>{f63b9538-b5e7-47bc-b711-1bf065ee6623}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Libraries Dependencies\Imports">
+      <UniqueIdentifier>{a18067d4-a625-4998-a983-82dadeac2186}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="src\c\xml.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="LibScilab_Import.def">
+      <Filter>Libraries Dependencies\Imports</Filter>
+    </None>
+    <None Include="Makefile.am" />
+    <None Include="xml.iss" />
+    <None Include="sci_gateway\xml_gateway.xml" />
+    <None Include="locales\en_US\xml.pot">
+      <Filter>localization</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\cpp\extraction.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\VariableScope.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\XMLAttr.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\XMLDocument.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\XMLElement.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\XMLList.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\XMLNodeList.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\XMLNodeSet.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\XMLNotHandledElement.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\XMLNs.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\XMLObject.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\XMLXPath.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\cpp\VariableScope.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\XMLAttr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\XMLDocument.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\XMLElement.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\XMLList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\XMLNodeList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\XMLNodeSet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\XMLNotHandledElement.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\XMLNs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\XMLObject.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cpp\XMLXPath.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\c\createMlists.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\c\DllmainXml.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\c\gw_xml.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_extraction.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_percent_XMLAttr_e.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_percent_XMLList_e.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_percent_XMLList_size.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_print.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_xmlClose.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_xmlDump.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_xmlGetOpenStreams.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_xmlRead.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_xmlXPath.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
index 2349594..b04c1c1 100644 (file)
@@ -93,5 +93,6 @@
 #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"
 ;-------------------------------------------------------------------------------
 ;