modules using java in nwni mode fixed. 25/18725/6
Cedric Delamarre [Tue, 29 Nov 2016 15:27:23 +0000 (16:27 +0100)]
  * return an error when a function java needs is called with NWNI mode
  * move all static modules wich use java as dynamic
  * history_browser module plugged

Change-Id: Ia2b2e01466d9864f768e666a6e366494196fecf2

89 files changed:
scilab/Scilab.sln
scilab/modules/ast/ast.vcxproj
scilab/modules/ast/ast.vcxproj.filters
scilab/modules/ast/src/cpp/types/function.cpp
scilab/modules/core/tests/nonreg_tests/bug_10428.dia.ref
scilab/modules/core/tests/nonreg_tests/bug_10428.tst
scilab/modules/functions/xml/gateway.dtd
scilab/modules/functions_manager/functions_manager.vcxproj
scilab/modules/functions_manager/includes/dynamic_modules.hxx
scilab/modules/functions_manager/includes/funcmanager.hxx
scilab/modules/functions_manager/includes/functions_manager.h
scilab/modules/functions_manager/includes/module_declaration.hxx
scilab/modules/functions_manager/src/cpp/dynamic_modules.cpp
scilab/modules/functions_manager/src/cpp/funcmanager.cpp
scilab/modules/functions_manager/src/cpp/functions_manager.cpp
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/includes/dynlib_graphics_gw.h [deleted file]
scilab/modules/graphics/includes/graphics_gw.hxx
scilab/modules/graphics/sci_gateway/cpp/graphics_gw.cpp [deleted file]
scilab/modules/graphics/sci_gateway/cpp/graphics_gw.vcxproj [deleted file]
scilab/modules/graphics/sci_gateway/cpp/graphics_gw.vcxproj.filters [deleted file]
scilab/modules/graphics/sci_gateway/cpp/sci_matplot1.cpp
scilab/modules/graphics/sci_gateway/cpp/sci_xset.cpp
scilab/modules/graphics/sci_gateway/graphics_gateway.xml
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
scilab/modules/graphics/src/nographics/nographics.vcxproj
scilab/modules/graphics/src/nographics/nographics.vcxproj.filters
scilab/modules/graphics/src/nographics/nographics_gw.cpp [deleted file]
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/includes/dynlib_gui_gw.h [deleted file]
scilab/modules/gui/includes/gui_gw.hxx
scilab/modules/gui/sci_gateway/cpp/gui_gw.cpp [deleted file]
scilab/modules/gui/sci_gateway/cpp/gui_gw.vcxproj [deleted file]
scilab/modules/gui/sci_gateway/cpp/gui_gw.vcxproj.filters [deleted file]
scilab/modules/gui/sci_gateway/cpp/sci_displaytree.cpp
scilab/modules/gui/sci_gateway/gui_gateway.xml
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/gui/src/nogui/nogui.vcxproj
scilab/modules/gui/src/nogui/nogui.vcxproj.filters
scilab/modules/gui/src/nogui/nogui_gw.cpp [deleted file]
scilab/modules/history_browser/Makefile.am [changed mode: 0755->0644]
scilab/modules/history_browser/Makefile.in
scilab/modules/history_browser/includes/gw_history_browser.h
scilab/modules/history_browser/sci_gateway/c/sci_browsehistory.c
scilab/modules/history_browser/sci_gateway/history_browser_gateway.xml
scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.c [deleted file]
scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.h [deleted file]
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/core_Import.def
scilab/modules/jvm/includes/dynlib_jvm_gw.h [deleted file]
scilab/modules/jvm/includes/gw_jvm.h
scilab/modules/jvm/includes/jvm_gw.hxx
scilab/modules/jvm/libjvm.vcxproj
scilab/modules/jvm/libjvm.vcxproj.filters
scilab/modules/jvm/sci_gateway/cpp/jvm_gw.cpp [deleted file]
scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcxproj [deleted file]
scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcxproj.filters [deleted file]
scilab/modules/jvm/sci_gateway/cpp/sci_system_getproperty.cpp
scilab/modules/jvm/sci_gateway/cpp/sci_system_setproperty.cpp
scilab/modules/jvm/sci_gateway/jvm_gateway.xml
scilab/modules/jvm/src/nojvm/nojvm.vcxproj
scilab/modules/jvm/src/nojvm/nojvm.vcxproj.filters
scilab/modules/jvm/src/nojvm/nojvm_gw.cpp [deleted file]
scilab/modules/renderer/renderer.vcxproj
scilab/modules/renderer/renderer.vcxproj.filters
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/Makefile.in
scilab/modules/tclsci/includes/tclsci_gw.hxx [deleted file]
scilab/modules/tclsci/sci_gateway/cpp/tclsci_gw.cpp [deleted file]
scilab/modules/tclsci/src/notclsci/notclsci.cpp
scilab/modules/tclsci/tclsci.vcxproj
scilab/modules/tclsci/tclsci.vcxproj.filters
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/includes/ui_data_gw.hxx
scilab/modules/ui_data/sci_gateway/cpp/sci_editvar.cpp
scilab/modules/ui_data/sci_gateway/cpp/ui_data_gw.cpp [deleted file]
scilab/modules/ui_data/sci_gateway/ui_data_gateway.xml [new file with mode: 0644]
scilab/modules/ui_data/src/c/ui_data.vcxproj
scilab/modules/ui_data/src/c/ui_data.vcxproj.filters
scilab/modules/ui_data/src/noui_data/noui_data.vcxproj
scilab/modules/ui_data/src/noui_data/noui_data.vcxproj.filters
scilab/modules/ui_data/src/noui_data/noui_data_gw.cpp [deleted file]

index 118b779..d9f6d2f 100644 (file)
@@ -430,8 +430,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "javasci-JAVA-tests", "modul
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "localization_gw", "modules\localization\sci_gateway\cpp\localization_gw.vcxproj", "{7A68EDC6-F0AF-47D1-BB16-B8A9DCD9202D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjvm_gw", "modules\jvm\sci_gateway\cpp\libjvm_gw.vcxproj", "{2D02DD0E-CBF5-493E-AA06-1E289ED24666}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ast", "modules\ast\ast.vcxproj", "{0D3FA25B-8116-44EC-A45E-260789DAA3D9}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_link_gw", "modules\dynamic_link\sci_gateway\cpp\dynamic_link_gw.vcxproj", "{F93FF3EE-217A-4554-AB17-2F8D56B4BF4B}"
@@ -484,10 +482,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-level", "Visual-Studio
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nographic_objects", "modules\graphic_objects\src\nographic_objects\nographic_objects.vcxproj", "{A910BD0C-8FAF-4382-B06A-F767E4752733}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gui_gw", "modules\gui\sci_gateway\cpp\gui_gw.vcxproj", "{83C04253-B152-4EF6-BB36-35A7B0FDFB98}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics_gw", "modules\graphics\sci_gateway\cpp\graphics_gw.vcxproj", "{61B23D9B-3F73-4204-98F7-6F41218F4564}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external_objects", "modules\external_objects\external_objects.vcxproj", "{3142E52C-309A-41D9-BD12-7B7E9E3BDD44}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nogui", "modules\gui\src\nogui\nogui.vcxproj", "{58A50B97-FA8D-4700-9E4A-C4993638EB7A}"
@@ -1440,14 +1434,6 @@ Global
                {7A68EDC6-F0AF-47D1-BB16-B8A9DCD9202D}.Release|Win32.Build.0 = Release|Win32
                {7A68EDC6-F0AF-47D1-BB16-B8A9DCD9202D}.Release|x64.ActiveCfg = Release|x64
                {7A68EDC6-F0AF-47D1-BB16-B8A9DCD9202D}.Release|x64.Build.0 = Release|x64
-               {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Debug|Win32.ActiveCfg = Debug|Win32
-               {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Debug|Win32.Build.0 = Debug|Win32
-               {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Debug|x64.ActiveCfg = Debug|x64
-               {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Debug|x64.Build.0 = Debug|x64
-               {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Release|Win32.ActiveCfg = Release|Win32
-               {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Release|Win32.Build.0 = Release|Win32
-               {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Release|x64.ActiveCfg = Release|x64
-               {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Release|x64.Build.0 = Release|x64
                {0D3FA25B-8116-44EC-A45E-260789DAA3D9}.Debug|Win32.ActiveCfg = Debug|Win32
                {0D3FA25B-8116-44EC-A45E-260789DAA3D9}.Debug|Win32.Build.0 = Debug|Win32
                {0D3FA25B-8116-44EC-A45E-260789DAA3D9}.Debug|x64.ActiveCfg = Debug|x64
@@ -1592,22 +1578,6 @@ Global
                {A910BD0C-8FAF-4382-B06A-F767E4752733}.Release|Win32.Build.0 = Release|Win32
                {A910BD0C-8FAF-4382-B06A-F767E4752733}.Release|x64.ActiveCfg = Release|x64
                {A910BD0C-8FAF-4382-B06A-F767E4752733}.Release|x64.Build.0 = Release|x64
-               {83C04253-B152-4EF6-BB36-35A7B0FDFB98}.Debug|Win32.ActiveCfg = Debug|Win32
-               {83C04253-B152-4EF6-BB36-35A7B0FDFB98}.Debug|Win32.Build.0 = Debug|Win32
-               {83C04253-B152-4EF6-BB36-35A7B0FDFB98}.Debug|x64.ActiveCfg = Debug|x64
-               {83C04253-B152-4EF6-BB36-35A7B0FDFB98}.Debug|x64.Build.0 = Debug|x64
-               {83C04253-B152-4EF6-BB36-35A7B0FDFB98}.Release|Win32.ActiveCfg = Release|Win32
-               {83C04253-B152-4EF6-BB36-35A7B0FDFB98}.Release|Win32.Build.0 = Release|Win32
-               {83C04253-B152-4EF6-BB36-35A7B0FDFB98}.Release|x64.ActiveCfg = Release|x64
-               {83C04253-B152-4EF6-BB36-35A7B0FDFB98}.Release|x64.Build.0 = Release|x64
-               {61B23D9B-3F73-4204-98F7-6F41218F4564}.Debug|Win32.ActiveCfg = Debug|Win32
-               {61B23D9B-3F73-4204-98F7-6F41218F4564}.Debug|Win32.Build.0 = Debug|Win32
-               {61B23D9B-3F73-4204-98F7-6F41218F4564}.Debug|x64.ActiveCfg = Debug|x64
-               {61B23D9B-3F73-4204-98F7-6F41218F4564}.Debug|x64.Build.0 = Debug|x64
-               {61B23D9B-3F73-4204-98F7-6F41218F4564}.Release|Win32.ActiveCfg = Release|Win32
-               {61B23D9B-3F73-4204-98F7-6F41218F4564}.Release|Win32.Build.0 = Release|Win32
-               {61B23D9B-3F73-4204-98F7-6F41218F4564}.Release|x64.ActiveCfg = Release|x64
-               {61B23D9B-3F73-4204-98F7-6F41218F4564}.Release|x64.Build.0 = Release|x64
                {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Debug|Win32.ActiveCfg = Debug|Win32
                {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Debug|Win32.Build.0 = Debug|Win32
                {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Debug|x64.ActiveCfg = Debug|x64
index 9f93a38..b97fa3d 100644 (file)
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ImportLibrary>../../bin/$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>string.lib;fileio.lib;dynamic_link.lib;sciconsole.lib;output_stream.lib;core.lib;io.lib;elementary_functions_f.lib;elementary_functions.lib;polynomials_f.lib;linear_algebra_f.lib;coverage.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>functions_manager.lib;string.lib;fileio.lib;dynamic_link.lib;sciconsole.lib;output_stream.lib;core.lib;io.lib;elementary_functions_f.lib;elementary_functions.lib;polynomials_f.lib;linear_algebra_f.lib;coverage.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
     </Link>
     <PreLinkEvent>
@@ -126,6 +126,7 @@ lib /DEF:"$(ProjectDir)dynamic_link_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pl
 lib /DEF:"$(ProjectDir)fileio_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)fileio.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)string_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)string.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)coverage_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)coverage.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)functions_manager_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)functions_manager.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
   </ItemDefinitionGroup>
@@ -149,7 +150,7 @@ lib /DEF:"$(ProjectDir)coverage_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ImportLibrary>../../bin/$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>string.lib;fileio.lib;dynamic_link.lib;sciconsole.lib;output_stream.lib;core.lib;io.lib;elementary_functions_f.lib;elementary_functions.lib;polynomials_f.lib;linear_algebra_f.lib;coverage.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>functions_manager.lib;string.lib;fileio.lib;dynamic_link.lib;sciconsole.lib;output_stream.lib;core.lib;io.lib;elementary_functions_f.lib;elementary_functions.lib;polynomials_f.lib;linear_algebra_f.lib;coverage.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
     </Link>
     <PreLinkEvent>
@@ -165,6 +166,7 @@ lib /DEF:"$(ProjectDir)dynamic_link_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pl
 lib /DEF:"$(ProjectDir)fileio_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)fileio.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)string_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)string.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)coverage_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)coverage.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)functions_manager_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)functions_manager.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
   </ItemDefinitionGroup>
@@ -185,7 +187,7 @@ lib /DEF:"$(ProjectDir)coverage_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <Link>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <ImportLibrary>../../bin/$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>string.lib;fileio.lib;dynamic_link.lib;sciconsole.lib;output_stream.lib;core.lib;io.lib;elementary_functions_f.lib;elementary_functions.lib;polynomials_f.lib;linear_algebra_f.lib;coverage.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>functions_manager.lib;string.lib;fileio.lib;dynamic_link.lib;sciconsole.lib;output_stream.lib;core.lib;io.lib;elementary_functions_f.lib;elementary_functions.lib;polynomials_f.lib;linear_algebra_f.lib;coverage.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
     </Link>
     <PreLinkEvent>
@@ -201,6 +203,7 @@ lib /DEF:"$(ProjectDir)dynamic_link_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pl
 lib /DEF:"$(ProjectDir)fileio_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)fileio.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)string_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)string.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)coverage_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)coverage.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)functions_manager_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)functions_manager.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
   </ItemDefinitionGroup>
@@ -224,7 +227,7 @@ lib /DEF:"$(ProjectDir)coverage_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <Link>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <ImportLibrary>../../bin/$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>string.lib;fileio.lib;dynamic_link.lib;sciconsole.lib;output_stream.lib;core.lib;io.lib;elementary_functions_f.lib;elementary_functions.lib;polynomials_f.lib;linear_algebra_f.lib;coverage.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>functions_manager.lib;string.lib;fileio.lib;dynamic_link.lib;sciconsole.lib;output_stream.lib;core.lib;io.lib;elementary_functions_f.lib;elementary_functions.lib;polynomials_f.lib;linear_algebra_f.lib;coverage.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
     </Link>
     <PreLinkEvent>
@@ -240,6 +243,7 @@ lib /DEF:"$(ProjectDir)dynamic_link_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pl
 lib /DEF:"$(ProjectDir)fileio_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)fileio.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)string_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)string.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)coverage_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)coverage.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)functions_manager_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)functions_manager.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
   </ItemDefinitionGroup>
@@ -256,6 +260,7 @@ lib /DEF:"$(ProjectDir)coverage_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <None Include="elementary_functions_f_Import.def" />
     <None Include="elementary_functions_Import.def" />
     <None Include="fileio_Import.def" />
+    <None Include="functions_manager_import.def" />
     <None Include="io_Import.def" />
     <None Include="linear_algebra_f_Import.def" />
     <None Include="output_stream_Import.def" />
index da50129..3a7d11e 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Library Include="..\..\bin\blasplus.lib" />
     <None Include="coverage_Import.def">
       <Filter>Libraries Dependencies</Filter>
     </None>
+    <None Include="functions_manager_import.def">
+      <Filter>Libraries Dependencies</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="includes\exps\all.hxx">
       <Filter>Source Files\analysis</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
index 024e847..4f33913 100644 (file)
@@ -35,8 +35,43 @@ extern "C"
 #include "os_string.h"
 #include "lasterror.h"
 #include "dynamic_module.h"
+#include "functions_manager.h"
 }
 
+// dummy function definition for non nwni compatible modules
+static void dummy()
+{
+    char* fname = wide_string_to_UTF8(ConfigVariable::getWhere().back().m_name.c_str());
+    Scierror(999, _("Scilab '%s' function disabled in -nogui or -nwni mode.\n"), fname);
+    FREE(fname);
+}
+static types::Function::ReturnValue sci_dummy_in_NWNI(types::typed_list &/*in*/, int /*_iRetCount*/, types::typed_list &/*out*/)
+{
+    dummy();
+    return types::Function::Error;
+}
+static types::Function::ReturnValue sci_dummy_in_NWNI_OPT(types::typed_list &/*in*/, types::optional_list &/*opt*/, int /*_iRetCount*/, types::typed_list &/*out*/)
+{
+    dummy();
+    return types::Function::Error;
+}
+static int sci_dummy_in_NWNI_OLDC(char * /*fname*/, void* /*pvApiCtx*/)
+{
+    dummy();
+    return 1;
+}
+static int sci_dummy_in_NWNI_MEX(int /*nlhs*/, int** /*plhs*/, int /*nrhs*/, int** /*prhs*/)
+{
+    dummy();
+    return 1;
+}
+static int sci_dummy_in_NWNI_C(scilabEnv /*env*/, int /*nin*/, scilabVar* /*in*/, int /*nopt*/, scilabOpt /*opt*/, int /*nout*/, scilabVar* /*out*/)
+{
+    dummy();
+    return 1;
+}
+
+// Function Class definition
 namespace types
 {
 Function* Function::createFunction(const std::wstring& _wstName, GW_FUNC _pFunc, const std::wstring& _wstModule)
@@ -79,14 +114,58 @@ Function* Function::createFunction(const std::wstring& _wstName, MEXGW_FUNC _pFu
     return new WrapMexFunction(_wstName, _pFunc, _pLoadDeps, _wstModule);
 }
 
-Function* Function::createFunction(const std::wstring& _wstFunctionName, const std::wstring& _wstEntryPointName, const std::wstring& _wstLibName, FunctionType _iType, LOAD_DEPS _pLoadDeps, const std::wstring& _wstModule, bool _bCloseLibAfterCall)
+Function* Function::createFunction(const std::wstring& _wstName, const std::wstring& _wstEntryPointName, const std::wstring& _wstLibName, FunctionType _iType, LOAD_DEPS _pLoadDeps, const std::wstring& _wstModule, bool _bCloseLibAfterCall)
 {
-    return new DynamicFunction(_wstFunctionName, _wstEntryPointName, _wstLibName, _iType, _pLoadDeps, _wstModule, _bCloseLibAfterCall);
+    if (isNonNwniModule(_wstModule.data()))
+    {
+        switch (_iType)
+        {
+            case FunctionType::EntryPointOldC:
+                return new WrapFunction(_wstName, &sci_dummy_in_NWNI_OLDC, NULL, _wstModule);
+            case FunctionType::EntryPointCPP:
+                return new Function(_wstName, &sci_dummy_in_NWNI, NULL, _wstModule);
+            case FunctionType::EntryPointMex:
+                return new WrapMexFunction(_wstName, &sci_dummy_in_NWNI_MEX, NULL, _wstModule);
+            case FunctionType::EntryPointCPPOpt:
+                return new OptFunction(_wstName, &sci_dummy_in_NWNI_OPT, NULL, _wstModule);
+            case FunctionType::EntryPointC:
+                return new WrapCFunction(_wstName, &sci_dummy_in_NWNI_C, NULL, _wstModule);
+        }
+    }
+    else
+    {
+        return new DynamicFunction(_wstName, _wstEntryPointName, _wstLibName, _iType, _pLoadDeps, _wstModule, _bCloseLibAfterCall);
+    }
+    
+    // must never append
+    return NULL;
 }
 
-Function* Function::createFunction(const std::wstring& _wstFunctionName, const std::wstring& _wstEntryPointName, const std::wstring& _wstLibName, FunctionType _iType, const std::wstring& _wstLoadDepsName, const std::wstring& _wstModule, bool _bCloseLibAfterCall)
+Function* Function::createFunction(const std::wstring& _wstName, const std::wstring& _wstEntryPointName, const std::wstring& _wstLibName, FunctionType _iType, const std::wstring& _wstLoadDepsName, const std::wstring& _wstModule, bool _bCloseLibAfterCall)
 {
-    return new DynamicFunction(_wstFunctionName, _wstEntryPointName, _wstLibName, _iType, _wstLoadDepsName, _wstModule, _bCloseLibAfterCall);
+    if (isNonNwniModule(_wstModule.data()))
+    {
+        switch (_iType)
+        {
+            case FunctionType::EntryPointOldC:
+                return new WrapFunction(_wstName, &sci_dummy_in_NWNI_OLDC, NULL, _wstModule);
+            case FunctionType::EntryPointCPP:
+                return new Function(_wstName, &sci_dummy_in_NWNI, NULL, _wstModule);
+            case FunctionType::EntryPointMex:
+                return new WrapMexFunction(_wstName, &sci_dummy_in_NWNI_MEX, NULL, _wstModule);
+            case FunctionType::EntryPointCPPOpt:
+                return new OptFunction(_wstName, &sci_dummy_in_NWNI_OPT, NULL, _wstModule);
+            case FunctionType::EntryPointC:
+                return new WrapCFunction(_wstName, &sci_dummy_in_NWNI_C, NULL, _wstModule);
+        }
+    }
+    else
+    {
+        return new DynamicFunction(_wstName, _wstEntryPointName, _wstLibName, _iType, _wstLoadDepsName, _wstModule, _bCloseLibAfterCall);
+    }
+
+    // must never append
+    return NULL;
 }
 
 Function* Function::createFunction(const std::wstring& _wstName, GW_C_FUNC _pFunc, const std::wstring& _wstModule)
@@ -137,7 +216,7 @@ void Function::whoAmI()
     std::cout << "types::Function";
 }
 
-bool Function::toString(std::wostringstream& ostr)
+bool Function::toString(std::wostringstream& /*ostr*/)
 {
     // display nothing. ie : c = cos
     return true;
@@ -233,7 +312,7 @@ Function::ReturnValue WrapFunction::call(typed_list &in, optional_list &opt, int
     int ret = 1;
     int inSize = (int)in.size();
     int optSize = (int)opt.size();
-    bool isRef = checkReferenceModule(m_wstModule.c_str());
+    int isRef = checkReferenceModule(m_wstModule.c_str());
 
     if (m_pLoadDeps != NULL)
     {
@@ -254,7 +333,7 @@ Function::ReturnValue WrapFunction::call(typed_list &in, optional_list &opt, int
     //copy input parameter to prevent calling gateway modifies input data
     typed_list inCopy;
 
-    if (isRef == false)
+    if (isRef == 0)
     {
         for (int i = 0; i < inSize; i++)
         {
@@ -339,7 +418,7 @@ Function::ReturnValue WrapFunction::call(typed_list &in, optional_list &opt, int
     }
 
     //clean input copy
-    if (isRef == false)
+    if (isRef == 0)
     {
         //protect outputs
         int size = (int)out.size();
index 6c2732e..7ccab81 100644 (file)
 // <-- Short Description -->
 //
 // Java apps shew a library load error in CLI
-assert_checkerror("xcos", msprintf(_("Scilab ''%s'' module disabled in -nogui or -nwni mode.\n"), "xcos"));
-assert_checkerror("scinotes", msprintf(_("Scilab ''%s'' module disabled in -nogui or -nwni mode.\n"), "scinotes"));
-assert_checkerror("browsehistory", msprintf(_("Scilab ''%s'' module disabled in -nogui or -nwni mode.\n"), "history_browser"));
-assert_checkerror("browsevar", msprintf(_("Scilab ''%s'' module disabled in -nogui or -nwni mode.\n"), "ui_data"));
-assert_checkerror("filebrowser", msprintf(_("Scilab ''%s'' module disabled in -nogui or -nwni mode.\n"), "ui_data"));
-assert_checkerror("editvar(''a'')", msprintf(_("Scilab ''%s'' module disabled in -nogui or -nwni mode.\n"), "ui_data"));
-assert_checkerror("driver(''png'')", msprintf(_("Scilab ''%s'' module disabled in -nogui or -nwni mode.\n"), "graphic_export"));
-assert_checkerror("plot2d()", msprintf(_("Scilab ''%s'' module disabled in -nogui or -nwni mode.\n"), "graphics"));
+assert_checkerror("xcos", msprintf(_("Scilab ''%s'' function disabled in -nogui or -nwni mode.\n"), "xcos"));
+assert_checkerror("scinotes", msprintf(_("Scilab ''%s'' function disabled in -nogui or -nwni mode.\n"), "scinotes"));
+assert_checkerror("browsehistory", msprintf(_("Scilab ''%s'' function disabled in -nogui or -nwni mode.\n"), "browsehistory"));
+assert_checkerror("browsevar", msprintf(_("Scilab ''%s'' function disabled in -nogui or -nwni mode.\n"), "browsevar"));
+assert_checkerror("filebrowser", msprintf(_("Scilab ''%s'' function disabled in -nogui or -nwni mode.\n"), "filebrowser"));
+assert_checkerror("editvar(''a'')", msprintf(_("Scilab ''%s'' function disabled in -nogui or -nwni mode.\n"), "editvar"));
+assert_checkerror("driver(''png'')", msprintf(_("Scilab ''%s'' function disabled in -nogui or -nwni mode.\n"), "driver"));
+assert_checkerror("plot2d()", msprintf(_("Scilab ''%s'' function disabled in -nogui or -nwni mode.\n"), "plot2d"));
index 7dc3ed5..4788911 100644 (file)
 //
 // Java apps shew a library load error in CLI
 
-assert_checkerror("xcos", msprintf(_("Scilab ''%s'' module disabled in -nogui or -nwni mode.\n"), "xcos"));
-assert_checkerror("scinotes", msprintf(_("Scilab ''%s'' module disabled in -nogui or -nwni mode.\n"), "scinotes"));
-assert_checkerror("browsehistory", msprintf(_("Scilab ''%s'' module disabled in -nogui or -nwni mode.\n"), "history_browser"));
-assert_checkerror("browsevar", msprintf(_("Scilab ''%s'' module disabled in -nogui or -nwni mode.\n"), "ui_data"));
-assert_checkerror("filebrowser", msprintf(_("Scilab ''%s'' module disabled in -nogui or -nwni mode.\n"), "ui_data"));
-assert_checkerror("editvar(''a'')", msprintf(_("Scilab ''%s'' module disabled in -nogui or -nwni mode.\n"), "ui_data"));
-assert_checkerror("driver(''png'')", msprintf(_("Scilab ''%s'' module disabled in -nogui or -nwni mode.\n"), "graphic_export"));
-assert_checkerror("plot2d()", msprintf(_("Scilab ''%s'' module disabled in -nogui or -nwni mode.\n"), "graphics"));
\ No newline at end of file
+assert_checkerror("xcos", msprintf(_("Scilab ''%s'' function disabled in -nogui or -nwni mode.\n"), "xcos"));
+assert_checkerror("scinotes", msprintf(_("Scilab ''%s'' function disabled in -nogui or -nwni mode.\n"), "scinotes"));
+assert_checkerror("browsehistory", msprintf(_("Scilab ''%s'' function disabled in -nogui or -nwni mode.\n"), "browsehistory"));
+assert_checkerror("browsevar", msprintf(_("Scilab ''%s'' function disabled in -nogui or -nwni mode.\n"), "browsevar"));
+assert_checkerror("filebrowser", msprintf(_("Scilab ''%s'' function disabled in -nogui or -nwni mode.\n"), "filebrowser"));
+assert_checkerror("editvar(''a'')", msprintf(_("Scilab ''%s'' function disabled in -nogui or -nwni mode.\n"), "editvar"));
+assert_checkerror("driver(''png'')", msprintf(_("Scilab ''%s'' function disabled in -nogui or -nwni mode.\n"), "driver"));
+assert_checkerror("plot2d()", msprintf(_("Scilab ''%s'' function disabled in -nogui or -nwni mode.\n"), "plot2d"));
index b74eda2..a885981 100644 (file)
@@ -11,7 +11,7 @@ AUTHOR        CDATA   "Allan CORNET DIGITEO 2010"
 <!ELEMENT gateway EMPTY >
 <!ATTLIST gateway name NMTOKEN #REQUIRED >
 <!ATTLIST gateway function CDATA #REQUIRED >
-<!ATTLIST gateway type (0|1|2) #REQUIRED >
+<!ATTLIST gateway type (0|1|2|3) #REQUIRED >
 <!--
 name:
     the gateway name
index 767255a..fcf9fca 100644 (file)
       <Project>{67ff36d3-ec5a-4f0d-bf3b-a84a66d77294}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\graphics\sci_gateway\cpp\graphics_gw.vcxproj">
-      <Project>{61b23d9b-3f73-4204-98f7-6f41218f4564}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\gui\sci_gateway\cpp\gui_gw.vcxproj">
-      <Project>{83c04253-b152-4ef6-bb36-35a7b0fdfb98}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\hdf5\src\c\hdf5.vcxproj">
       <Project>{a824ea62-af07-4f43-9036-0e63990556bd}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     <ProjectReference Include="..\jvm\libjvm.vcxproj">
       <Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\jvm\sci_gateway\cpp\libjvm_gw.vcxproj">
-      <Project>{2d02dd0e-cbf5-493e-aa06-1e289ed24666}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\linear_algebra\sci_gateway\cpp\linear_algebra_gw.vcxproj">
       <Project>{ee43be6d-817d-4b09-ac40-7e6ac5bdb80d}</Project>
     </ProjectReference>
index b75c427..698178c 100644 (file)
@@ -209,4 +209,45 @@ public :
     static int Load();
 };
 
+class GraphicsModule : public GenericModule
+{
+    static bool loadedDep;
+    static int LoadDeps(const std::wstring& _functionName);
+public :
+    static int Load();
+};
+
+class GuiModule : public GenericModule
+{
+    static bool loadedDep;
+    static int LoadDeps(const std::wstring& _functionName);
+
+public :
+    static int Load();
+};
+
+class JvmModule : public GenericModule
+{
+public :
+    static int Load();
+};
+
+class UiDataModule : public GenericModule
+{
+public:
+    static int Load();
+};
+
+class TclsciModule : public GenericModule
+{
+public :
+    static int Load();
+};
+
+class HistoryBrowserModule : public GenericModule
+{
+public :
+    static int Load();
+};
+
 #endif /* !__DYNAMIC_MODULES_HXX_ */
index db0861a..7df10bc 100644 (file)
@@ -17,6 +17,7 @@
 #define __FUNCMANAGER_HH__
 
 #include <map>
+#include <set>
 #include <list>
 #include <iostream>
 #include <string>
@@ -53,6 +54,8 @@ private :
     // map <string, FuncInfo*> m_FuncMap;
     typedef std::map<std::wstring, std::pair<GW_MOD, GW_MOD> >  ModuleMap;
     ModuleMap  m_ModuleMap;
+    // set contains all modules non compatible nwni
+    std::set<std::wstring> m_NonNwniCompatible;
     std::map<std::wstring, GW_MOD> m_ActivModuleMap;
     std::list<std::wstring> m_ModuleName;
     std::wstring m_szXmlFile;
@@ -65,6 +68,8 @@ public:
     bool UnloadModules();
     bool EndModules();
 
+    bool isNonNwniModule(const std::wstring& _wstModule);
+
 private :
     FuncManager(void);
     ~FuncManager(void);
@@ -74,6 +79,7 @@ private :
     bool VerifyModule(wchar_t* ModuleName);
 
     bool CreateModuleList(void);
+    void CreateNonNwniModuleList(void);
 
     bool ExecuteStartFile(const std::wstring& _stModule);
     bool ExecuteQuitFile(const std::wstring& _stModule);
index cd089ae..b6b8717 100644 (file)
@@ -23,4 +23,6 @@ FUNCMAN_IMEXP bool LoadModules();
 FUNCMAN_IMEXP void UnloadModules();
 FUNCMAN_IMEXP void EndModules();
 FUNCMAN_IMEXP void destroyfunctionManagerInstance(void);
+FUNCMAN_IMEXP bool isNonNwniModule(const wchar_t*);
+
 #endif /* !__FUNCMANAGER_H__ */
index 8f5b12b..9a1bf65 100644 (file)
 #include "../../output_stream/includes/output_stream_gw.hxx"
 //#include "../../matio/includes/matio_gw.hxx"
 #include "../../fileio/includes/fileio_gw.hxx"
-#include "../../gui/includes/gui_gw.hxx"
+//#include "../../gui/includes/gui_gw.hxx"
 #include "../../time/includes/time_gw.hxx"
 #include "../../string/includes/string_gw.hxx"
 //#include "../../scinotes/includes/scinotes_gw.hxx"
 #include "../../localization/includes/localization_gw.hxx"
 #include "../../windows_tools/includes/windows_tools_gw.hxx"
-#include "../../jvm/includes/jvm_gw.hxx"
+//#include "../../jvm/includes/jvm_gw.hxx"
 //#include "../../helptools/includes/helptools_gw.hxx"
 //#include "../../hdf5/includes/hdf5_gw.hxx"
 #include "../../dynamic_link/includes/dynamic_link_gw.hxx"
 #include "../../cacsd/includes/cacsd_gw.hxx"
 #include "../../spreadsheet/includes/spreadsheet_gw.hxx"
 #include "../../randlib/includes/randlib_gw.hxx"
-#include "../../graphics/includes/graphics_gw.hxx"
+//#include "../../graphics/includes/graphics_gw.hxx"
 #include "../../interpolation/includes/interpolation_gw.hxx"
 #include "../../polynomials/includes/polynomials_gw.hxx"
 #include "../../data_structures/includes/data_structures_gw.hxx"
 #include "../../completion/includes/completion_gw.hxx"
 #include "../../special_functions/includes/special_functions_gw.hxx"
 #include "../../fftw/includes/fftw_gw.hxx"
-#include "../../ui_data/includes/ui_data_gw.hxx"
+//#include "../../ui_data/includes/ui_data_gw.hxx"
 #include "../../preferences/includes/preferences_gw.hxx"
-#include "../../tclsci/includes/tclsci_gw.hxx"
+//#include "../../tclsci/includes/tclsci_gw.hxx"
 #include "../../slint/includes/slint_gw.hxx"
 #include "../../coverage/includes/coverage_gw.hxx"
 #endif /* !__MODULE_DECLARATION_HXX__ */
index 6a48d43..994d460 100644 (file)
@@ -106,9 +106,8 @@ vectGateway loadGatewaysName(const std::wstring& _wstModuleName)
 }
 
 //Scinotes module
-
 bool ScinotesModule::loadedDep = false;
-int ScinotesModule::LoadDeps(const std::wstring& _functionName)
+int ScinotesModule::LoadDeps(const std::wstring& /*_functionName*/)
 {
     if (loadedDep == false)
     {
@@ -202,7 +201,7 @@ int SignalProcessingModule::Load()
     return 1;
 }
 
-int HelptoolsModule::LoadDeps(const std::wstring& _functionName)
+int HelptoolsModule::LoadDeps(const std::wstring& /*_functionName*/)
 {
     if (loadedDep == false)
     {
@@ -551,12 +550,6 @@ int ScicosModule::Load()
     return 1;
 }
 
-static types::Function::ReturnValue sci_dummy_xcos_in_NWNI(types::typed_list &/*in*/, int /*_iRetCount*/, types::typed_list &/*out*/)
-{
-    Scierror(999, _("Scilab '%s' module disabled in -nogui or -nwni mode.\n"), "xcos");
-    return types::Function::Error;
-};
-
 bool XcosModule::loadedDep = false;
 int XcosModule::LoadDeps(const std::wstring& _functionName)
 {
@@ -581,20 +574,9 @@ int XcosModule::Load()
     vectGateway vect = loadGatewaysName(wstModuleName);
 
 
-    if (getScilabMode() != SCILAB_NWNI)
+    for (int i = 0 ; i < (int)vect.size() ; i++)
     {
-        for (int i = 0 ; i < (int)vect.size() ; i++)
-        {
-            symbol::Context::getInstance()->addFunction(types::Function::createFunction(vect[i].wstFunction, vect[i].wstName, pwstLibName, vect[i].iType, &XcosModule::LoadDeps, wstModuleName));
-        }
-    }
-    else
-    {
-        for (int i = 0 ; i < (int)vect.size() ; i++)
-        {
-            symbol::Context::getInstance()->addFunction(types::Function::createFunction(vect[i].wstFunction, &sci_dummy_xcos_in_NWNI, wstModuleName));
-        }
-
+        symbol::Context::getInstance()->addFunction(types::Function::createFunction(vect[i].wstFunction, vect[i].wstName, pwstLibName, vect[i].iType, &XcosModule::LoadDeps, wstModuleName));
     }
 
     FREE(pwstLibName);
@@ -676,3 +658,153 @@ int SlintModule::Load()
     FREE(pwstLibName);
     return 1;
 }
+
+bool GraphicsModule::loadedDep = false;
+int GraphicsModule::LoadDeps(const std::wstring& /*_functionName*/)
+{
+    if (loadedDep == false)
+    {
+        loadOnUseClassPath("graphics");
+        loadedDep = true;
+    }
+
+    return 1;
+}
+
+int GraphicsModule::Load()
+{
+    std::wstring wstModuleName = L"graphics";
+#ifdef _MSC_VER
+    wchar_t* pwstLibName = buildModuleDynLibraryNameW(wstModuleName.c_str(), DYNLIB_NAME_FORMAT_1);
+#else
+    wchar_t* pwstLibName = buildModuleDynLibraryNameW(wstModuleName.c_str(), DYNLIB_NAME_FORMAT_3);
+#endif
+
+    vectGateway vect = loadGatewaysName(wstModuleName);
+
+    for (int i = 0 ; i < (int)vect.size() ; i++)
+    {
+        symbol::Context::getInstance()->addFunction(types::Function::createFunction(vect[i].wstFunction, vect[i].wstName, pwstLibName, vect[i].iType, &GraphicsModule::LoadDeps, wstModuleName));
+    }
+
+    FREE(pwstLibName);
+    return 1;
+}
+
+
+bool GuiModule::loadedDep = false;
+int GuiModule::LoadDeps(const std::wstring& _functionName)
+{
+    if (loadedDep == false &&
+            (_functionName == L"uicontrol" ||
+             _functionName == L"uimenu" ||
+             _functionName == L"usecanvas" ||
+             _functionName == L"loadGui" ||
+             _functionName == L"figure"))
+    {
+        loadOnUseClassPath("graphics");
+        loadedDep = true;
+    }
+
+    return 1;
+}
+int GuiModule::Load()
+{
+    std::wstring wstModuleName = L"gui";
+#ifdef _MSC_VER
+    wchar_t* pwstLibName = buildModuleDynLibraryNameW(wstModuleName.c_str(), DYNLIB_NAME_FORMAT_2);
+#else
+    wchar_t* pwstLibName = buildModuleDynLibraryNameW(wstModuleName.c_str(), DYNLIB_NAME_FORMAT_3);
+#endif
+
+    vectGateway vect = loadGatewaysName(wstModuleName);
+
+    for (int i = 0 ; i < (int)vect.size() ; i++)
+    {
+        symbol::Context::getInstance()->addFunction(types::Function::createFunction(vect[i].wstFunction, vect[i].wstName, pwstLibName, vect[i].iType, &GuiModule::LoadDeps, wstModuleName));
+    }
+
+    FREE(pwstLibName);
+    return 1;
+}
+
+int JvmModule::Load()
+{
+    std::wstring wstModuleName = L"jvm";
+#ifdef _MSC_VER
+    wchar_t* pwstLibName = buildModuleDynLibraryNameW(L"libjvm", DYNLIB_NAME_FORMAT_1);
+#else
+    wchar_t* pwstLibName = buildModuleDynLibraryNameW(wstModuleName.c_str(), DYNLIB_NAME_FORMAT_3);
+#endif
+
+    vectGateway vect = loadGatewaysName(wstModuleName);
+
+    for (int i = 0 ; i < (int)vect.size() ; i++)
+    {
+        symbol::Context::getInstance()->addFunction(types::Function::createFunction(vect[i].wstFunction, vect[i].wstName, pwstLibName, vect[i].iType, NULL, wstModuleName));
+    }
+
+    FREE(pwstLibName);
+    return 1;
+}
+
+int UiDataModule::Load()
+{
+    std::wstring wstModuleName = L"ui_data";
+#ifdef _MSC_VER
+    wchar_t* pwstLibName = buildModuleDynLibraryNameW(wstModuleName.c_str(), DYNLIB_NAME_FORMAT_2);
+#else
+    wchar_t* pwstLibName = buildModuleDynLibraryNameW(wstModuleName.c_str(), DYNLIB_NAME_FORMAT_3);
+#endif
+
+    vectGateway vect = loadGatewaysName(wstModuleName);
+
+    for (int i = 0 ; i < (int)vect.size() ; i++)
+    {
+        symbol::Context::getInstance()->addFunction(types::Function::createFunction(vect[i].wstFunction, vect[i].wstName, pwstLibName, vect[i].iType, NULL, wstModuleName));
+    }
+
+    FREE(pwstLibName);
+    return 1;
+}
+
+int TclsciModule::Load()
+{
+    std::wstring wstModuleName = L"tclsci";
+#ifdef _MSC_VER
+    wchar_t* pwstLibName = buildModuleDynLibraryNameW(wstModuleName.c_str(), DYNLIB_NAME_FORMAT_1);
+#else
+    wchar_t* pwstLibName = buildModuleDynLibraryNameW(wstModuleName.c_str(), DYNLIB_NAME_FORMAT_3);
+#endif
+
+    vectGateway vect = loadGatewaysName(wstModuleName);
+
+    for (int i = 0 ; i < (int)vect.size() ; i++)
+    {
+        symbol::Context::getInstance()->addFunction(types::Function::createFunction(vect[i].wstFunction, vect[i].wstName, pwstLibName, vect[i].iType, NULL, wstModuleName));
+    }
+
+    FREE(pwstLibName);
+    return 1;
+}
+
+int HistoryBrowserModule ::Load()
+{
+    std::wstring wstModuleName = L"history_browser";
+#ifdef _MSC_VER
+    wchar_t* pwstLibName = buildModuleDynLibraryNameW(wstModuleName.c_str(), DYNLIB_NAME_FORMAT_1);
+#else
+    wchar_t* pwstLibName = buildModuleDynLibraryNameW(wstModuleName.c_str(), DYNLIB_NAME_FORMAT_3);
+#endif
+
+    vectGateway vect = loadGatewaysName(wstModuleName);
+
+    for (int i = 0 ; i < (int)vect.size() ; i++)
+    {
+        symbol::Context::getInstance()->addFunction(types::Function::createFunction(vect[i].wstFunction, vect[i].wstName, pwstLibName, vect[i].iType, NULL, wstModuleName));
+    }
+
+    FREE(pwstLibName);
+    return 1;
+}
+
index 3d53013..cb9959f 100644 (file)
@@ -54,6 +54,11 @@ FuncManager* FuncManager::getInstance()
     {
         me = new FuncManager();
         me->CreateModuleList();
+        if (ConfigVariable::getScilabMode() == SCILAB_NWNI)
+        {
+            me->CreateNonNwniModuleList();
+        }
+
         /*get module activation list from xml file*/
         if (me->GetModules() == true)
         {
@@ -296,6 +301,30 @@ char *GetXmlFileEncoding(const std::string& _filename)
     return encoding;
 }
 
+void FuncManager::CreateNonNwniModuleList(void)
+{
+    m_NonNwniCompatible.insert(L"xcos");
+    m_NonNwniCompatible.insert(L"scinotes");
+    m_NonNwniCompatible.insert(L"graphics");
+    m_NonNwniCompatible.insert(L"graphic_export");
+    m_NonNwniCompatible.insert(L"external_objects_java");
+    m_NonNwniCompatible.insert(L"gui");
+    m_NonNwniCompatible.insert(L"jvm");
+    m_NonNwniCompatible.insert(L"ui_data");
+    m_NonNwniCompatible.insert(L"tclsci");
+    m_NonNwniCompatible.insert(L"history_browser");
+}
+
+bool FuncManager::isNonNwniModule(const std::wstring& _wstModule)
+{
+    if (m_NonNwniCompatible.empty() == false)
+    {
+        return m_NonNwniCompatible.find(_wstModule) != m_NonNwniCompatible.end();
+    }
+
+    return false;
+}
+
 bool FuncManager::CreateModuleList(void)
 {
     m_ModuleMap[L"elementary_functions"] = std::pair<GW_MOD, GW_MOD>(&ElemFuncModule::Load, &ElemFuncModule::Unload);
@@ -318,6 +347,7 @@ bool FuncManager::CreateModuleList(void)
     m_ModuleMap[L"dynamic_link"] = std::pair<GW_MOD, GW_MOD>(&DynamicLinkModule::Load, &DynamicLinkModule::Unload);
     m_ModuleMap[L"action_binding"] = std::pair<GW_MOD, GW_MOD>(&ActionBindingModule::Load, &ActionBindingModule::Unload);
     m_ModuleMap[L"history_manager"] = std::pair<GW_MOD, GW_MOD>(&HistoryManagerModule::Load, &HistoryManagerModule::Unload);
+    m_ModuleMap[L"history_browser"] = std::pair<GW_MOD, GW_MOD>(&HistoryBrowserModule::Load, &HistoryBrowserModule::Unload);
     m_ModuleMap[L"console"] = std::pair<GW_MOD, GW_MOD>(&ConsoleModule::Load, &ConsoleModule::Unload);
     m_ModuleMap[L"signal_processing"] = std::pair<GW_MOD, GW_MOD>(&SignalProcessingModule::Load, &SignalProcessingModule::Unload);
     m_ModuleMap[L"linear_algebra"] = std::pair<GW_MOD, GW_MOD>(&LinearAlgebraModule::Load, &LinearAlgebraModule::Unload);
@@ -348,13 +378,10 @@ bool FuncManager::CreateModuleList(void)
     m_ModuleMap[L"preferences"] = std::pair<GW_MOD, GW_MOD>(&PreferencesModule::Load, &PreferencesModule::Unload);
     m_ModuleMap[L"slint"] = std::pair<GW_MOD, GW_MOD>(&SlintModule::Load, &SlintModule::Unload);
     m_ModuleMap[L"coverage"] = std::pair<GW_MOD, GW_MOD>(&CoverageModule::Load, &SlintModule::Unload);
+    m_ModuleMap[L"tclsci"] = std::pair<GW_MOD, GW_MOD>(&TclsciModule::Load, &TclsciModule::Unload);
+    m_ModuleMap[L"jvm"] = std::pair<GW_MOD, GW_MOD>(&JvmModule::Load, &JvmModule::Unload);
+    m_ModuleMap[L"ui_data"] = std::pair<GW_MOD, GW_MOD>(&UiDataModule::Load, &UiDataModule::Unload);
 
-    if (ConfigVariable::getScilabMode() != SCILAB_NWNI)
-    {
-        m_ModuleMap[L"tclsci"] = std::pair<GW_MOD, GW_MOD>(&TclsciModule::Load, &TclsciModule::Unload);
-        m_ModuleMap[L"jvm"] = std::pair<GW_MOD, GW_MOD>(&JvmModule::Load, &JvmModule::Unload);
-        m_ModuleMap[L"ui_data"] = std::pair<GW_MOD, GW_MOD>(&UiDataModule::Load, &UiDataModule::Unload);
-    }
 #ifdef _MSC_VER
     m_ModuleMap[L"windows_tools"] = std::pair<GW_MOD, GW_MOD>(&WindowsToolsModule::Load, &WindowsToolsModule::Unload);
 #endif
index 7da2ea8..35901cb 100644 (file)
@@ -54,3 +54,8 @@ void destroyfunctionManagerInstance(void)
 {
     FuncManager::destroyInstance();
 }
+
+bool isNonNwniModule(const wchar_t* module)
+{
+    return FuncManager::getInstance()->isNonNwniModule(module);
+}
index 04f779e..e498d13 100644 (file)
@@ -468,7 +468,6 @@ GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_addcolor.c
 
 GATEWAY_CXX_SOURCES = \
-    sci_gateway/cpp/graphics_gw.cpp \
     sci_gateway/cpp/sci_get.cpp \
     sci_gateway/cpp/sci_xget.cpp \
     sci_gateway/cpp/sci_xset.cpp \
@@ -565,8 +564,7 @@ tcl/ged/images/segs.gif \
 tcl/ged/images/text.gif
 
 libscigraphics_disable_la_SOURCES = \
-       src/nographics/nographics.c \
-       src/nographics/nographics_gw.cpp
+       src/nographics/nographics.c
 
 libscigraphics_disable_la_CPPFLAGS = \
     -I$(srcdir)/includes/ \
index 83f5dad..e1e40a6 100644 (file)
@@ -572,8 +572,7 @@ am__v_lt_1 =
 @GUI_TRUE@am_libscigraphics_algo_la_rpath =
 libscigraphics_disable_la_LIBADD =
 am_libscigraphics_disable_la_OBJECTS =  \
-       src/nographics/libscigraphics_disable_la-nographics.lo \
-       src/nographics/libscigraphics_disable_la-nographics_gw.lo
+       src/nographics/libscigraphics_disable_la-nographics.lo
 libscigraphics_disable_la_OBJECTS =  \
        $(am_libscigraphics_disable_la_OBJECTS)
 libscigraphics_la_DEPENDENCIES = libscigraphics-algo.la
@@ -633,8 +632,7 @@ am__objects_3 = sci_gateway/c/libscigraphics_la-sci_swap_handles.lo \
        sci_gateway/c/libscigraphics_la-sci_color.lo \
        sci_gateway/c/libscigraphics_la-sci_name2rgb.lo \
        sci_gateway/c/libscigraphics_la-sci_addcolor.lo
-am__objects_4 = sci_gateway/cpp/libscigraphics_la-graphics_gw.lo \
-       sci_gateway/cpp/libscigraphics_la-sci_get.lo \
+am__objects_4 = sci_gateway/cpp/libscigraphics_la-sci_get.lo \
        sci_gateway/cpp/libscigraphics_la-sci_xget.lo \
        sci_gateway/cpp/libscigraphics_la-sci_xset.lo \
        sci_gateway/cpp/libscigraphics_la-sci_matplot.lo \
@@ -1476,7 +1474,6 @@ GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_addcolor.c
 
 GATEWAY_CXX_SOURCES = \
-    sci_gateway/cpp/graphics_gw.cpp \
     sci_gateway/cpp/sci_get.cpp \
     sci_gateway/cpp/sci_xget.cpp \
     sci_gateway/cpp/sci_xset.cpp \
@@ -1570,8 +1567,7 @@ tcl/ged/images/segs.gif \
 tcl/ged/images/text.gif
 
 libscigraphics_disable_la_SOURCES = \
-       src/nographics/nographics.c \
-       src/nographics/nographics_gw.cpp
+       src/nographics/nographics.c
 
 libscigraphics_disable_la_CPPFLAGS = \
     -I$(srcdir)/includes/ \
@@ -2871,12 +2867,9 @@ src/nographics/$(DEPDIR)/$(am__dirstamp):
 src/nographics/libscigraphics_disable_la-nographics.lo:  \
        src/nographics/$(am__dirstamp) \
        src/nographics/$(DEPDIR)/$(am__dirstamp)
-src/nographics/libscigraphics_disable_la-nographics_gw.lo:  \
-       src/nographics/$(am__dirstamp) \
-       src/nographics/$(DEPDIR)/$(am__dirstamp)
 
 libscigraphics-disable.la: $(libscigraphics_disable_la_OBJECTS) $(libscigraphics_disable_la_DEPENDENCIES) $(EXTRA_libscigraphics_disable_la_DEPENDENCIES) 
-       $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libscigraphics_disable_la_OBJECTS) $(libscigraphics_disable_la_LIBADD) $(LIBS)
+       $(AM_V_CCLD)$(LINK) -rpath $(pkglibdir) $(libscigraphics_disable_la_OBJECTS) $(libscigraphics_disable_la_LIBADD) $(LIBS)
 sci_gateway/c/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/c
        @: > sci_gateway/c/$(am__dirstamp)
@@ -3057,9 +3050,6 @@ sci_gateway/cpp/$(am__dirstamp):
 sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/cpp/$(DEPDIR)
        @: > sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/cpp/libscigraphics_la-graphics_gw.lo:  \
-       sci_gateway/cpp/$(am__dirstamp) \
-       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/libscigraphics_la-sci_get.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
@@ -3159,7 +3149,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_xstringb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_xtitle.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigraphics_la-sci_zoom_rect.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-graphics_gw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_contour2dm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_get.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_matplot.Plo@am__quote@
@@ -3543,7 +3532,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphics_algo_la-configgraphicvariable.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscigraphics_algo_la-set_data_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/nographics/$(DEPDIR)/libscigraphics_disable_la-nographics.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/nographics/$(DEPDIR)/libscigraphics_disable_la-nographics_gw.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -6617,20 +6605,6 @@ src/cpp/libscigraphics_algo_la-ContourOnMesh.lo: src/cpp/ContourOnMesh.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libscigraphics_algo_la-ContourOnMesh.lo `test -f 'src/cpp/ContourOnMesh.cpp' || echo '$(srcdir)/'`src/cpp/ContourOnMesh.cpp
 
-src/nographics/libscigraphics_disable_la-nographics_gw.lo: src/nographics/nographics_gw.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/nographics/libscigraphics_disable_la-nographics_gw.lo -MD -MP -MF src/nographics/$(DEPDIR)/libscigraphics_disable_la-nographics_gw.Tpo -c -o src/nographics/libscigraphics_disable_la-nographics_gw.lo `test -f 'src/nographics/nographics_gw.cpp' || echo '$(srcdir)/'`src/nographics/nographics_gw.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/nographics/$(DEPDIR)/libscigraphics_disable_la-nographics_gw.Tpo src/nographics/$(DEPDIR)/libscigraphics_disable_la-nographics_gw.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/nographics/nographics_gw.cpp' object='src/nographics/libscigraphics_disable_la-nographics_gw.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/nographics/libscigraphics_disable_la-nographics_gw.lo `test -f 'src/nographics/nographics_gw.cpp' || echo '$(srcdir)/'`src/nographics/nographics_gw.cpp
-
-sci_gateway/cpp/libscigraphics_la-graphics_gw.lo: sci_gateway/cpp/graphics_gw.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigraphics_la-graphics_gw.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-graphics_gw.Tpo -c -o sci_gateway/cpp/libscigraphics_la-graphics_gw.lo `test -f 'sci_gateway/cpp/graphics_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/graphics_gw.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-graphics_gw.Tpo sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-graphics_gw.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/graphics_gw.cpp' object='sci_gateway/cpp/libscigraphics_la-graphics_gw.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigraphics_la-graphics_gw.lo `test -f 'sci_gateway/cpp/graphics_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/graphics_gw.cpp
-
 sci_gateway/cpp/libscigraphics_la-sci_get.lo: sci_gateway/cpp/sci_get.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigraphics_la-sci_get.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_get.Tpo -c -o sci_gateway/cpp/libscigraphics_la-sci_get.lo `test -f 'sci_gateway/cpp/sci_get.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_get.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_get.Tpo sci_gateway/cpp/$(DEPDIR)/libscigraphics_la-sci_get.Plo
index a92e9d9..b3c605a 100644 (file)
@@ -238,6 +238,12 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="sci_gateway\cpp\sci_get.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_matplot.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_matplot1.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_winsid.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_xget.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_xset.cpp" />
     <ClCompile Include="src\cpp\configgraphicvariable.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_contour2dm.cpp" />
     <ClCompile Include="sci_gateway\c\sci_addcolor.c" />
index 80a12ea..a802f97 100644 (file)
     <ClCompile Include="src\c\getHandleProperty\set_colors_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_get.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_matplot.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_matplot1.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_winsid.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_xget.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_xset.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="includes\Axes.h">
     <None Include="locales\graphics.pot" />
     <None Include="locales\graphics.pot" />
     <None Include="locales\graphics.pot" />
-    <None Include="locales\graphics.pot" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="graphic.rc">
diff --git a/scilab/modules/graphics/includes/dynlib_graphics_gw.h b/scilab/modules/graphics/includes/dynlib_graphics_gw.h
deleted file mode 100644 (file)
index d8690c8..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) - 2012 - Scilab Enterprises - Antoine ELIAS
-*
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
-*
-*/
-
-/*--------------------------------------------------------------------------*/
-#ifndef __DYNLIB_GRAPHICS_GW_H__
-#define __DYNLIB_GRAPHICS_GW_H__
-
-#ifdef _MSC_VER
-#ifdef GRAPHICS_GW_EXPORTS
-#define GRAPHICS_GW_IMPEXP __declspec(dllexport)
-#else
-#define GRAPHICS_GW_IMPEXP __declspec(dllimport)
-#endif
-#else
-#define GRAPHICS_GW_IMPEXP
-#endif
-
-#endif /* __DYNLIB_GUI_GW_H__ */
-/*--------------------------------------------------------------------------*/
-
index f2df524..42394dc 100644 (file)
 #define __GRAPHICS_GW_HXX__
 
 #include "cpp_gateway_prototype.hxx"
-#include "dynlib_graphics_gw.h"
-
-class GraphicsModule
-{
-private :
-    GraphicsModule() {};
-    ~GraphicsModule() {};
-
-
-public :
-    GRAPHICS_GW_IMPEXP static int LoadDeps(const std::wstring& _functionName);
-    GRAPHICS_GW_IMPEXP static int Load();
-    GRAPHICS_GW_IMPEXP static int Unload()
-    {
-        return 1;
-    }
-
-    static bool loadedDep;
-};
-
-
-CPP_GATEWAY_PROTOTYPE_EXPORT(sci_get, GRAPHICS_GW_IMPEXP);
-CPP_GATEWAY_PROTOTYPE_EXPORT(sci_xget, GRAPHICS_GW_IMPEXP);
-CPP_GATEWAY_PROTOTYPE_EXPORT(sci_xset, GRAPHICS_GW_IMPEXP);
-CPP_GATEWAY_PROTOTYPE_EXPORT(sci_winsid, GRAPHICS_GW_IMPEXP);
-CPP_OPT_GATEWAY_PROTOTYPE_EXPORT(sci_matplot, GRAPHICS_GW_IMPEXP);
-CPP_GATEWAY_PROTOTYPE_EXPORT(sci_matplot1, GRAPHICS_GW_IMPEXP);
+#include "dynlib_graphics.h"
+
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_get, GRAPHICS_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_xget, GRAPHICS_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_xset, GRAPHICS_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_winsid, GRAPHICS_IMPEXP);
+CPP_OPT_GATEWAY_PROTOTYPE_EXPORT(sci_matplot, GRAPHICS_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_matplot1, GRAPHICS_IMPEXP);
 #endif /* !__GUI_GW_HXX__ */
diff --git a/scilab/modules/graphics/sci_gateway/cpp/graphics_gw.cpp b/scilab/modules/graphics/sci_gateway/cpp/graphics_gw.cpp
deleted file mode 100644 (file)
index 7aba891..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2012 - Scilab Enterprises - Antoine ELIAS
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- */
-
-#pragma comment(lib,"../../../../bin/libintl.lib")
-
-#include "graphics_gw.hxx"
-#include "function.hxx"
-#include "context.hxx"
-
-#define MODULE_NAME L"graphics"
-extern "C"
-{
-#include "gw_graphics.h"
-#include "loadOnUseClassPath.h"
-}
-
-bool GraphicsModule::loadedDep = false;
-
-int GraphicsModule::LoadDeps(const std::wstring& _functionName)
-{
-    if (loadedDep == false)
-    {
-        loadOnUseClassPath("graphics");
-        loadedDep = true;
-    }
-
-    return 1;
-}
-
-
-int GraphicsModule::Load()
-{
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"champ", &sci_champ, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"champ1", &sci_champ1, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"fec", &sci_fec, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"geom3d", &sci_geom3d, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"grayplot", &sci_grayplot, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"Matplot", &sci_matplot, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"Matplot1", &sci_matplot1, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"contour2di", &sci_contour2di, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"param3d", &sci_param3d, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"param3d1", &sci_param3d1, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xstringb", &sci_xstringb, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"plot2d", &sci_plot2d, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"plot2d2", &sci_plot2d1_2, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"plot2d3", &sci_plot2d1_3, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"plot2d4", &sci_plot2d1_4, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"plot3d", &sci_plot3d, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"plot3d1", &sci_plot3d, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"winsid", &sci_winsid, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xarc", &sci_xarc, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xarcs", &sci_xarcs, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xarrows", &sci_xarrows, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"drawaxis", &sci_drawaxis, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xchange", &sci_xchange, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xclick", &sci_xclick, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xdel", &sci_xdel, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xfarc", &sci_xarc, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xfarcs", &sci_xfarcs, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xfpoly", &sci_xfpoly, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xfpolys", &sci_xfpolys, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xfrect", &sci_xrect, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xget", &sci_xget, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xgetmouse", &sci_xgetmouse, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xgrid", &sci_xgrid, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xlfont", &sci_xlfont, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xpoly", &sci_xpoly, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xpolys", &sci_xpolys, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xrect", &sci_xrect, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xrects", &sci_xrects, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xsegs", &sci_xsegs, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"show_window", &sci_show_window, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xset", &sci_xset, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xstring", &sci_xstring, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xtitle", &sci_xtitle, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xgraduate", &sci_xgraduate, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xname", &sci_xname, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"zoom_rect", &sci_zoom_rect, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"unzoom", &sci_unzoom, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"stringbox", &sci_stringbox, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"move", &sci_move, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"glue", &sci_glue, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"unglue", &sci_unglue, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"drawnow", &sci_drawnow, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"drawlater", &sci_drawlater, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"copy", &sci_copy, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"delete", &sci_delete, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"get", &sci_get, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"set", &sci_set, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"newaxes", &sci_newaxes, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"swap_handles", &sci_swap_handles, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"rubberbox", &sci_rubberbox, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"rotate_axes", &sci_rotate_axes, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"is_handle_valid", &sci_is_handle_valid, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"captions", &sci_Legend, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"light", &sci_light, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"addcolor", &sci_addcolor, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"name2rgb", &sci_name2rgb, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"color", &sci_color, &GraphicsModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"contour2dm", &sci_contour2dm, &GraphicsModule::LoadDeps, MODULE_NAME));
-    return 1;
-}
diff --git a/scilab/modules/graphics/sci_gateway/cpp/graphics_gw.vcxproj b/scilab/modules/graphics/sci_gateway/cpp/graphics_gw.vcxproj
deleted file mode 100644 (file)
index cfd9ac4..0000000
+++ /dev/null
@@ -1,250 +0,0 @@
-<?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>
-  <ItemGroup>
-    <ClInclude Include="..\..\includes\dynlib_graphics_gw.h" />
-    <ClInclude Include="..\..\includes\graphics_gw.hxx" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="graphics_gw.cpp" />
-    <ClCompile Include="sci_get.cpp" />
-    <ClCompile Include="sci_matplot.cpp" />
-    <ClCompile Include="sci_matplot1.cpp" />
-    <ClCompile Include="sci_winsid.cpp" />
-    <ClCompile Include="sci_xget.cpp" />
-    <ClCompile Include="sci_xset.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Visual-Studio-settings\rename-vc-files\rename-vc-files.vcxproj">
-      <Project>{dd8a0506-8d31-4cf8-856a-c10ece9c13a4}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\api_scilab\api_scilab.vcxproj">
-      <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\ast\ast.vcxproj">
-      <Project>{0d3fa25b-8116-44ec-a45e-260789daa3d9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\console\src\c\console.vcxproj">
-      <Project>{445d3b85-c9b1-498b-9c88-0a3c2390b1cc}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\core\src\c\core.vcxproj">
-      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\graphic_objects\src\c\graphic_objects.vcxproj">
-      <Project>{30f9ee41-587b-4618-8de7-698d3fba4985}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\gui\src\c\gui.vcxproj">
-      <Project>{45ca5b12-7601-4968-ae16-16069fd1a152}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\jvm\libjvm.vcxproj">
-      <Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\localization\src\localization.vcxproj">
-      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj">
-      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\threads\threads.vcxproj">
-      <Project>{50a1ffc8-adc2-4d9e-a2d0-5dcd63188ae9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\graphics.vcxproj">
-      <Project>{8ccdd3c2-b025-4a12-a986-1aa28d7c0c33}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{61B23D9B-3F73-4204-98F7-6F41218F4564}</ProjectGuid>
-    <RootNamespace>graphics_gw</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>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </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'">true</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'">true</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>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/cpp;../../src/c/getHandleProperty;../../../../libs/intl;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../graphic_objects/includes;../../../threads/includes;../../../string/includes;../../../console/includes;../../../dynamic_link/includes;../../../gui/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <PreLinkEvent>
-      <Command>
-      </Command>
-    </PreLinkEvent>
-    <Link>
-      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/cpp;../../src/c/getHandleProperty;../../../../libs/intl;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../graphic_objects/includes;../../../threads/includes;../../../string/includes;../../../console/includes;../../../dynamic_link/includes;../../../gui/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <PreLinkEvent>
-      <Command>
-      </Command>
-    </PreLinkEvent>
-    <Link>
-      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/cpp;../../src/c/getHandleProperty;../../../../libs/intl;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../graphic_objects/includes;../../../threads/includes;../../../string/includes;../../../console/includes;../../../dynamic_link/includes;../../../gui/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <PreLinkEvent>
-      <Command>
-      </Command>
-    </PreLinkEvent>
-    <Link>
-      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/cpp;../../src/c/getHandleProperty;../../../../libs/intl;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../graphic_objects/includes;../../../threads/includes;../../../string/includes;../../../console/includes;../../../dynamic_link/includes;../../../gui/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <PreLinkEvent>
-      <Command>
-      </Command>
-    </PreLinkEvent>
-    <Link>
-      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/scilab/modules/graphics/sci_gateway/cpp/graphics_gw.vcxproj.filters b/scilab/modules/graphics/sci_gateway/cpp/graphics_gw.vcxproj.filters
deleted file mode 100644 (file)
index 4907c56..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header files">
-      <UniqueIdentifier>{a9256e86-ad52-4858-b4ad-7221b370ca0f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Ressource Files">
-      <UniqueIdentifier>{95abb083-46f2-4c46-9b55-b84c5d82ef5e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{7eca79bc-ea66-41df-a03e-00b7397704f3}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\includes\dynlib_graphics_gw.h">
-      <Filter>Header files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\includes\graphics_gw.hxx">
-      <Filter>Header files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="graphics_gw.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_get.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_winsid.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_xset.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_xget.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_matplot.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_matplot1.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
index b13a028..1aee4aa 100644 (file)
@@ -49,9 +49,7 @@ types::Function::ReturnValue sci_matplot1(types::typed_list &in, int _iRetCount,
     int m1 = 0, n1 = 0, m2 = 0, n2 = 0;
     int* piAddr1 = NULL;
     int* piAddr2 = NULL;
-    int type;
     int plottype = -1;
-    int precision;
     int *dims = NULL;
 
     double* l1 = NULL;
index 34af825..f835a6b 100644 (file)
@@ -561,8 +561,8 @@ types::Function::ReturnValue sci_xset(types::typed_list &in, int _iRetCount, typ
             }
 
             int viewport[4] = {0, 0, 0, 0};
-            viewport[0] = in[1]->getAs<types::Double>()->get(0);
-            viewport[1] = in[2]->getAs<types::Double>()->get(0);
+            viewport[0] = (int)in[1]->getAs<types::Double>()->get(0);
+            viewport[1] = (int)in[2]->getAs<types::Double>()->get(0);
 
             getOrCreateDefaultSubwin();
             setGraphicObjectProperty(getCurrentFigure(), __GO_VIEWPORT__, viewport, jni_int_vector, 2);
index e1f9bee..6f08ccb 100644 (file)
@@ -1,93 +1,95 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
-<GATEWAY name="graphics">
-    <!-- =================== -->
-    <!--
+<!DOCTYPE module SYSTEM "../../functions/xml/gateway.dtd">
+<!--
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2011 - DIGITEO - Antoine ELIAS
+ *
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ */
  Scilab
  Interface description. In this file, we define the list of the function which
  will be available into Scilab and the link to the "native" function.
 
- gatewayId is the position in the hashtable 'Interfaces' defined in the
- file SCI/modules/core/src/c/callinterf.h
-
- primitiveId is the position in the hashtable '<module>Table Tab[]' defined
- in the file modules/<module>/sci_gateway/c/gw_<module>.c
-
- primitiveName is the name of the Scilab function
-
- @author Allan CORNET
- @author Sylvestre LEDRU
- @date INRIA 2007
- ===================
  Don't touch if you do not know what you are doing
 -->
-    <!-- =================== -->
-    <PRIMITIVE gatewayId="7" primitiveId="1" primitiveName="champ"/>
-    <PRIMITIVE gatewayId="7" primitiveId="2" primitiveName="champ1"/>
-    <PRIMITIVE gatewayId="7" primitiveId="3" primitiveName="fec"/>
-    <PRIMITIVE gatewayId="7" primitiveId="4" primitiveName="geom3d"/>
-    <PRIMITIVE gatewayId="7" primitiveId="5" primitiveName="grayplot"/>
-    <PRIMITIVE gatewayId="7" primitiveId="6" primitiveName="Matplot"/>
-    <PRIMITIVE gatewayId="7" primitiveId="7" primitiveName="Matplot1"/>
-    <PRIMITIVE gatewayId="7" primitiveId="8" primitiveName="contour2di"/>
-    <PRIMITIVE gatewayId="7" primitiveId="9" primitiveName="param3d"/>
-    <PRIMITIVE gatewayId="7" primitiveId="10" primitiveName="param3d1"/>
-    <PRIMITIVE gatewayId="7" primitiveId="11" primitiveName="xstringb"/>
-    <PRIMITIVE gatewayId="7" primitiveId="12" primitiveName="plot2d"/>
-    <PRIMITIVE gatewayId="7" primitiveId="13" primitiveName="plot2d2"/>
-    <PRIMITIVE gatewayId="7" primitiveId="14" primitiveName="plot2d3"/>
-    <PRIMITIVE gatewayId="7" primitiveId="15" primitiveName="plot2d4"/>
-    <PRIMITIVE gatewayId="7" primitiveId="16" primitiveName="plot3d"/>
-    <PRIMITIVE gatewayId="7" primitiveId="17" primitiveName="plot3d1"/>
-    <PRIMITIVE gatewayId="7" primitiveId="18" primitiveName="winsid"/>
-    <PRIMITIVE gatewayId="7" primitiveId="19" primitiveName="xarc"/>
-    <PRIMITIVE gatewayId="7" primitiveId="20" primitiveName="xarcs"/>
-    <PRIMITIVE gatewayId="7" primitiveId="21" primitiveName="xarrows"/>
-    <PRIMITIVE gatewayId="7" primitiveId="22" primitiveName="drawaxis"/>
-    <PRIMITIVE gatewayId="7" primitiveId="23" primitiveName="xchange"/>
-    <PRIMITIVE gatewayId="7" primitiveId="24" primitiveName="xclick"/>
-    <PRIMITIVE gatewayId="7" primitiveId="25" primitiveName="xdel"/>
-    <PRIMITIVE gatewayId="7" primitiveId="26" primitiveName="xfarc"/>
-    <PRIMITIVE gatewayId="7" primitiveId="27" primitiveName="xfarcs"/>
-    <PRIMITIVE gatewayId="7" primitiveId="28" primitiveName="xfpoly"/>
-    <PRIMITIVE gatewayId="7" primitiveId="29" primitiveName="xfpolys"/>
-    <PRIMITIVE gatewayId="7" primitiveId="30" primitiveName="xfrect"/>
-    <PRIMITIVE gatewayId="7" primitiveId="31" primitiveName="xget"/>
-    <PRIMITIVE gatewayId="7" primitiveId="32" primitiveName="xgetmouse"/>
-    <PRIMITIVE gatewayId="7" primitiveId="33" primitiveName="xgrid"/>
-    <PRIMITIVE gatewayId="7" primitiveId="34" primitiveName="xlfont"/>
-    <PRIMITIVE gatewayId="7" primitiveId="35" primitiveName="xpoly"/>
-    <PRIMITIVE gatewayId="7" primitiveId="36" primitiveName="xpolys"/>
-    <PRIMITIVE gatewayId="7" primitiveId="37" primitiveName="xrect"/>
-    <PRIMITIVE gatewayId="7" primitiveId="38" primitiveName="xrects"/>
-    <PRIMITIVE gatewayId="7" primitiveId="39" primitiveName="xsegs"/>
-    <PRIMITIVE gatewayId="7" primitiveId="40" primitiveName="show_window"/>
-    <PRIMITIVE gatewayId="7" primitiveId="41" primitiveName="xset"/>
-    <PRIMITIVE gatewayId="7" primitiveId="42" primitiveName="xstring"/>
-    <PRIMITIVE gatewayId="7" primitiveId="43" primitiveName="xtitle"/>
-    <PRIMITIVE gatewayId="7" primitiveId="44" primitiveName="xgraduate"/>
-    <PRIMITIVE gatewayId="7" primitiveId="45" primitiveName="xname"/>
-    <PRIMITIVE gatewayId="7" primitiveId="46" primitiveName="zoom_rect"/>
-    <PRIMITIVE gatewayId="7" primitiveId="47" primitiveName="unzoom"/>
-    <PRIMITIVE gatewayId="7" primitiveId="48" primitiveName="stringbox"/>
-    <PRIMITIVE gatewayId="7" primitiveId="49" primitiveName="move"/>
-    <PRIMITIVE gatewayId="7" primitiveId="50" primitiveName="glue"/>
-    <PRIMITIVE gatewayId="7" primitiveId="51" primitiveName="unglue"/>
-    <PRIMITIVE gatewayId="7" primitiveId="52" primitiveName="drawnow"/>
-    <PRIMITIVE gatewayId="7" primitiveId="53" primitiveName="drawlater"/>
-    <PRIMITIVE gatewayId="7" primitiveId="54" primitiveName="copy"/>
-    <PRIMITIVE gatewayId="7" primitiveId="55" primitiveName="delete"/>
-    <PRIMITIVE gatewayId="7" primitiveId="56" primitiveName="get"/>
-    <PRIMITIVE gatewayId="7" primitiveId="57" primitiveName="set"/>
-    <PRIMITIVE gatewayId="7" primitiveId="58" primitiveName="newaxes"/>
-    <PRIMITIVE gatewayId="7" primitiveId="59" primitiveName="swap_handles"/>
-    <PRIMITIVE gatewayId="7" primitiveId="60" primitiveName="rubberbox"/>
-    <PRIMITIVE gatewayId="7" primitiveId="61" primitiveName="rotate_axes"/>
-    <PRIMITIVE gatewayId="7" primitiveId="62" primitiveName="is_handle_valid"/>
-    <PRIMITIVE gatewayId="7" primitiveId="63" primitiveName="captions"/>
-    <PRIMITIVE gatewayId="7" primitiveId="64" primitiveName="light"/>
-    <PRIMITIVE gatewayId="7" primitiveId="65" primitiveName="addcolor"/>
-    <PRIMITIVE gatewayId="7" primitiveId="66" primitiveName="name2rgb"/>
-    <PRIMITIVE gatewayId="7" primitiveId="67" primitiveName="color"/>
-    <PRIMITIVE gatewayId="7" primitiveId="68" primitiveName="contour2dm"/>
-</GATEWAY>
+<module name="graphics">
+    <gateway name="sci_get"             function="get"              type="1" />
+    <gateway name="sci_xget"            function="xget"             type="1" />
+    <gateway name="sci_xset"            function="xset"             type="1" />
+    <gateway name="sci_winsid"          function="winsid"           type="1" />
+    <gateway name="sci_matplot1"        function="Matplot1"         type="1" />
+
+    <gateway name="sci_matplot"         function="Matplot"          type="3" />
+
+    <gateway name="sci_champ"           function="champ"            type="0" />
+    <gateway name="sci_champ1"          function="champ1"           type="0" />
+    <gateway name="sci_fec"             function="fec"              type="0" />
+    <gateway name="sci_geom3d"          function="geom3d"           type="0" />
+    <gateway name="sci_grayplot"        function="grayplot"         type="0" />
+    <gateway name="sci_contour2di"      function="contour2di"       type="0" />
+    <gateway name="sci_param3d"         function="param3d"          type="0" />
+    <gateway name="sci_param3d1"        function="param3d1"         type="0" />
+    <gateway name="sci_xstringb"        function="xstringb"         type="0" />
+    <gateway name="sci_plot2d"          function="plot2d"           type="0" />
+    <gateway name="sci_plot2d1_2"       function="plot2d2"          type="0" />
+    <gateway name="sci_plot2d1_3"       function="plot2d3"          type="0" />
+    <gateway name="sci_plot2d1_4"       function="plot2d4"          type="0" />
+    <gateway name="sci_plot3d"          function="plot3d"           type="0" />
+    <gateway name="sci_plot3d"          function="plot3d1"          type="0" />
+    <gateway name="sci_xarc"            function="xarc"             type="0" />
+    <gateway name="sci_xarcs"           function="xarcs"            type="0" />
+    <gateway name="sci_xarrows"         function="xarrows"          type="0" />
+    <gateway name="sci_drawaxis"        function="drawaxis"         type="0" />
+    <gateway name="sci_xchange"         function="xchange"          type="0" />
+    <gateway name="sci_xclick"          function="xclick"           type="0" />
+    <gateway name="sci_xdel"            function="xdel"             type="0" />
+    <gateway name="sci_xarc"            function="xfarc"            type="0" />
+    <gateway name="sci_xfarcs"          function="xfarcs"           type="0" />
+    <gateway name="sci_xfpoly"          function="xfpoly"           type="0" />
+    <gateway name="sci_xfpolys"         function="xfpolys"          type="0" />
+    <gateway name="sci_xrect"           function="xfrect"           type="0" />
+    <gateway name="sci_xgetmouse"       function="xgetmouse"        type="0" />
+    <gateway name="sci_xgrid"           function="xgrid"            type="0" />
+    <gateway name="sci_xlfont"          function="xlfont"           type="0" />
+    <gateway name="sci_xpoly"           function="xpoly"            type="0" />
+    <gateway name="sci_xpolys"          function="xpolys"           type="0" />
+    <gateway name="sci_xrect"           function="xrect"            type="0" />
+    <gateway name="sci_xrects"          function="xrects"           type="0" />
+    <gateway name="sci_xsegs"           function="xsegs"            type="0" />
+    <gateway name="sci_show_window"     function="show_window"      type="0" />
+    <gateway name="sci_xstring"         function="xstring"          type="0" />
+    <gateway name="sci_xtitle"          function="xtitle"           type="0" />
+    <gateway name="sci_xgraduate"       function="xgraduate"        type="0" />
+    <gateway name="sci_xname"           function="xname"            type="0" />
+    <gateway name="sci_zoom_rect"       function="zoom_rect"        type="0" />
+    <gateway name="sci_unzoom"          function="unzoom"           type="0" />
+    <gateway name="sci_stringbox"       function="stringbox"        type="0" />
+    <gateway name="sci_move"            function="move"             type="0" />
+    <gateway name="sci_glue"            function="glue"             type="0" />
+    <gateway name="sci_unglue"          function="unglue"           type="0" />
+    <gateway name="sci_drawnow"         function="drawnow"          type="0" />
+    <gateway name="sci_drawlater"       function="drawlater"        type="0" />
+    <gateway name="sci_copy"            function="copy"             type="0" />
+    <gateway name="sci_delete"          function="delete"           type="0" />
+    <gateway name="sci_set"             function="set"              type="0" />
+    <gateway name="sci_newaxes"         function="newaxes"          type="0" />
+    <gateway name="sci_swap_handles"    function="swap_handles"     type="0" />
+    <gateway name="sci_rubberbox"       function="rubberbox"        type="0" />
+    <gateway name="sci_rotate_axes"     function="rotate_axes"      type="0" />
+    <gateway name="sci_is_handle_valid" function="is_handle_valid"  type="0" />
+    <gateway name="sci_Legend"          function="captions"         type="0" />
+    <gateway name="sci_light"           function="light"            type="0" />
+    <gateway name="sci_addcolor"        function="addcolor"         type="0" />
+    <gateway name="sci_name2rgb"        function="name2rgb"         type="0" />
+    <gateway name="sci_color"           function="color"            type="0" />
+    <gateway name="sci_contour2dm"      function="contour2dm"       type="0" />
+</module>
index 9aa2986..2f662cf 100755 (executable)
@@ -297,7 +297,7 @@ SetPropertyHashTable *createScilabSetHashTable(void)
 /*--------------------------------------------------------------------------*/
 int callSetProperty(void* _pvCtx, int iObjUID, void* _pvData, int valueType, int nbRow, int nbCol, const char *propertyName)
 {
-    setPropertyFunc accessor = searchSetHashtable(setHashTable, propertyName);
+    setPropertyFunc accessor = searchSetHashtable(setHashTable, (char*)propertyName);
 
     if (accessor == NULL)
     {
index f99beaa..652d38b 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="nographics.c" />
-    <ClCompile Include="nographics_gw.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="nographics.rc" />
   <ItemGroup>
     <ClInclude Include="..\..\includes\dynlib_graphics.h" />
     <ClInclude Include="..\..\includes\dynlib_graphics_gw.h" />
-    <ClInclude Include="..\..\includes\graphics_gw.hxx" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
index 7597b63..4bbe617 100644 (file)
@@ -21,9 +21,6 @@
     <ClCompile Include="nographics.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="nographics_gw.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="nographics.rc">
@@ -31,9 +28,6 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\includes\graphics_gw.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\includes\dynlib_graphics_gw.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/scilab/modules/graphics/src/nographics/nographics_gw.cpp b/scilab/modules/graphics/src/nographics/nographics_gw.cpp
deleted file mode 100644 (file)
index b46b6b5..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2012 - Scilab Enterprises - Antoine ELIAS
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- */
-
-#include "graphics_gw.hxx"
-#include "function.hxx"
-#include "context.hxx"
-
-#define MODULE_NAME L"graphics"
-extern "C"
-{
-#include "gw_graphics.h"
-}
-
-int GraphicsModule::Load()
-{
-    return 1;
-}
-
index 3928d51..187e32e 100644 (file)
@@ -203,7 +203,6 @@ GATEWAY_CXX_SOURCES = \
     sci_gateway/cpp/sci_raise_window.cpp \
     sci_gateway/cpp/sci_usecanvas.cpp \
     sci_gateway/cpp/sci_helpbrowser.cpp \
-    sci_gateway/cpp/gui_gw.cpp \
     sci_gateway/cpp/sci_fire_closing_finished.cpp \
     sci_gateway/cpp/sci_useeditor.cpp \
     sci_gateway/cpp/sci_openged.cpp \
@@ -272,8 +271,7 @@ libscigui_disable_la_CPPFLAGS = \
 
 
 GUI_DISABLE_C_SOURCES = src/nogui/nogui.c
-GUI_DISABLE_CXX_SOURCES = src/nogui/nogui_gw.cpp
-libscigui_disable_la_SOURCES = $(GUI_DISABLE_C_SOURCES) $(GUI_DISABLE_CXX_SOURCES)
+libscigui_disable_la_SOURCES = $(GUI_DISABLE_C_SOURCES)
 
 
 pkglib_LTLIBRARIES = libscigui-disable.la
index 881d469..667d69e 100644 (file)
@@ -292,11 +292,10 @@ am__v_lt_1 =
 @GUI_TRUE@am_libscigui_algo_la_rpath =
 libscigui_disable_la_LIBADD =
 am__objects_3 = src/nogui/libscigui_disable_la-nogui.lo
-am__objects_4 = src/nogui/libscigui_disable_la-nogui_gw.lo
-am_libscigui_disable_la_OBJECTS = $(am__objects_3) $(am__objects_4)
+am_libscigui_disable_la_OBJECTS = $(am__objects_3)
 libscigui_disable_la_OBJECTS = $(am_libscigui_disable_la_OBJECTS)
 libscigui_la_DEPENDENCIES = libscigui-algo.la
-am__objects_5 = sci_gateway/c/libscigui_la-sci_x_choose.lo \
+am__objects_4 = sci_gateway/c/libscigui_la-sci_x_choose.lo \
        sci_gateway/c/libscigui_la-sci_x_choose_modeless.lo \
        sci_gateway/c/libscigui_la-sci_unsetmenu.lo \
        sci_gateway/c/libscigui_la-sci_delmenu.lo \
@@ -313,7 +312,7 @@ am__objects_5 = sci_gateway/c/libscigui_la-sci_x_choose.lo \
        sci_gateway/c/libscigui_la-sci_getcallbackobject.lo \
        sci_gateway/c/libscigui_la-sci_exportUI.lo \
        sci_gateway/c/libscigui_la-sci_figure.lo
-am__objects_6 = sci_gateway/cpp/libscigui_la-sci_printsetupbox.lo \
+am__objects_5 = sci_gateway/cpp/libscigui_la-sci_printsetupbox.lo \
        sci_gateway/cpp/libscigui_la-sci_toprint.lo \
        sci_gateway/cpp/libscigui_la-sci_printfigure.lo \
        sci_gateway/cpp/libscigui_la-sci_setlookandfeel.lo \
@@ -328,7 +327,6 @@ am__objects_6 = sci_gateway/cpp/libscigui_la-sci_printsetupbox.lo \
        sci_gateway/cpp/libscigui_la-sci_raise_window.lo \
        sci_gateway/cpp/libscigui_la-sci_usecanvas.lo \
        sci_gateway/cpp/libscigui_la-sci_helpbrowser.lo \
-       sci_gateway/cpp/libscigui_la-gui_gw.lo \
        sci_gateway/cpp/libscigui_la-sci_fire_closing_finished.lo \
        sci_gateway/cpp/libscigui_la-sci_useeditor.lo \
        sci_gateway/cpp/libscigui_la-sci_openged.lo \
@@ -344,12 +342,12 @@ am__objects_6 = sci_gateway/cpp/libscigui_la-sci_printsetupbox.lo \
        sci_gateway/cpp/libscigui_la-sci_datatip_set_orient.lo \
        sci_gateway/cpp/libscigui_la-sci_saveGui.lo \
        sci_gateway/cpp/libscigui_la-sci_loadGui.lo \
-    sci_gateway/cpp/libscigui_la-sci_x_choice.lo \
+       sci_gateway/cpp/libscigui_la-sci_x_choice.lo \
        sci_gateway/cpp/libscigui_la-sci_uigetcolor.lo \
        sci_gateway/cpp/libscigui_la-sci_ClipBoard.lo \
-    sci_gateway/cpp/libscigui_la-sci_x_mdialog.lo \
+       sci_gateway/cpp/libscigui_la-sci_x_mdialog.lo \
        sci_gateway/cpp/libscigui_la-sci_x_dialog.lo
-am_libscigui_la_OBJECTS = $(am__objects_5) $(am__objects_6)
+am_libscigui_la_OBJECTS = $(am__objects_4) $(am__objects_5)
 libscigui_la_OBJECTS = $(am_libscigui_la_OBJECTS)
 @GUI_TRUE@am_libscigui_la_rpath = -rpath $(pkglibdir)
 AM_V_P = $(am__v_P_@AM_V@)
@@ -905,7 +903,6 @@ GATEWAY_CXX_SOURCES = \
     sci_gateway/cpp/sci_raise_window.cpp \
     sci_gateway/cpp/sci_usecanvas.cpp \
     sci_gateway/cpp/sci_helpbrowser.cpp \
-    sci_gateway/cpp/gui_gw.cpp \
     sci_gateway/cpp/sci_fire_closing_finished.cpp \
     sci_gateway/cpp/sci_useeditor.cpp \
     sci_gateway/cpp/sci_openged.cpp \
@@ -923,9 +920,9 @@ GATEWAY_CXX_SOURCES = \
     sci_gateway/cpp/sci_loadGui.cpp \
     sci_gateway/cpp/sci_x_choice.cpp \
     sci_gateway/cpp/sci_uigetcolor.cpp \
+    sci_gateway/cpp/sci_ClipBoard.cpp \
     sci_gateway/cpp/sci_x_mdialog.cpp \
-    sci_gateway/cpp/sci_x_dialog.cpp \
-    sci_gateway/cpp/sci_ClipBoard.cpp
+    sci_gateway/cpp/sci_x_dialog.cpp
 
 libscigui_la_CPPFLAGS = \
     -I$(srcdir)/includes/ \
@@ -974,8 +971,7 @@ libscigui_disable_la_CPPFLAGS = \
     $(AM_CPPFLAGS)
 
 GUI_DISABLE_C_SOURCES = src/nogui/nogui.c
-GUI_DISABLE_CXX_SOURCES = src/nogui/nogui_gw.cpp
-libscigui_disable_la_SOURCES = $(GUI_DISABLE_C_SOURCES) $(GUI_DISABLE_CXX_SOURCES)
+libscigui_disable_la_SOURCES = $(GUI_DISABLE_C_SOURCES)
 pkglib_LTLIBRARIES = libscigui-disable.la $(am__append_3)
 @GUI_TRUE@noinst_LTLIBRARIES = libscigui-algo.la
 libscigui_algo_la_SOURCES = $(GUI_C_SOURCES) $(GUI_CXX_SOURCES)
@@ -1493,11 +1489,9 @@ src/nogui/$(DEPDIR)/$(am__dirstamp):
        @: > src/nogui/$(DEPDIR)/$(am__dirstamp)
 src/nogui/libscigui_disable_la-nogui.lo: src/nogui/$(am__dirstamp) \
        src/nogui/$(DEPDIR)/$(am__dirstamp)
-src/nogui/libscigui_disable_la-nogui_gw.lo: src/nogui/$(am__dirstamp) \
-       src/nogui/$(DEPDIR)/$(am__dirstamp)
 
 libscigui-disable.la: $(libscigui_disable_la_OBJECTS) $(libscigui_disable_la_DEPENDENCIES) $(EXTRA_libscigui_disable_la_DEPENDENCIES) 
-       $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libscigui_disable_la_OBJECTS) $(libscigui_disable_la_LIBADD) $(LIBS)
+       $(AM_V_CCLD)$(LINK) -rpath $(pkglibdir) $(libscigui_disable_la_OBJECTS) $(libscigui_disable_la_LIBADD) $(LIBS)
 sci_gateway/c/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/c
        @: > sci_gateway/c/$(am__dirstamp)
@@ -1606,9 +1600,6 @@ sci_gateway/cpp/libscigui_la-sci_usecanvas.lo:  \
 sci_gateway/cpp/libscigui_la-sci_helpbrowser.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/cpp/libscigui_la-gui_gw.lo:  \
-       sci_gateway/cpp/$(am__dirstamp) \
-       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/libscigui_la-sci_fire_closing_finished.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
@@ -1708,7 +1699,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_waitbar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_choose.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscigui_la-sci_x_choose_modeless.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-gui_gw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_ClipBoard.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_about.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_datatip_manager_mode.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_datatip_set_display.Plo@am__quote@
@@ -1733,6 +1724,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_saveGui.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_setlookandfeel.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_toprint.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_uigetcolor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_uigetdir.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_uigetfile.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_uigetfont.Plo@am__quote@
@@ -1740,8 +1732,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_usecanvas.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_useeditor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_choice.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_uigetcolor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_ClipBoard.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_dialog.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_mdialog.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscigui_algo_la-CreateUimenu.Plo@am__quote@
@@ -1836,7 +1826,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/jni/$(DEPDIR)/libscigui_algo_la-StartPlotBrowser.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/jni/$(DEPDIR)/libscigui_algo_la-SwingView.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/nogui/$(DEPDIR)/libscigui_disable_la-nogui.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/nogui/$(DEPDIR)/libscigui_disable_la-nogui_gw.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -2082,41 +2071,6 @@ sci_gateway/c/libscigui_la-sci_figure.lo: sci_gateway/c/sci_figure.c
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
-sci_gateway/cpp/libscigui_la-sci_ClipBoard.lo: sci_gateway/cpp/sci_ClipBoard.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigui_la-sci_ClipBoard.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_ClipBoard.Tpo -c -o sci_gateway/cpp/libscigui_la-sci_ClipBoard.lo `test -f 'sci_gateway/cpp/sci_ClipBoard.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_ClipBoard.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_ClipBoard.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_ClipBoard.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_ClipBoard.cpp' object='sci_gateway/cpp/libscigui_la-sci_ClipBoard.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigui_la-sci_ClipBoard.lo `test -f 'sci_gateway/cpp/sci_ClipBoard.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_ClipBoard.cpp
-
-sci_gateway/cpp/libscigui_la-sci_x_mdialog.lo: sci_gateway/cpp/sci_x_mdialog.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigui_la-sci_x_mdialog.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_mdialog.Tpo -c -o sci_gateway/cpp/libscigui_la-sci_x_mdialog.lo `test -f 'sci_gateway/cpp/sci_x_mdialog.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_x_mdialog.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_mdialog.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_mdialog.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_x_mdialog.cpp' object='sci_gateway/cpp/libscigui_la-sci_x_mdialog.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigui_la-sci_x_mdialog.lo `test -f 'sci_gateway/cpp/sci_x_mdialog.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_x_mdialog.cpp
-
-sci_gateway/cpp/libscigui_la-sci_x_dialog.lo: sci_gateway/cpp/sci_x_dialog.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigui_la-sci_x_dialog.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_dialog.Tpo -c -o sci_gateway/cpp/libscigui_la-sci_x_dialog.lo `test -f 'sci_gateway/cpp/sci_x_dialog.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_x_dialog.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_dialog.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_dialog.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_x_dialog.cpp' object='sci_gateway/cpp/libscigui_la-sci_x_dialog.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigui_la-sci_x_dialog.lo `test -f 'sci_gateway/cpp/sci_x_dialog.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_x_dialog.cpp
-
-sci_gateway/cpp/libscigui_la-sci_x_choice.lo: sci_gateway/cpp/sci_x_choice.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigui_la-sci_x_choice.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_choice.Tpo -c -o sci_gateway/cpp/libscigui_la-sci_x_choice.lo `test -f 'sci_gateway/cpp/sci_x_choice.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_x_choice.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_choice.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_choice.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_x_choice.cpp' object='sci_gateway/cpp/libscigui_la-sci_x_choice.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigui_la-sci_x_choice.lo `test -f 'sci_gateway/cpp/sci_x_choice.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_x_choice.cpp
-
-sci_gateway/cpp/libscigui_la-sci_uigetcolor.lo: sci_gateway/cpp/sci_uigetcolor.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigui_la-sci_uigetcolor.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_uigetcolor.Tpo -c -o sci_gateway/cpp/libscigui_la-sci_uigetcolor.lo `test -f 'sci_gateway/cpp/sci_uigetcolor.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_uigetcolor.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_uigetcolor.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_uigetcolor.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_uigetcolor.cpp' object='sci_gateway/cpp/libscigui_la-sci_uigetcolor.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigui_la-sci_uigetcolor.lo `test -f 'sci_gateway/cpp/sci_uigetcolor.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_uigetcolor.cpp
-
 src/cpp/libscigui_algo_la-InitUIMenu.lo: src/cpp/InitUIMenu.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libscigui_algo_la-InitUIMenu.lo -MD -MP -MF src/cpp/$(DEPDIR)/libscigui_algo_la-InitUIMenu.Tpo -c -o src/cpp/libscigui_algo_la-InitUIMenu.lo `test -f 'src/cpp/InitUIMenu.cpp' || echo '$(srcdir)/'`src/cpp/InitUIMenu.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libscigui_algo_la-InitUIMenu.Tpo src/cpp/$(DEPDIR)/libscigui_algo_la-InitUIMenu.Plo
@@ -2684,13 +2638,6 @@ src/jni/libscigui_algo_la-DatatipOrientation.lo: src/jni/DatatipOrientation.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/jni/libscigui_algo_la-DatatipOrientation.lo `test -f 'src/jni/DatatipOrientation.cpp' || echo '$(srcdir)/'`src/jni/DatatipOrientation.cpp
 
-src/nogui/libscigui_disable_la-nogui_gw.lo: src/nogui/nogui_gw.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/nogui/libscigui_disable_la-nogui_gw.lo -MD -MP -MF src/nogui/$(DEPDIR)/libscigui_disable_la-nogui_gw.Tpo -c -o src/nogui/libscigui_disable_la-nogui_gw.lo `test -f 'src/nogui/nogui_gw.cpp' || echo '$(srcdir)/'`src/nogui/nogui_gw.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/nogui/$(DEPDIR)/libscigui_disable_la-nogui_gw.Tpo src/nogui/$(DEPDIR)/libscigui_disable_la-nogui_gw.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/nogui/nogui_gw.cpp' object='src/nogui/libscigui_disable_la-nogui_gw.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/nogui/libscigui_disable_la-nogui_gw.lo `test -f 'src/nogui/nogui_gw.cpp' || echo '$(srcdir)/'`src/nogui/nogui_gw.cpp
-
 sci_gateway/cpp/libscigui_la-sci_printsetupbox.lo: sci_gateway/cpp/sci_printsetupbox.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigui_la-sci_printsetupbox.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_printsetupbox.Tpo -c -o sci_gateway/cpp/libscigui_la-sci_printsetupbox.lo `test -f 'sci_gateway/cpp/sci_printsetupbox.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_printsetupbox.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_printsetupbox.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_printsetupbox.Plo
@@ -2796,13 +2743,6 @@ sci_gateway/cpp/libscigui_la-sci_helpbrowser.lo: sci_gateway/cpp/sci_helpbrowser
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigui_la-sci_helpbrowser.lo `test -f 'sci_gateway/cpp/sci_helpbrowser.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_helpbrowser.cpp
 
-sci_gateway/cpp/libscigui_la-gui_gw.lo: sci_gateway/cpp/gui_gw.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigui_la-gui_gw.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-gui_gw.Tpo -c -o sci_gateway/cpp/libscigui_la-gui_gw.lo `test -f 'sci_gateway/cpp/gui_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/gui_gw.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-gui_gw.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-gui_gw.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/gui_gw.cpp' object='sci_gateway/cpp/libscigui_la-gui_gw.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigui_la-gui_gw.lo `test -f 'sci_gateway/cpp/gui_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/gui_gw.cpp
-
 sci_gateway/cpp/libscigui_la-sci_fire_closing_finished.lo: sci_gateway/cpp/sci_fire_closing_finished.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigui_la-sci_fire_closing_finished.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_fire_closing_finished.Tpo -c -o sci_gateway/cpp/libscigui_la-sci_fire_closing_finished.lo `test -f 'sci_gateway/cpp/sci_fire_closing_finished.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_fire_closing_finished.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_fire_closing_finished.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_fire_closing_finished.Plo
@@ -2908,6 +2848,41 @@ sci_gateway/cpp/libscigui_la-sci_loadGui.lo: sci_gateway/cpp/sci_loadGui.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigui_la-sci_loadGui.lo `test -f 'sci_gateway/cpp/sci_loadGui.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_loadGui.cpp
 
+sci_gateway/cpp/libscigui_la-sci_x_choice.lo: sci_gateway/cpp/sci_x_choice.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigui_la-sci_x_choice.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_choice.Tpo -c -o sci_gateway/cpp/libscigui_la-sci_x_choice.lo `test -f 'sci_gateway/cpp/sci_x_choice.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_x_choice.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_choice.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_choice.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_x_choice.cpp' object='sci_gateway/cpp/libscigui_la-sci_x_choice.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigui_la-sci_x_choice.lo `test -f 'sci_gateway/cpp/sci_x_choice.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_x_choice.cpp
+
+sci_gateway/cpp/libscigui_la-sci_uigetcolor.lo: sci_gateway/cpp/sci_uigetcolor.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigui_la-sci_uigetcolor.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_uigetcolor.Tpo -c -o sci_gateway/cpp/libscigui_la-sci_uigetcolor.lo `test -f 'sci_gateway/cpp/sci_uigetcolor.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_uigetcolor.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_uigetcolor.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_uigetcolor.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_uigetcolor.cpp' object='sci_gateway/cpp/libscigui_la-sci_uigetcolor.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigui_la-sci_uigetcolor.lo `test -f 'sci_gateway/cpp/sci_uigetcolor.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_uigetcolor.cpp
+
+sci_gateway/cpp/libscigui_la-sci_ClipBoard.lo: sci_gateway/cpp/sci_ClipBoard.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigui_la-sci_ClipBoard.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_ClipBoard.Tpo -c -o sci_gateway/cpp/libscigui_la-sci_ClipBoard.lo `test -f 'sci_gateway/cpp/sci_ClipBoard.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_ClipBoard.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_ClipBoard.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_ClipBoard.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_ClipBoard.cpp' object='sci_gateway/cpp/libscigui_la-sci_ClipBoard.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigui_la-sci_ClipBoard.lo `test -f 'sci_gateway/cpp/sci_ClipBoard.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_ClipBoard.cpp
+
+sci_gateway/cpp/libscigui_la-sci_x_mdialog.lo: sci_gateway/cpp/sci_x_mdialog.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigui_la-sci_x_mdialog.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_mdialog.Tpo -c -o sci_gateway/cpp/libscigui_la-sci_x_mdialog.lo `test -f 'sci_gateway/cpp/sci_x_mdialog.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_x_mdialog.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_mdialog.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_mdialog.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_x_mdialog.cpp' object='sci_gateway/cpp/libscigui_la-sci_x_mdialog.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigui_la-sci_x_mdialog.lo `test -f 'sci_gateway/cpp/sci_x_mdialog.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_x_mdialog.cpp
+
+sci_gateway/cpp/libscigui_la-sci_x_dialog.lo: sci_gateway/cpp/sci_x_dialog.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscigui_la-sci_x_dialog.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_dialog.Tpo -c -o sci_gateway/cpp/libscigui_la-sci_x_dialog.lo `test -f 'sci_gateway/cpp/sci_x_dialog.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_x_dialog.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_dialog.Tpo sci_gateway/cpp/$(DEPDIR)/libscigui_la-sci_x_dialog.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_x_dialog.cpp' object='sci_gateway/cpp/libscigui_la-sci_x_dialog.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigui_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscigui_la-sci_x_dialog.lo `test -f 'sci_gateway/cpp/sci_x_dialog.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_x_dialog.cpp
+
 mostlyclean-libtool:
        -rm -f *.lo
 
diff --git a/scilab/modules/gui/includes/dynlib_gui_gw.h b/scilab/modules/gui/includes/dynlib_gui_gw.h
deleted file mode 100644 (file)
index 79568e6..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) - 2012 - Scilab Enterprises - Antoine ELIAS
-*
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
-*
-*/
-
-/*--------------------------------------------------------------------------*/
-#ifndef __DYNLIB_GUI_GW_H__
-#define __DYNLIB_GUI_GW_H__
-
-#ifdef _MSC_VER
-#ifdef GUI_GW_EXPORTS
-#define GUI_GW_IMPEXP __declspec(dllexport)
-#else
-#define GUI_GW_IMPEXP __declspec(dllimport)
-#endif
-#else
-#define GUI_GW_IMPEXP
-#endif
-
-#endif /* __DYNLIB_GUI_GW_H__ */
-/*--------------------------------------------------------------------------*/
-
index e581822..040d29b 100644 (file)
 #define __GUI_GW_HXX__
 
 #include "cpp_gateway_prototype.hxx"
-#include "dynlib_gui_gw.h"
+#include "dynlib_gui.h"
 
-class GuiModule
-{
-private :
-    GuiModule() {};
-    ~GuiModule() {};
-public :
-    GUI_GW_IMPEXP static int LoadDeps(const std::wstring& _functionName);
-    GUI_GW_IMPEXP static int Load();
-    GUI_GW_IMPEXP static int Unload()
-    {
-        return 1;
-    }
-
-    static bool loadedDep;
-};
-
-CPP_GATEWAY_PROTOTYPE(sci_displaytree);
-CPP_GATEWAY_PROTOTYPE(sci_helpbrowser);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_displaytree, GUI_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_helpbrowser, GUI_IMPEXP);
 
 #endif /* !__GUI_GW_HXX__ */
diff --git a/scilab/modules/gui/sci_gateway/cpp/gui_gw.cpp b/scilab/modules/gui/sci_gateway/cpp/gui_gw.cpp
deleted file mode 100644 (file)
index c6de274..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2010-2010 - DIGITEO - Bruno JOFRET
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- */
-
-#include "gui_gw.hxx"
-#include "function.hxx"
-#include "context.hxx"
-
-#define MODULE_NAME L"gui"
-extern "C"
-{
-#include "gw_gui.h"
-#include "loadOnUseClassPath.h"
-}
-
-bool GuiModule::loadedDep = false;
-
-int GuiModule::LoadDeps(const std::wstring& _functionName)
-{
-    if (loadedDep == false &&
-            (_functionName == L"uicontrol" ||
-             _functionName == L"uimenu" ||
-             _functionName == L"usecanvas" ||
-             _functionName == L"loadGui" ||
-             _functionName == L"figure"))
-    {
-        loadOnUseClassPath("graphics");
-        loadedDep = true;
-    }
-
-    return 1;
-}
-
-int GuiModule::Load()
-{
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"x_dialog", &sci_x_dialog, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"x_choose", &sci_x_choose, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"x_mdialog", &sci_x_mdialog, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"xchoicesi", &sci_x_choice, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"delmenu", &sci_delmenu, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"setmenu", &sci_setmenu, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"unsetmenu", &sci_unsetmenu, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"raise_window", &sci_raise_window, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"getlookandfeel", &sci_getlookandfeel, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"getinstalledlookandfeels", &sci_getinstalledlookandfeels, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"setlookandfeel", &sci_setlookandfeel, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"ClipBoard", &sci_ClipBoard, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"toolbar", &sci_toolbar, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"uigetdir", &sci_uigetdir, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"uicontrol", &sci_uicontrol, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"uimenu", &sci_uimenu, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"uipopup", &sci_mpopup, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"x_choose_modeless", &sci_x_choose_modeless, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"uicontextmenu", &sci_uicontextmenu, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"uiwait", &sci_uiwait, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"messagebox", &sci_messagebox, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"waitbar", &sci_waitbar, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"progressionbar", &sci_progressionbar, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"helpbrowser", &sci_helpbrowser, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"uigetfont", &sci_uigetfont, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"uigetcolor", &sci_uigetcolor, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"getcallbackobject", &sci_getcallbackobject, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"printfigure", &sci_printfigure, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"exportUI", &sci_exportUI, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"printsetupbox", &sci_printsetupbox, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"toprint", &sci_toprint, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"uigetfile", &sci_uigetfile, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"usecanvas", &sci_usecanvas, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"uiDisplayTree", &sci_displaytree, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"uiputfile", &sci_uiputfile, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"about", &sci_about, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"fire_closing_finished", &sci_fire_closing_finished, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"useeditor", &sci_useeditor, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"openged", &sci_openged, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"datatipCreate", &sci_datatipcreate, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"datatipRemove", &sci_datatipremove, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"plotbrowser", &sci_plotbrowser, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"datatipManagerMode", &sci_datatip_manager_mode, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"datatipToggle", &sci_datatip_toggle, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"datatipMove", &sci_datatipmove, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"datatipSetStyle", &sci_datatip_set_style, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"datatipSetDisplay", &sci_datatip_set_display, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"datatipSetInterp", &sci_datatip_set_interp, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"datatipSetOrient", &sci_datatip_set_orient, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"figure", &sci_figure, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"saveGui", &sci_saveGui, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"loadGui", &sci_loadGui, &GuiModule::LoadDeps, MODULE_NAME));
-    return 1;
-}
diff --git a/scilab/modules/gui/sci_gateway/cpp/gui_gw.vcxproj b/scilab/modules/gui/sci_gateway/cpp/gui_gw.vcxproj
deleted file mode 100644 (file)
index d8b13c8..0000000
+++ /dev/null
@@ -1,237 +0,0 @@
-<?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>
-  <ItemGroup>
-    <ClInclude Include="..\..\includes\dynlib_gui_gw.h" />
-    <ClInclude Include="..\..\includes\gui_gw.hxx" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="gui_gw.cpp" />
-    <ClCompile Include="sci_displaytree.cpp" />
-    <ClCompile Include="sci_helpbrowser.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\api_scilab\api_scilab.vcxproj">
-      <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\ast\ast.vcxproj">
-      <Project>{0d3fa25b-8116-44ec-a45e-260789daa3d9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\commons\src\c\commons.vcxproj">
-      <Project>{eca09a1e-6d12-4a47-92e1-a671c181df77}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\core\src\c\core.vcxproj">
-      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\jvm\libjvm.vcxproj">
-      <Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\localization\src\localization.vcxproj">
-      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj">
-      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\c\gui.vcxproj">
-      <Project>{45ca5b12-7601-4968-ae16-16069fd1a152}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\..\..\..\bin\libintl.lib" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{83C04253-B152-4EF6-BB36-35A7B0FDFB98}</ProjectGuid>
-    <RootNamespace>gui_gw</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>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </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'">true</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'">true</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>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/cpp;../../src/jni;../../../../libs/intl;$(SCILAB_JDK32)/include/win32;$(SCILAB_JDK32)/include;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../commons/src/jni;../../../api_scilab/includes;../../../dynamic_link/includes;../../../string/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GUI_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <PreLinkEvent>
-      <Command>
-      </Command>
-    </PreLinkEvent>
-    <Link>
-      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/cpp;../../src/jni;../../../../libs/intl;$(SCILAB_JDK64)/include/win32;$(SCILAB_JDK64)/include;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../commons/src/jni;../../../api_scilab/includes;../../../dynamic_link/includes;../../../string/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GUI_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <PreLinkEvent>
-      <Command>
-      </Command>
-    </PreLinkEvent>
-    <Link>
-      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/cpp;../../src/jni;../../../../libs/intl;$(SCILAB_JDK32)/include/win32;$(SCILAB_JDK32)/include;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../commons/src/jni;../../../api_scilab/includes;../../../dynamic_link/includes;../../../string/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GUI_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <PreLinkEvent>
-      <Command>
-      </Command>
-    </PreLinkEvent>
-    <Link>
-      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/cpp;../../src/jni;../../../../libs/intl;$(SCILAB_JDK64)/include/win32;$(SCILAB_JDK64)/include;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../commons/src/jni;../../../api_scilab/includes;../../../dynamic_link/includes;../../../string/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GUI_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <PreLinkEvent>
-      <Command>
-      </Command>
-    </PreLinkEvent>
-    <Link>
-      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/scilab/modules/gui/sci_gateway/cpp/gui_gw.vcxproj.filters b/scilab/modules/gui/sci_gateway/cpp/gui_gw.vcxproj.filters
deleted file mode 100644 (file)
index d9337da..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{849f437f-5cb2-42ef-9e0d-1d95957772de}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{c724820e-db5b-41b0-b652-9f4d56662577}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{46da9099-0a60-4fd9-85e0-a9a03d7f7ab5}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\includes\gui_gw.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\includes\dynlib_gui_gw.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="gui_gw.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_helpbrowser.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_displaytree.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\..\..\..\bin\libintl.lib" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
index e3cf58f..770ca95 100644 (file)
@@ -20,7 +20,6 @@
 #include <vector>
 
 #include "gui_gw.hxx"
-
 #include "displaytree.hxx"
 #include "ScilabDisplayTree.hxx"
 #include "GiwsException.hxx"
index ac3d8f6..9a1911d 100644 (file)
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
-<GATEWAY name="gui">
-    <!-- =================== -->
-    <!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007 - INRIA - Allan CORNET
- * Copyright (C) 2007 - INRIA - Sylvestre LEDRU
- * Copyright (C) 2008 - INRIA - Vincent COUVERT
+<!DOCTYPE module SYSTEM "../../functions/xml/gateway.dtd">
+<!--
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2011 - DIGITEO - Antoine ELIAS
  *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * For more information, see the COPYING file which you should have received
  * along with this program.
  *
- * Scilab
- * Interface description. In this file, we define the list of the function which
- * will be available into Scilab and the link to the "native" function.
- *
- * gatewayId is the position in the hashtable 'Interfaces' defined in the
- * file SCI/modules/core/src/c/callinterf.h
- *
- * primitiveId is the position in the hashtable '<module>Table Tab[]' defined
- * in the file modules/<module>/sci_gateway/c/gw_<module>.c
- *
- * primitiveName is the name of the Scilab function
- *
- * Don't touch if you do not know what you are doing
+ */
+ Scilab
+ Interface description. In this file, we define the list of the function which
+ will be available into Scilab and the link to the "native" function.
+
+ Don't touch if you do not know what you are doing
 -->
-    <!-- =================== -->
+<module name="gui">
+    <gateway name="sci_helpbrowser"                 function="helpbrowser"              type="1" />
+    <gateway name="sci_displaytree"                 function="uiDisplayTree"            type="1" />
+
+    <gateway name="sci_x_dialog"                    function="x_dialog"                 type="0" />
+    <gateway name="sci_x_choose"                    function="x_choose"                 type="0" />
+    <gateway name="sci_x_mdialog"                   function="x_mdialog"                type="0" />
+    <gateway name="sci_xchoicesi"                   function="xchoicesi"                type="0" />
+    <gateway name="sci_delmenu"                     function="delmenu"                  type="0" />
+    <gateway name="sci_setmenu"                     function="setmenu"                  type="0" />
+    <gateway name="sci_unsetmenu"                   function="unsetmenu"                type="0" />
+    <gateway name="sci_raise_window"                function="raise_window"             type="0" />
+    <gateway name="sci_getlookandfeel"              function="getlookandfeel"           type="0" />
+    <gateway name="sci_getinstalledlookandfeels"    function="getinstalledlookandfeels" type="0" />
+    <gateway name="sci_setlookandfeel"              function="setlookandfeel"           type="0" />
+    <gateway name="sci_ClipBoard"                   function="ClipBoard"                type="0" />
+    <gateway name="sci_toolbar"                     function="toolbar"                  type="0" />
+    <gateway name="sci_uigetdir"                    function="uigetdir"                 type="0" />
+    <gateway name="sci_uicontrol"                   function="uicontrol"                type="0" />
+    <gateway name="sci_uimenu"                      function="uimenu"                   type="0" />
+    <gateway name="sci_mpopup"                      function="uipopup"                  type="0" />
+    <gateway name="sci_x_choose_modeless"           function="x_choose_modeless"        type="0" />
+    <gateway name="sci_uicontextmenu"               function="uicontextmenu"            type="0" />
+    <gateway name="sci_uiwait"                      function="uiwait"                   type="0" />
+    <gateway name="sci_messagebox"                  function="messagebox"               type="0" />
+    <gateway name="sci_waitbar"                     function="waitbar"                  type="0" />
+    <gateway name="sci_progressionbar"              function="progressionbar"           type="0" />
+    <gateway name="sci_uigetfont"                   function="uigetfont"                type="0" />
+    <gateway name="sci_uigetcolor"                  function="uigetcolor"               type="0" />
+    <gateway name="sci_getcallbackobject"           function="getcallbackobject"        type="0" />
+    <gateway name="sci_printfigure"                 function="printfigure"              type="0" />
+    <gateway name="sci_exportUI"                    function="exportUI"                 type="0" />
+    <gateway name="sci_printsetupbox"               function="printsetupbox"            type="0" />
+    <gateway name="sci_toprint"                     function="toprint"                  type="0" />
+    <gateway name="sci_uigetfile"                   function="uigetfile"                type="0" />
+    <gateway name="sci_usecanvas"                   function="usecanvas"                type="0" />
+    <gateway name="sci_uiputfile"                   function="uiputfile"                type="0" />
+    <gateway name="sci_about"                       function="about"                    type="0" />
+    <gateway name="sci_fire_closing_finished"       function="fire_closing_finished"    type="0" />
+    <gateway name="sci_useeditor"                   function="useeditor"                type="0" />
+    <gateway name="sci_openged"                     function="openged"                  type="0" />
+    <gateway name="sci_datatipcreate"               function="datatipCreate"            type="0" />
+    <gateway name="sci_datatipRemove"               function="datatipremove"            type="0" />
+    <gateway name="sci_plotbrowser"                 function="plotbrowser"              type="0" />
+    <gateway name="sci_datatip_manager_mode"        function="datatipManagerMode"       type="0" />
+    <gateway name="sci_datatip_toggle"              function="datatipToggle"            type="0" />
+    <gateway name="sci_datatipmove"                 function="datatipMove"              type="0" />
+    <gateway name="sci_datatip_set_style"           function="datatipSetStyle"          type="0" />
+    <gateway name="sci_datatip_set_display"         function="datatipSetDisplay"        type="0" />
+    <gateway name="sci_datatip_set_interp"          function="datatipSetInterp"         type="0" />
+    <gateway name="sci_datatip_set_orient"          function="datatipSetOrient"         type="0" />
+    <gateway name="sci_figure"                      function="figure"                   type="0" />
+    <gateway name="sci_saveGui"                     function="saveGui"                  type="0" />
+    <gateway name="sci_loadGui"                     function="loadGui"                  type="0" />
 
-    <PRIMITIVE gatewayId="25" primitiveId="1" primitiveName="x_dialog" />
-    <PRIMITIVE gatewayId="25" primitiveId="2" primitiveName="x_choose" />
-    <PRIMITIVE gatewayId="25" primitiveId="3" primitiveName="x_mdialog" />
-    <PRIMITIVE gatewayId="25" primitiveId="4" primitiveName="xchoicesi" />
-    <PRIMITIVE gatewayId="25" primitiveId="5" primitiveName="delmenu" />
-    <PRIMITIVE gatewayId="25" primitiveId="6" primitiveName="setmenu" />
-    <PRIMITIVE gatewayId="25" primitiveId="7" primitiveName="unsetmenu" />
-    <PRIMITIVE gatewayId="25" primitiveId="8" primitiveName="raise_window" />
-    <PRIMITIVE gatewayId="25" primitiveId="9" primitiveName="getlookandfeel"/>
-    <PRIMITIVE gatewayId="25" primitiveId="10" primitiveName="getinstalledlookandfeels"/>
-    <PRIMITIVE gatewayId="25" primitiveId="11" primitiveName="setlookandfeel"/>
-    <PRIMITIVE gatewayId="25" primitiveId="12" primitiveName="ClipBoard"/>
-    <PRIMITIVE gatewayId="25" primitiveId="13" primitiveName="toolbar"/>
-    <PRIMITIVE gatewayId="25" primitiveId="14" primitiveName="uigetdir"/>
-    <PRIMITIVE gatewayId="25" primitiveId="15" primitiveName="uicontrol"/>
-    <PRIMITIVE gatewayId="25" primitiveId="16" primitiveName="uimenu"/>
-    <PRIMITIVE gatewayId="25" primitiveId="17" primitiveName="uipopup"/>
-    <PRIMITIVE gatewayId="25" primitiveId="18" primitiveName="x_choose_modeless" />
-    <PRIMITIVE gatewayId="25" primitiveId="19" primitiveName="uicontextmenu" />
-    <PRIMITIVE gatewayId="25" primitiveId="20" primitiveName="uiwait" />
-    <PRIMITIVE gatewayId="25" primitiveId="21" primitiveName="messagebox" />
-    <PRIMITIVE gatewayId="25" primitiveId="22" primitiveName="waitbar" />
-    <PRIMITIVE gatewayId="25" primitiveId="23" primitiveName="progressionbar" />
-    <PRIMITIVE gatewayId="25" primitiveId="24" primitiveName="helpbrowser" />
-    <PRIMITIVE gatewayId="25" primitiveId="25" primitiveName="uigetfont" />
-    <PRIMITIVE gatewayId="25" primitiveId="26" primitiveName="uigetcolor" />
-    <PRIMITIVE gatewayId="25" primitiveId="27" primitiveName="getcallbackobject" />
-    <PRIMITIVE gatewayId="25" primitiveId="28" primitiveName="printfigure" />
-    <PRIMITIVE gatewayId="25" primitiveId="29" primitiveName="exportUI" />
-    <PRIMITIVE gatewayId="25" primitiveId="30" primitiveName="printsetupbox" />
-    <PRIMITIVE gatewayId="25" primitiveId="31" primitiveName="toprint" />
-    <PRIMITIVE gatewayId="25" primitiveId="32" primitiveName="uigetfile" />
-    <PRIMITIVE gatewayId="25" primitiveId="33" primitiveName="usecanvas" />
-    <PRIMITIVE gatewayId="25" primitiveId="34" primitiveName="uiDisplayTree" />
-    <PRIMITIVE gatewayId="25" primitiveId="35" primitiveName="uiputfile" />
-    <PRIMITIVE gatewayId="25" primitiveId="36" primitiveName="about" />
-    <PRIMITIVE gatewayId="25" primitiveId="37" primitiveName="useeditor" />
-    <PRIMITIVE gatewayId="25" primitiveId="38" primitiveName="fire_closing_finished" />
-    <PRIMITIVE gatewayId="25" primitiveId="39" primitiveName="openged" />
-    <PRIMITIVE gatewayId="25" primitiveId="40" primitiveName="datatipCreate" />
-    <PRIMITIVE gatewayId="25" primitiveId="41" primitiveName="datatipRemove" />
-    <PRIMITIVE gatewayId="25" primitiveId="42" primitiveName="plotbrowser" />
-    <PRIMITIVE gatewayId="25" primitiveId="43" primitiveName="datatipManagerMode" />
-    <PRIMITIVE gatewayId="25" primitiveId="44" primitiveName="datatipToggle" />
-    <PRIMITIVE gatewayId="25" primitiveId="45" primitiveName="datatipMove" />
-    <PRIMITIVE gatewayId="25" primitiveId="46" primitiveName="datatipSetStyle" />
-    <PRIMITIVE gatewayId="25" primitiveId="47" primitiveName="datatipSetDisplay" />
-    <PRIMITIVE gatewayId="25" primitiveId="48" primitiveName="datatipSetInterp" />
-    <PRIMITIVE gatewayId="25" primitiveId="49" primitiveName="datatipSetOrientation" />
-    <PRIMITIVE gatewayId="25" primitiveId="50" primitiveName="figure"/>
-    <PRIMITIVE gatewayId="25" primitiveId="51" primitiveName="saveGui"/>
-    <PRIMITIVE gatewayId="25" primitiveId="52" primitiveName="loadGui"/>
-</GATEWAY>
+</module>
index f596c6b..483f7dd 100755 (executable)
     <ClCompile Include="..\..\sci_gateway\cpp\sci_datatip_set_style.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_datatip_toggle.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_datatip_manager_mode.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_displaytree.cpp" />
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_helpbrowser.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_loadGui.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_plotbrowser.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_useeditor.cpp" />
     <ClInclude Include="..\..\includes\exportUserInterface.hxx" />
     <ClInclude Include="..\..\includes\GetScreenProperty.h" />
     <ClInclude Include="..\..\includes\GetUicontrol.h" />
+    <ClInclude Include="..\..\includes\gui_gw.hxx" />
     <ClInclude Include="..\..\includes\SetUicontrol.h" />
     <ClInclude Include="..\..\includes\GraphicWindow.h" />
     <ClInclude Include="..\..\includes\gw_gui.h" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
index 2ba751a..1389cc3 100755 (executable)
     <ClCompile Include="..\..\sci_gateway\cpp\sci_loadGui.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_displaytree.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\sci_gateway\cpp\sci_helpbrowser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="core_import.def">
     <ClInclude Include="..\cpp\CreateUIControl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\includes\gui_gw.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
index 3b2ae54..524e4bb 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="nogui.c" />
-    <ClCompile Include="nogui_gw.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="nogui.rc" />
index eee8704..9273b3f 100644 (file)
@@ -21,9 +21,6 @@
     <ClCompile Include="nogui.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="nogui_gw.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="nogui.rc">
diff --git a/scilab/modules/gui/src/nogui/nogui_gw.cpp b/scilab/modules/gui/src/nogui/nogui_gw.cpp
deleted file mode 100644 (file)
index 64b56a7..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2010-2010 - DIGITEO - Bruno JOFRET
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- */
-
-#include "gui_gw.hxx"
-
-int GuiModule::Load()
-{
-    /* Do Nothing */
-    return true;
-}
old mode 100755 (executable)
new mode 100644 (file)
index b38fd82..ac971f6
@@ -37,7 +37,7 @@ HISTORY_BROWSER_CPP_SOURCES = src/cpp/CommandHistory_Wrap.cpp
 
 GIWS_WRAPPERS = src/jni/CommandHistory.giws.xml
 
-HISTORY_BROWSER_C_SOURCES =
+HISTORY_BROWSER_C_SOURCES = sci_gateway/c/sci_browsehistory.c
 
 if GIWS
 BUILT_SOURCES=giws
@@ -65,6 +65,7 @@ libscihistory_browser_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
     -I$(top_srcdir)/modules/commons/src/jni/ \
     -I$(top_srcdir)/modules/localization/includes/ \
     -I$(top_srcdir)/modules/output_stream/includes/ \
+    -I$(top_srcdir)/modules/api_scilab/includes/ \
     $(AM_CPPFLAGS)
 
 # Without the history_browser module
@@ -81,7 +82,7 @@ libscihistory_browser_disable_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/output_stream/includes/ \
      $(AM_CPPFLAGS)
 
-HISTORY_BROWSER_DISABLE_C_SOURCES =  src/nohistory_browser/CommandHistory_Wrap_Fake.c src/nohistory_browser/nohistory_browser.c
+HISTORY_BROWSER_DISABLE_C_SOURCES =  src/nohistory_browser/CommandHistory_Wrap_Fake.c
 libscihistory_browser_disable_la_SOURCES = $(HISTORY_BROWSER_DISABLE_C_SOURCES)
 
 pkglib_LTLIBRARIES = libscihistory_browser-disable.la
index cb2e4d1..0bcf9e7 100644 (file)
@@ -185,8 +185,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libscihistory_browser_disable_la_LIBADD =
 am__dirstamp = $(am__leading_dot)dirstamp
-am__objects_1 = src/nohistory_browser/libscihistory_browser_disable_la-CommandHistory_Wrap_Fake.lo \
-       src/nohistory_browser/libscihistory_browser_disable_la-nohistory_browser.lo
+am__objects_1 = src/nohistory_browser/libscihistory_browser_disable_la-CommandHistory_Wrap_Fake.lo
 am_libscihistory_browser_disable_la_OBJECTS = $(am__objects_1)
 libscihistory_browser_disable_la_OBJECTS =  \
        $(am_libscihistory_browser_disable_la_OBJECTS)
@@ -199,8 +198,10 @@ libscihistory_browser_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
 am__libscihistory_browser_la_SOURCES_DIST =  \
        src/nohistory_browser/CommandHistory_Wrap_Fake.c \
-       src/jni/CommandHistory.cpp src/cpp/CommandHistory_Wrap.cpp
+       sci_gateway/c/sci_browsehistory.c src/jni/CommandHistory.cpp \
+       src/cpp/CommandHistory_Wrap.cpp
 @GUI_FALSE@am__objects_2 = src/nohistory_browser/libscihistory_browser_la-CommandHistory_Wrap_Fake.lo
+@GUI_TRUE@am__objects_2 = sci_gateway/c/libscihistory_browser_la-sci_browsehistory.lo
 @GUI_TRUE@am__objects_3 =  \
 @GUI_TRUE@     src/jni/libscihistory_browser_la-CommandHistory.lo
 @GUI_TRUE@am__objects_4 = src/cpp/libscihistory_browser_la-CommandHistory_Wrap.lo
@@ -680,7 +681,7 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 @GUI_TRUE@HISTORY_BROWSER_CPP_SOURCES = src/cpp/CommandHistory_Wrap.cpp
 @GUI_TRUE@GIWS_WRAPPERS = src/jni/CommandHistory.giws.xml
 @GUI_FALSE@HISTORY_BROWSER_C_SOURCES = src/nohistory_browser/CommandHistory_Wrap_Fake.c
-@GUI_TRUE@HISTORY_BROWSER_C_SOURCES = 
+@GUI_TRUE@HISTORY_BROWSER_C_SOURCES = sci_gateway/c/sci_browsehistory.c
 @GIWS_TRUE@@GUI_TRUE@BUILT_SOURCES = giws
 @SWIG_TRUE@BUILT_SOURCES = swig
 libscihistory_browser_la_CFLAGS = 
@@ -699,6 +700,7 @@ libscihistory_browser_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
     -I$(top_srcdir)/modules/commons/src/jni/ \
     -I$(top_srcdir)/modules/localization/includes/ \
     -I$(top_srcdir)/modules/output_stream/includes/ \
+    -I$(top_srcdir)/modules/api_scilab/includes/ \
     $(AM_CPPFLAGS)
 
 
@@ -716,7 +718,7 @@ libscihistory_browser_disable_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/output_stream/includes/ \
      $(AM_CPPFLAGS)
 
-HISTORY_BROWSER_DISABLE_C_SOURCES = src/nohistory_browser/CommandHistory_Wrap_Fake.c src/nohistory_browser/nohistory_browser.c
+HISTORY_BROWSER_DISABLE_C_SOURCES = src/nohistory_browser/CommandHistory_Wrap_Fake.c
 libscihistory_browser_disable_la_SOURCES = $(HISTORY_BROWSER_DISABLE_C_SOURCES)
 pkglib_LTLIBRARIES = libscihistory_browser-disable.la $(am__append_2)
 libscihistory_browser_la_LDFLAGS = $(AM_LDFLAGS)
@@ -813,15 +815,21 @@ src/nohistory_browser/$(DEPDIR)/$(am__dirstamp):
 src/nohistory_browser/libscihistory_browser_disable_la-CommandHistory_Wrap_Fake.lo:  \
        src/nohistory_browser/$(am__dirstamp) \
        src/nohistory_browser/$(DEPDIR)/$(am__dirstamp)
-src/nohistory_browser/libscihistory_browser_disable_la-nohistory_browser.lo:  \
-       src/nohistory_browser/$(am__dirstamp) \
-       src/nohistory_browser/$(DEPDIR)/$(am__dirstamp)
 
 libscihistory_browser-disable.la: $(libscihistory_browser_disable_la_OBJECTS) $(libscihistory_browser_disable_la_DEPENDENCIES) $(EXTRA_libscihistory_browser_disable_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(LINK) -rpath $(pkglibdir) $(libscihistory_browser_disable_la_OBJECTS) $(libscihistory_browser_disable_la_LIBADD) $(LIBS)
 src/nohistory_browser/libscihistory_browser_la-CommandHistory_Wrap_Fake.lo:  \
        src/nohistory_browser/$(am__dirstamp) \
        src/nohistory_browser/$(DEPDIR)/$(am__dirstamp)
+sci_gateway/c/$(am__dirstamp):
+       @$(MKDIR_P) sci_gateway/c
+       @: > sci_gateway/c/$(am__dirstamp)
+sci_gateway/c/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) sci_gateway/c/$(DEPDIR)
+       @: > sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
+sci_gateway/c/libscihistory_browser_la-sci_browsehistory.lo:  \
+       sci_gateway/c/$(am__dirstamp) \
+       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 src/jni/$(am__dirstamp):
        @$(MKDIR_P) src/jni
        @: > src/jni/$(am__dirstamp)
@@ -844,6 +852,8 @@ libscihistory_browser.la: $(libscihistory_browser_la_OBJECTS) $(libscihistory_br
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
+       -rm -f sci_gateway/c/*.$(OBJEXT)
+       -rm -f sci_gateway/c/*.lo
        -rm -f src/cpp/*.$(OBJEXT)
        -rm -f src/cpp/*.lo
        -rm -f src/jni/*.$(OBJEXT)
@@ -854,10 +864,10 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscihistory_browser_la-sci_browsehistory.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libscihistory_browser_la-CommandHistory_Wrap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/jni/$(DEPDIR)/libscihistory_browser_la-CommandHistory.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/nohistory_browser/$(DEPDIR)/libscihistory_browser_disable_la-CommandHistory_Wrap_Fake.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/nohistory_browser/$(DEPDIR)/libscihistory_browser_disable_la-nohistory_browser.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/nohistory_browser/$(DEPDIR)/libscihistory_browser_la-CommandHistory_Wrap_Fake.Plo@am__quote@
 
 .c.o:
@@ -891,13 +901,6 @@ src/nohistory_browser/libscihistory_browser_disable_la-CommandHistory_Wrap_Fake.
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihistory_browser_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/nohistory_browser/libscihistory_browser_disable_la-CommandHistory_Wrap_Fake.lo `test -f 'src/nohistory_browser/CommandHistory_Wrap_Fake.c' || echo '$(srcdir)/'`src/nohistory_browser/CommandHistory_Wrap_Fake.c
 
-src/nohistory_browser/libscihistory_browser_disable_la-nohistory_browser.lo: src/nohistory_browser/nohistory_browser.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihistory_browser_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/nohistory_browser/libscihistory_browser_disable_la-nohistory_browser.lo -MD -MP -MF src/nohistory_browser/$(DEPDIR)/libscihistory_browser_disable_la-nohistory_browser.Tpo -c -o src/nohistory_browser/libscihistory_browser_disable_la-nohistory_browser.lo `test -f 'src/nohistory_browser/nohistory_browser.c' || echo '$(srcdir)/'`src/nohistory_browser/nohistory_browser.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/nohistory_browser/$(DEPDIR)/libscihistory_browser_disable_la-nohistory_browser.Tpo src/nohistory_browser/$(DEPDIR)/libscihistory_browser_disable_la-nohistory_browser.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/nohistory_browser/nohistory_browser.c' object='src/nohistory_browser/libscihistory_browser_disable_la-nohistory_browser.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihistory_browser_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/nohistory_browser/libscihistory_browser_disable_la-nohistory_browser.lo `test -f 'src/nohistory_browser/nohistory_browser.c' || echo '$(srcdir)/'`src/nohistory_browser/nohistory_browser.c
-
 src/nohistory_browser/libscihistory_browser_la-CommandHistory_Wrap_Fake.lo: src/nohistory_browser/CommandHistory_Wrap_Fake.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihistory_browser_la_CPPFLAGS) $(CPPFLAGS) $(libscihistory_browser_la_CFLAGS) $(CFLAGS) -MT src/nohistory_browser/libscihistory_browser_la-CommandHistory_Wrap_Fake.lo -MD -MP -MF src/nohistory_browser/$(DEPDIR)/libscihistory_browser_la-CommandHistory_Wrap_Fake.Tpo -c -o src/nohistory_browser/libscihistory_browser_la-CommandHistory_Wrap_Fake.lo `test -f 'src/nohistory_browser/CommandHistory_Wrap_Fake.c' || echo '$(srcdir)/'`src/nohistory_browser/CommandHistory_Wrap_Fake.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/nohistory_browser/$(DEPDIR)/libscihistory_browser_la-CommandHistory_Wrap_Fake.Tpo src/nohistory_browser/$(DEPDIR)/libscihistory_browser_la-CommandHistory_Wrap_Fake.Plo
@@ -905,6 +908,13 @@ src/nohistory_browser/libscihistory_browser_la-CommandHistory_Wrap_Fake.lo: src/
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihistory_browser_la_CPPFLAGS) $(CPPFLAGS) $(libscihistory_browser_la_CFLAGS) $(CFLAGS) -c -o src/nohistory_browser/libscihistory_browser_la-CommandHistory_Wrap_Fake.lo `test -f 'src/nohistory_browser/CommandHistory_Wrap_Fake.c' || echo '$(srcdir)/'`src/nohistory_browser/CommandHistory_Wrap_Fake.c
 
+sci_gateway/c/libscihistory_browser_la-sci_browsehistory.lo: sci_gateway/c/sci_browsehistory.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihistory_browser_la_CPPFLAGS) $(CPPFLAGS) $(libscihistory_browser_la_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscihistory_browser_la-sci_browsehistory.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscihistory_browser_la-sci_browsehistory.Tpo -c -o sci_gateway/c/libscihistory_browser_la-sci_browsehistory.lo `test -f 'sci_gateway/c/sci_browsehistory.c' || echo '$(srcdir)/'`sci_gateway/c/sci_browsehistory.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscihistory_browser_la-sci_browsehistory.Tpo sci_gateway/c/$(DEPDIR)/libscihistory_browser_la-sci_browsehistory.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_browsehistory.c' object='sci_gateway/c/libscihistory_browser_la-sci_browsehistory.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscihistory_browser_la_CPPFLAGS) $(CPPFLAGS) $(libscihistory_browser_la_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscihistory_browser_la-sci_browsehistory.lo `test -f 'sci_gateway/c/sci_browsehistory.c' || echo '$(srcdir)/'`sci_gateway/c/sci_browsehistory.c
+
 .cpp.o:
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -948,6 +958,7 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
+       -rm -rf sci_gateway/c/.libs sci_gateway/c/_libs
        -rm -rf src/cpp/.libs src/cpp/_libs
        -rm -rf src/jni/.libs src/jni/_libs
        -rm -rf src/nohistory_browser/.libs src/nohistory_browser/_libs
@@ -1133,6 +1144,8 @@ clean-generic:
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+       -rm -f sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
+       -rm -f sci_gateway/c/$(am__dirstamp)
        -rm -f src/cpp/$(DEPDIR)/$(am__dirstamp)
        -rm -f src/cpp/$(am__dirstamp)
        -rm -f src/jni/$(DEPDIR)/$(am__dirstamp)
@@ -1150,7 +1163,7 @@ clean-am: clean-generic clean-libtool clean-local \
        clean-pkglibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-       -rm -rf src/cpp/$(DEPDIR) src/jni/$(DEPDIR) src/nohistory_browser/$(DEPDIR)
+       -rm -rf sci_gateway/c/$(DEPDIR) src/cpp/$(DEPDIR) src/jni/$(DEPDIR) src/nohistory_browser/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-local distclean-tags
@@ -1199,7 +1212,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-       -rm -rf src/cpp/$(DEPDIR) src/jni/$(DEPDIR) src/nohistory_browser/$(DEPDIR)
+       -rm -rf sci_gateway/c/$(DEPDIR) src/cpp/$(DEPDIR) src/jni/$(DEPDIR) src/nohistory_browser/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
index e680bb7..e58b540 100644 (file)
 /*--------------------------------------------------------------------------*/
 #include "dynlib_history_browser.h"
 /*--------------------------------------------------------------------------*/
-HISTORY_BROWSER_IMPEXP int gw_history_browser(void);
-/*--------------------------------------------------------------------------*/
 /* Declaration of all the profile function declared and */
 /* used in sci_gateway */
-HISTORY_BROWSER_IMPEXP int sci_browsehistory(char *fname, unsigned long fname_len);
+HISTORY_BROWSER_IMPEXP int sci_browsehistory(char *fname, void* pvApiCtx);
 /*--------------------------------------------------------------------------*/
 #endif /*  __GW_HISTORY_BROWSER_H__ */
index 9b01064..6206ddb 100644 (file)
@@ -18,7 +18,7 @@
 #include "api_scilab.h"
 #include "CommandHistory_Wrap.h"
 /*--------------------------------------------------------------------------*/
-int sci_browsehistory(char *fname, unsigned long fname_len)
+int sci_browsehistory(char *fname, void* pvApiCtx)
 {
     CheckRhs(0, 0);
     CheckLhs(0, 1);
index 5a9cfb1..30519bb 100644 (file)
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE module SYSTEM "../../functions/xml/gateway.dtd">
 <!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2012 - DIGITEO - Allan CORNET
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2011 - DIGITEO - Antoine ELIAS
  *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * For more information, see the COPYING file which you should have received
  * along with this program.
  *
- -->
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
-<GATEWAY name="history_browser">
-    <!-- =================== -->
-    <!--
+ */
  Scilab
  Interface description. In this file, we define the list of the function which
  will be available into Scilab and the link to the "native" function.
 
- gatewayId is the position in the hashtable 'Interfaces' defined in the
- file SCI/modules/core/src/c/callinterf.h
-
- primitiveId is the position in the hashtable '<module>Table Tab[]' defined
- in the file modules/<module>/sci_gateway/c/gw_<module>.c
-
- primitiveName is the name of the Scilab function
-
  Don't touch if you do not know what you are doing
 -->
-    <!-- =================== -->
-    <PRIMITIVE gatewayId="42" primitiveId="1" primitiveName="browsehistory" />
-</GATEWAY>
+<module name="history_browser">
+    <gateway name="sci_browsehistory"   function="browsehistory"    type="0" />
+</module>
diff --git a/scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.c b/scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.c
deleted file mode 100644 (file)
index 6d5f288..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2014 - Scilab Enterprises - Calixte DENIZET
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- */
-/*--------------------------------------------------------------------------*/
-#include "nohistory_browser.h"
-#include "Scierror.h"
-#include "localization.h"
-#ifndef _MSC_VER
-#include "configvariable_interface.h"
-#endif
-/*--------------------------------------------------------------------------*/
-int gw_history_browser(void)
-{
-    //#ifndef _MSC_VER
-    //    if (getScilabMode() == SCILAB_NWNI)
-    //    {
-    //        Scierror(999, _("Scilab '%s' module disabled in -nogui or -nwni mode.\n"), "history_browser");
-    //    }
-    //    else
-    //#endif
-    //    {
-    //        Scierror(999, _("Scilab '%s' module not installed.\n"), "history_browser");
-    //    }
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.h b/scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.h
deleted file mode 100644 (file)
index ac32bde..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2014 - Scilab Enterprises - Calixte DENIZET
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- */
-/*--------------------------------------------------------------------------*/
-/**
- * This function is a wrapper / fake when Scilab is compiled without history_browser
- *
- * @return 0
- */
-int gw_history_browser(void);
-/*--------------------------------------------------------------------------*/
index 52c9f49..9fd3fda 100644 (file)
@@ -96,8 +96,7 @@ GATEWAY_C_SOURCES = \
 
 GATEWAY_CPP_SOURCES = \
     sci_gateway/cpp/sci_system_getproperty.cpp \
-    sci_gateway/cpp/sci_system_setproperty.cpp \
-    sci_gateway/cpp/jvm_gw.cpp
+    sci_gateway/cpp/sci_system_setproperty.cpp
 
 JVM_C_SOURCES = \
     src/c/InitializeJVM.c \
@@ -120,8 +119,7 @@ JVM_C_SOURCES = \
     src/c/getJvmOptions.c
 
 JVM_DISABLE_C_SOURCES = src/nojvm/nojvm.c
-JVM_DISABLE_CPP_SOURCES = src/nojvm/nojvm_gw.cpp
-libscijvm_disable_la_SOURCES = $(JVM_DISABLE_C_SOURCES) $(JVM_DISABLE_CPP_SOURCES)
+libscijvm_disable_la_SOURCES = $(JVM_DISABLE_C_SOURCES)
 
 libscijvm_disable_la_CPPFLAGS = \
     -I$(srcdir)/includes/ \
index 6562c2b..07ac271 100644 (file)
@@ -220,19 +220,17 @@ am__v_lt_1 =
 @GUI_TRUE@am_libscijvm_algo_la_rpath =
 libscijvm_disable_la_LIBADD =
 am__objects_2 = src/nojvm/libscijvm_disable_la-nojvm.lo
-am__objects_3 = src/nojvm/libscijvm_disable_la-nojvm_gw.lo
-am_libscijvm_disable_la_OBJECTS = $(am__objects_2) $(am__objects_3)
+am_libscijvm_disable_la_OBJECTS = $(am__objects_2)
 libscijvm_disable_la_OBJECTS = $(am_libscijvm_disable_la_OBJECTS)
 am__DEPENDENCIES_1 =
 libscijvm_la_DEPENDENCIES = libscijvm-algo.la $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
-am__objects_4 = sci_gateway/c/libscijvm_la-sci_javaclasspath.lo \
+am__objects_3 = sci_gateway/c/libscijvm_la-sci_javaclasspath.lo \
        sci_gateway/c/libscijvm_la-sci_javalibrarypath.lo
-am__objects_5 =  \
+am__objects_4 =  \
        sci_gateway/cpp/libscijvm_la-sci_system_getproperty.lo \
-       sci_gateway/cpp/libscijvm_la-sci_system_setproperty.lo \
-       sci_gateway/cpp/libscijvm_la-jvm_gw.lo
-am_libscijvm_la_OBJECTS = $(am__objects_4) $(am__objects_5)
+       sci_gateway/cpp/libscijvm_la-sci_system_setproperty.lo
+am_libscijvm_la_OBJECTS = $(am__objects_3) $(am__objects_4)
 libscijvm_la_OBJECTS = $(am_libscijvm_la_OBJECTS)
 libscijvm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -683,8 +681,7 @@ GATEWAY_C_SOURCES = \
 
 GATEWAY_CPP_SOURCES = \
     sci_gateway/cpp/sci_system_getproperty.cpp \
-    sci_gateway/cpp/sci_system_setproperty.cpp \
-    sci_gateway/cpp/jvm_gw.cpp
+    sci_gateway/cpp/sci_system_setproperty.cpp
 
 JVM_C_SOURCES = \
     src/c/InitializeJVM.c \
@@ -707,8 +704,7 @@ JVM_C_SOURCES = \
     src/c/getJvmOptions.c
 
 JVM_DISABLE_C_SOURCES = src/nojvm/nojvm.c
-JVM_DISABLE_CPP_SOURCES = src/nojvm/nojvm_gw.cpp
-libscijvm_disable_la_SOURCES = $(JVM_DISABLE_C_SOURCES) $(JVM_DISABLE_CPP_SOURCES)
+libscijvm_disable_la_SOURCES = $(JVM_DISABLE_C_SOURCES)
 libscijvm_disable_la_CPPFLAGS = \
     -I$(srcdir)/includes/ \
     -I$(top_srcdir)/modules/ast/includes/ast/ \
@@ -937,11 +933,9 @@ src/nojvm/$(DEPDIR)/$(am__dirstamp):
        @: > src/nojvm/$(DEPDIR)/$(am__dirstamp)
 src/nojvm/libscijvm_disable_la-nojvm.lo: src/nojvm/$(am__dirstamp) \
        src/nojvm/$(DEPDIR)/$(am__dirstamp)
-src/nojvm/libscijvm_disable_la-nojvm_gw.lo: src/nojvm/$(am__dirstamp) \
-       src/nojvm/$(DEPDIR)/$(am__dirstamp)
 
 libscijvm-disable.la: $(libscijvm_disable_la_OBJECTS) $(libscijvm_disable_la_DEPENDENCIES) $(EXTRA_libscijvm_disable_la_DEPENDENCIES) 
-       $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libscijvm_disable_la_OBJECTS) $(libscijvm_disable_la_LIBADD) $(LIBS)
+       $(AM_V_CCLD)$(LINK) -rpath $(pkglibdir) $(libscijvm_disable_la_OBJECTS) $(libscijvm_disable_la_LIBADD) $(LIBS)
 sci_gateway/c/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/c
        @: > sci_gateway/c/$(am__dirstamp)
@@ -966,9 +960,6 @@ sci_gateway/cpp/libscijvm_la-sci_system_getproperty.lo:  \
 sci_gateway/cpp/libscijvm_la-sci_system_setproperty.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/cpp/libscijvm_la-jvm_gw.lo:  \
-       sci_gateway/cpp/$(am__dirstamp) \
-       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 
 libscijvm.la: $(libscijvm_la_OBJECTS) $(libscijvm_la_DEPENDENCIES) $(EXTRA_libscijvm_la_DEPENDENCIES) 
        $(AM_V_CXXLD)$(libscijvm_la_LINK) $(am_libscijvm_la_rpath) $(libscijvm_la_OBJECTS) $(libscijvm_la_LIBADD) $(LIBS)
@@ -989,7 +980,6 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscijvm_la-sci_javaclasspath.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscijvm_la-sci_javalibrarypath.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscijvm_la-jvm_gw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscijvm_la-sci_system_getproperty.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscijvm_la-sci_system_setproperty.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscijvm_algo_la-InitializeJVM.Plo@am__quote@
@@ -1011,7 +1001,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscijvm_algo_la-system_getproperty.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscijvm_algo_la-system_setproperty.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/nojvm/$(DEPDIR)/libscijvm_disable_la-nojvm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/nojvm/$(DEPDIR)/libscijvm_disable_la-nojvm_gw.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -1208,13 +1197,6 @@ sci_gateway/c/libscijvm_la-sci_javalibrarypath.lo: sci_gateway/c/sci_javalibrary
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
-src/nojvm/libscijvm_disable_la-nojvm_gw.lo: src/nojvm/nojvm_gw.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/nojvm/libscijvm_disable_la-nojvm_gw.lo -MD -MP -MF src/nojvm/$(DEPDIR)/libscijvm_disable_la-nojvm_gw.Tpo -c -o src/nojvm/libscijvm_disable_la-nojvm_gw.lo `test -f 'src/nojvm/nojvm_gw.cpp' || echo '$(srcdir)/'`src/nojvm/nojvm_gw.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/nojvm/$(DEPDIR)/libscijvm_disable_la-nojvm_gw.Tpo src/nojvm/$(DEPDIR)/libscijvm_disable_la-nojvm_gw.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/nojvm/nojvm_gw.cpp' object='src/nojvm/libscijvm_disable_la-nojvm_gw.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/nojvm/libscijvm_disable_la-nojvm_gw.lo `test -f 'src/nojvm/nojvm_gw.cpp' || echo '$(srcdir)/'`src/nojvm/nojvm_gw.cpp
-
 sci_gateway/cpp/libscijvm_la-sci_system_getproperty.lo: sci_gateway/cpp/sci_system_getproperty.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscijvm_la-sci_system_getproperty.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscijvm_la-sci_system_getproperty.Tpo -c -o sci_gateway/cpp/libscijvm_la-sci_system_getproperty.lo `test -f 'sci_gateway/cpp/sci_system_getproperty.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_system_getproperty.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscijvm_la-sci_system_getproperty.Tpo sci_gateway/cpp/$(DEPDIR)/libscijvm_la-sci_system_getproperty.Plo
@@ -1229,13 +1211,6 @@ sci_gateway/cpp/libscijvm_la-sci_system_setproperty.lo: sci_gateway/cpp/sci_syst
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscijvm_la-sci_system_setproperty.lo `test -f 'sci_gateway/cpp/sci_system_setproperty.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_system_setproperty.cpp
 
-sci_gateway/cpp/libscijvm_la-jvm_gw.lo: sci_gateway/cpp/jvm_gw.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscijvm_la-jvm_gw.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscijvm_la-jvm_gw.Tpo -c -o sci_gateway/cpp/libscijvm_la-jvm_gw.lo `test -f 'sci_gateway/cpp/jvm_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/jvm_gw.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscijvm_la-jvm_gw.Tpo sci_gateway/cpp/$(DEPDIR)/libscijvm_la-jvm_gw.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/jvm_gw.cpp' object='sci_gateway/cpp/libscijvm_la-jvm_gw.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscijvm_la-jvm_gw.lo `test -f 'sci_gateway/cpp/jvm_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/jvm_gw.cpp
-
 mostlyclean-libtool:
        -rm -f *.lo
 
index 44b3c10..2e5616a 100644 (file)
@@ -6,4 +6,5 @@ GetXmlFileEncoding
 MyHeapAlloc
 MyHeapFree
 MyHeapRealloc
+freeArrayOfString
 
diff --git a/scilab/modules/jvm/includes/dynlib_jvm_gw.h b/scilab/modules/jvm/includes/dynlib_jvm_gw.h
deleted file mode 100644 (file)
index 9202893..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) DIGITEO - 2010 - Antoine ELIAS
-*
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
-*
-*/
-
-/*--------------------------------------------------------------------------*/
-#ifndef __DYNLIB_JVM_GW_H__
-#define __DYNLIB_JVM_GW_H__
-
-#ifdef _MSC_VER
-#ifdef LIBJVM_GW_EXPORTS
-#define JVM_GW_IMPEXP __declspec(dllexport)
-#else
-#define JVM_GW_IMPEXP __declspec(dllimport)
-#endif
-#else
-#define JVM_GW_IMPEXP
-#endif
-
-#endif /* __DYNLIB_JVM_GW_H__ */
-/*--------------------------------------------------------------------------*/
index b422819..8778b35 100644 (file)
 #ifndef __GW_JVM_H__
 #define __GW_JVM_H__
 /*--------------------------------------------------------------------------*/
-#include "dynlib_jvm_gw.h"
+#include "dynlib_jvm.h"
 /*--------------------------------------------------------------------------*/
 int gw_jvm(void);
 /*--------------------------------------------------------------------------*/
 /* Declaration of all the profile function declared and used in sci_gateway */
-JVM_GW_IMPEXP int sci_javaclasspath(char *fname, void* pvApiCtx);
-JVM_GW_IMPEXP int sci_javalibrarypath(char *fname, void* pvApiCtx);
+JVM_IMPEXP int sci_javaclasspath(char *fname, void* pvApiCtx);
+JVM_IMPEXP int sci_javalibrarypath(char *fname, void* pvApiCtx);
 /*--------------------------------------------------------------------------*/
 #endif /*  __GW_JVM_H__ */
 
index 501a630..302a5da 100644 (file)
 
 extern "C"
 {
-#include "dynlib_jvm_gw.h"
+#include "dynlib_jvm.h"
 }
 
-class JvmModule
-{
-private :
-    JvmModule() {};
-    ~JvmModule() {};
-
-public :
-    JVM_GW_IMPEXP static int Load();
-    JVM_GW_IMPEXP static int Unload()
-    {
-        return 1;
-    }
-};
-CPP_GATEWAY_PROTOTYPE(sci_system_getproperty);
-CPP_GATEWAY_PROTOTYPE(sci_system_setproperty);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_system_getproperty, JVM_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_system_setproperty, JVM_IMPEXP);
 
 #endif /* !__JVM_GW_HXX__ */
index 72a1fdf..ba7a9f4 100644 (file)
@@ -216,6 +216,10 @@ lib /DEF:"$(ProjectDir)preferences_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pla
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="sci_gateway\cpp\sci_system_getproperty.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_system_setproperty.cpp" />
+    <ClCompile Include="sci_gateway\c\sci_javaclasspath.c" />
+    <ClCompile Include="sci_gateway\c\sci_javalibrarypath.c" />
     <ClCompile Include="src\c\addToClasspath.c" />
     <ClCompile Include="src\c\addToLibrarypath.c" />
     <ClCompile Include="src\c\catchIfJavaException.c" />
@@ -240,6 +244,7 @@ lib /DEF:"$(ProjectDir)preferences_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pla
     <ClInclude Include="includes\addToClasspath.h" />
     <ClInclude Include="includes\addToLibrarypath.h" />
     <ClInclude Include="includes\catchIfJavaException.h" />
+    <ClInclude Include="includes\jvm_gw.hxx" />
     <ClInclude Include="includes\loadOnUseClassPath.h" />
     <ClInclude Include="src\c\createMainScilabObject.h" />
     <ClInclude Include="includes\dynlib_jvm.h" />
@@ -284,6 +289,9 @@ lib /DEF:"$(ProjectDir)preferences_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pla
       <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="..\ast\ast.vcxproj">
       <Project>{0d3fa25b-8116-44ec-a45e-260789daa3d9}</Project>
     </ProjectReference>
index 10c4e2a..ea6b50a 100644 (file)
     <ClCompile Include="src\c\TerminateJVM.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_system_getproperty.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\cpp\sci_system_setproperty.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\c\sci_javaclasspath.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_gateway\c\sci_javalibrarypath.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="includes\addToClasspath.h">
     <ClInclude Include="includes\loadOnUseClassPath.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="includes\jvm_gw.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\c\libjvm.rc">
diff --git a/scilab/modules/jvm/sci_gateway/cpp/jvm_gw.cpp b/scilab/modules/jvm/sci_gateway/cpp/jvm_gw.cpp
deleted file mode 100644 (file)
index 0beee4c..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2010 - DIGITEO - Antoine ELIAS
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- */
-
-#include "jvm_gw.hxx"
-#include "context.hxx"
-
-#pragma comment(lib,"../../../../bin/libintl.lib")
-
-extern "C"
-{
-#include "gw_jvm.h"
-}
-
-#define MODULE_NAME L"jvm"
-
-int JvmModule::Load()
-{
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"system_getproperty", &sci_system_getproperty, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"system_setproperty", &sci_system_setproperty, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"javaclasspath", &sci_javaclasspath, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"javalibrarypath", &sci_javalibrarypath, MODULE_NAME));
-    return 1;
-}
diff --git a/scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcxproj b/scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcxproj
deleted file mode 100644 (file)
index 291525e..0000000
+++ /dev/null
@@ -1,220 +0,0 @@
-<?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>{2D02DD0E-CBF5-493E-AA06-1E289ED24666}</ProjectGuid>
-    <RootNamespace>libjvm_gw</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </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'">true</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)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</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>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;$(SCILAB_JDK32)/include/win32;$(SCILAB_JDK32)/include;../../../../libs/intl;../../../functions_manager/includes;../../../core/includes;../../../localization/includes;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBJVM_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;$(SCILAB_JDK32)/include/win32;$(SCILAB_JDK32)/include;../../../../libs/intl;../../../functions_manager/includes;../../../core/includes;../../../localization/includes;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBJVM_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;$(SCILAB_JDK64)/include/win32;$(SCILAB_JDK64)/include;../../../../libs/intl;../../../functions_manager/includes;../../../core/includes;../../../localization/includes;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBJVM_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;$(SCILAB_JDK64)/include/win32;$(SCILAB_JDK64)/include;../../../../libs/intl;../../../functions_manager/includes;../../../core/includes;../../../localization/includes;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/types;../../../ast/includes/ast;../../../ast/includes/analysis;../../../ast/includes/exps;../../../ast/includes/operations;../../../ast/includes/symbol;../../../ast/includes/system_env;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBJVM_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\c\sci_javaclasspath.c" />
-    <ClCompile Include="..\c\sci_javalibrarypath.c" />
-    <ClCompile Include="jvm_gw.cpp" />
-    <ClCompile Include="sci_system_getproperty.cpp" />
-    <ClCompile Include="sci_system_setproperty.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\includes\dynlib_jvm_gw.h" />
-    <ClInclude Include="..\..\includes\jvm_gw.hxx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\..\..\..\bin\blasplus.lib" />
-    <Library Include="..\..\..\..\bin\lapack.lib" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\api_scilab\api_scilab.vcxproj">
-      <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\ast\ast.vcxproj">
-      <Project>{0d3fa25b-8116-44ec-a45e-260789daa3d9}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\core\src\c\core.vcxproj">
-      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</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>
-    <ProjectReference Include="..\..\..\string\src\c\string.vcxproj">
-      <Project>{8d45767a-9b03-4905-97f6-d2f3f79141ea}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\libjvm.vcxproj">
-      <Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcxproj.filters b/scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcxproj.filters
deleted file mode 100644 (file)
index ef5459c..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="jvm_gw.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_system_getproperty.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\c\sci_javaclasspath.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\c\sci_javalibrarypath.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_system_setproperty.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\includes\dynlib_jvm_gw.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\includes\jvm_gw.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\..\..\..\bin\blasplus.lib" />
-    <Library Include="..\..\..\..\bin\lapack.lib" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
index 668f824..bfd7f5e 100644 (file)
@@ -14,7 +14,6 @@
  *
  */
 /*--------------------------------------------------------------------------*/
-#include "funcmanager.hxx"
 #include "jvm_gw.hxx"
 #include "function.hxx"
 #include "string.hxx"
index 458df93..8ef9c06 100644 (file)
@@ -15,7 +15,6 @@
  */
 
 /*--------------------------------------------------------------------------*/
-#include "funcmanager.hxx"
 #include "jvm_gw.hxx"
 #include "function.hxx"
 #include "string.hxx"
index 98eef5d..efc063d 100644 (file)
@@ -1,29 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
-<GATEWAY name="jvm">
-    <!-- =================== -->
-    <!--
- Scilab
- Interface description. In this file, we define the list of the function which
- will be available into Scilab and the link to the "native" function.
-
- gatewayId is the position in the hashtable 'Interfaces' defined in the
- file SCI/modules/core/src/c/callinterf.h
-
- primitiveId is the position in the hashtable '<module>Table Tab[]' defined
- in the file modules/<module>/sci_gateway/c/gw_<module>.c
-
- primitiveName is the name of the Scilab function
-
-
- ===================
- Don't touch if you do not know what you are doing
--->
-
-    <!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - Allan CORNET
+<!DOCTYPE module SYSTEM "../../functions/xml/gateway.dtd">
+<!--
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2011 - DIGITEO - Antoine ELIAS
  *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * For more information, see the COPYING file which you should have received
  * along with this program.
  *
- -->
-
-    <!-- =================== -->
-
-    <PRIMITIVE gatewayId="52" primitiveId="1" primitiveName="system_setproperty" />
+ */
+ Scilab
+ Interface description. In this file, we define the list of the function which
+ will be available into Scilab and the link to the "native" function.
 
-    <PRIMITIVE gatewayId="52" primitiveId="2" primitiveName="system_getproperty" />
-    <PRIMITIVE gatewayId="52" primitiveId="3" primitiveName="javaclasspath" />
-    <PRIMITIVE gatewayId="52" primitiveId="4" primitiveName="javalibrarypath" />
-</GATEWAY>
+ Don't touch if you do not know what you are doing
+-->
+<module name="jvm">
+    <gateway name="sci_system_getproperty"  function="system_getproperty"   type="1" />
+    <gateway name="sci_system_setproperty"  function="system_setproperty"   type="1" />
+    <gateway name="sci_javaclasspath"       function="javaclasspath"        type="0" />
+    <gateway name="sci_javalibrarypath"     function="javalibrarypath"      type="0" />
+</module>
index 322c895..6f9f897 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="nojvm.c" />
-    <ClCompile Include="nojvm_gw.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="nojvm.rc" />
index efccf60..2f22a56 100644 (file)
@@ -24,9 +24,6 @@
     <ClCompile Include="nojvm.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="nojvm_gw.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="nojvm.rc">
diff --git a/scilab/modules/jvm/src/nojvm/nojvm_gw.cpp b/scilab/modules/jvm/src/nojvm/nojvm_gw.cpp
deleted file mode 100644 (file)
index 0b29a9e..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2010-2010 - DIGITEO - Vincent COUVERT
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- */
-
-#include "jvm_gw.hxx"
-
-
-int JvmModule::Load()
-{
-    /* Do Nothing */
-    return true;
-}
index c6afb69..686eb74 100644 (file)
     <None Include="renderer.iss" />
   </ItemGroup>
   <ItemGroup>
-    <Library Include="..\..\bin\libjvm.lib" />
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\..\tools\Dumpexts\Dumpexts.vcxproj">
       <Project>{3170e4c2-1173-4264-a222-7ee8ccb3ddf7}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
     <ProjectReference Include="..\jvm\libjvm.vcxproj">
       <Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
     <ProjectReference Include="..\localization\src\localization.vcxproj">
       <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
index 8d39e20..e9b8716 100644 (file)
@@ -90,7 +90,4 @@
       <Filter>localization</Filter>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\..\bin\libjvm.lib" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
index d73c715..38c1a3a 100644 (file)
@@ -24,9 +24,6 @@ TCLSCI_C_SOURCES = \
 TCLSCI_CPP_SOURCES = \
     src/cpp/ScilabEval.cpp
 
-GATEWAY_CPP_SOURCES = \
-       sci_gateway/cpp/tclsci_gw.cpp
-
 GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_opentk.c \
     sci_gateway/c/sci_TCL_SetVar.c \
@@ -46,7 +43,6 @@ else
 
 TCLSCI_C_SOURCES =
 TCLSCI_CPP_SOURCES = src/notclsci/notclsci.cpp
-GATEWAY_CPP_SOURCES =
 GATEWAY_C_SOURCES =
 
 endif
@@ -96,7 +92,7 @@ libscitclsci_disable_la_CPPFLAGS = \
     $(AM_CPPFLAGS)
 
 libscitclsci_algo_la_SOURCES = $(TCLSCI_CPP_SOURCES) $(TCLSCI_C_SOURCES)
-libscitclsci_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
+libscitclsci_la_SOURCES = $(GATEWAY_C_SOURCES)
 libscitclsci_algo_la_CPPFLAGS = $(libscitclsci_la_CPPFLAGS)
 
 TCLSCI_DISABLE_CPP_SOURCES = src/notclsci/notclsci.cpp
index 85735c4..1039b05 100644 (file)
@@ -230,7 +230,7 @@ am__libscitclsci_la_SOURCES_DIST = sci_gateway/c/sci_opentk.c \
        sci_gateway/c/sci_TCL_EvalFile.c \
        sci_gateway/c/sci_TCL_GetVar.c \
        sci_gateway/c/sci_TCL_ExistArray.c \
-       sci_gateway/c/sci_TCL_UpVar.c sci_gateway/cpp/tclsci_gw.cpp
+       sci_gateway/c/sci_TCL_UpVar.c
 @TCLTK_TRUE@am__objects_4 =  \
 @TCLTK_TRUE@   sci_gateway/c/libscitclsci_la-sci_opentk.lo \
 @TCLTK_TRUE@   sci_gateway/c/libscitclsci_la-sci_TCL_SetVar.lo \
@@ -245,14 +245,12 @@ am__libscitclsci_la_SOURCES_DIST = sci_gateway/c/sci_opentk.c \
 @TCLTK_TRUE@   sci_gateway/c/libscitclsci_la-sci_TCL_GetVar.lo \
 @TCLTK_TRUE@   sci_gateway/c/libscitclsci_la-sci_TCL_ExistArray.lo \
 @TCLTK_TRUE@   sci_gateway/c/libscitclsci_la-sci_TCL_UpVar.lo
-@TCLTK_TRUE@am__objects_5 =  \
-@TCLTK_TRUE@   sci_gateway/cpp/libscitclsci_la-tclsci_gw.lo
-am_libscitclsci_la_OBJECTS = $(am__objects_4) $(am__objects_5)
+am_libscitclsci_la_OBJECTS = $(am__objects_4)
 libscitclsci_la_OBJECTS = $(am_libscitclsci_la_OBJECTS)
-libscitclsci_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-       $(AM_CXXFLAGS) $(CXXFLAGS) $(libscitclsci_la_LDFLAGS) \
-       $(LDFLAGS) -o $@
+libscitclsci_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+       $(AM_CFLAGS) $(CFLAGS) $(libscitclsci_la_LDFLAGS) $(LDFLAGS) \
+       -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -650,10 +648,6 @@ yacc_present = @yacc_present@
 @TCLTK_TRUE@TCLSCI_CPP_SOURCES = \
 @TCLTK_TRUE@    src/cpp/ScilabEval.cpp
 
-@TCLTK_FALSE@GATEWAY_CPP_SOURCES = 
-@TCLTK_TRUE@GATEWAY_CPP_SOURCES = \
-@TCLTK_TRUE@   sci_gateway/cpp/tclsci_gw.cpp
-
 @TCLTK_FALSE@GATEWAY_C_SOURCES = 
 @TCLTK_TRUE@GATEWAY_C_SOURCES = \
 @TCLTK_TRUE@    sci_gateway/c/sci_opentk.c \
@@ -715,7 +709,7 @@ libscitclsci_disable_la_CPPFLAGS = \
     $(AM_CPPFLAGS)
 
 libscitclsci_algo_la_SOURCES = $(TCLSCI_CPP_SOURCES) $(TCLSCI_C_SOURCES)
-libscitclsci_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
+libscitclsci_la_SOURCES = $(GATEWAY_C_SOURCES)
 libscitclsci_algo_la_CPPFLAGS = $(libscitclsci_la_CPPFLAGS)
 TCLSCI_DISABLE_CPP_SOURCES = src/notclsci/notclsci.cpp
 libscitclsci_disable_la_SOURCES = $(TCLSCI_DISABLE_CPP_SOURCES)
@@ -1047,25 +1041,14 @@ sci_gateway/c/libscitclsci_la-sci_TCL_ExistArray.lo:  \
 sci_gateway/c/libscitclsci_la-sci_TCL_UpVar.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/cpp/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/cpp
-       @: > sci_gateway/cpp/$(am__dirstamp)
-sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) sci_gateway/cpp/$(DEPDIR)
-       @: > sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/cpp/libscitclsci_la-tclsci_gw.lo:  \
-       sci_gateway/cpp/$(am__dirstamp) \
-       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 
 libscitclsci.la: $(libscitclsci_la_OBJECTS) $(libscitclsci_la_DEPENDENCIES) $(EXTRA_libscitclsci_la_DEPENDENCIES) 
-       $(AM_V_CXXLD)$(libscitclsci_la_LINK) -rpath $(pkglibdir) $(libscitclsci_la_OBJECTS) $(libscitclsci_la_LIBADD) $(LIBS)
+       $(AM_V_CCLD)$(libscitclsci_la_LINK) -rpath $(pkglibdir) $(libscitclsci_la_OBJECTS) $(libscitclsci_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
        -rm -f sci_gateway/c/*.$(OBJEXT)
        -rm -f sci_gateway/c/*.lo
-       -rm -f sci_gateway/cpp/*.$(OBJEXT)
-       -rm -f sci_gateway/cpp/*.lo
        -rm -f src/c/*.$(OBJEXT)
        -rm -f src/c/*.lo
        -rm -f src/cpp/*.$(OBJEXT)
@@ -1089,7 +1072,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscitclsci_la-sci_TCL_UnsetVar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscitclsci_la-sci_TCL_UpVar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscitclsci_la-sci_opentk.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libscitclsci_la-tclsci_gw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscitclsci_algo_la-GlobalTclInterp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscitclsci_algo_la-InitTclTk.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscitclsci_algo_la-InitializeTclTk.Plo@am__quote@
@@ -1366,20 +1348,12 @@ src/notclsci/libscitclsci_disable_la-notclsci.lo: src/notclsci/notclsci.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscitclsci_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/notclsci/libscitclsci_disable_la-notclsci.lo `test -f 'src/notclsci/notclsci.cpp' || echo '$(srcdir)/'`src/notclsci/notclsci.cpp
 
-sci_gateway/cpp/libscitclsci_la-tclsci_gw.lo: sci_gateway/cpp/tclsci_gw.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscitclsci_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libscitclsci_la-tclsci_gw.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libscitclsci_la-tclsci_gw.Tpo -c -o sci_gateway/cpp/libscitclsci_la-tclsci_gw.lo `test -f 'sci_gateway/cpp/tclsci_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/tclsci_gw.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libscitclsci_la-tclsci_gw.Tpo sci_gateway/cpp/$(DEPDIR)/libscitclsci_la-tclsci_gw.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/tclsci_gw.cpp' object='sci_gateway/cpp/libscitclsci_la-tclsci_gw.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscitclsci_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libscitclsci_la-tclsci_gw.lo `test -f 'sci_gateway/cpp/tclsci_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/tclsci_gw.cpp
-
 mostlyclean-libtool:
        -rm -f *.lo
 
 clean-libtool:
        -rm -rf .libs _libs
        -rm -rf sci_gateway/c/.libs sci_gateway/c/_libs
-       -rm -rf sci_gateway/cpp/.libs sci_gateway/cpp/_libs
        -rm -rf src/c/.libs src/c/_libs
        -rm -rf src/cpp/.libs src/cpp/_libs
        -rm -rf src/notclsci/.libs src/notclsci/_libs
@@ -1589,8 +1563,6 @@ distclean-generic:
        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
        -rm -f sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
        -rm -f sci_gateway/c/$(am__dirstamp)
-       -rm -f sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-       -rm -f sci_gateway/cpp/$(am__dirstamp)
        -rm -f src/c/$(DEPDIR)/$(am__dirstamp)
        -rm -f src/c/$(am__dirstamp)
        -rm -f src/cpp/$(DEPDIR)/$(am__dirstamp)
@@ -1607,7 +1579,7 @@ clean-am: clean-generic clean-libtool clean-local \
        clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR) src/c/$(DEPDIR) src/cpp/$(DEPDIR) src/notclsci/$(DEPDIR)
+       -rm -rf sci_gateway/c/$(DEPDIR) src/c/$(DEPDIR) src/cpp/$(DEPDIR) src/notclsci/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-local distclean-tags
@@ -1656,7 +1628,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-       -rm -rf sci_gateway/c/$(DEPDIR) sci_gateway/cpp/$(DEPDIR) src/c/$(DEPDIR) src/cpp/$(DEPDIR) src/notclsci/$(DEPDIR)
+       -rm -rf sci_gateway/c/$(DEPDIR) src/c/$(DEPDIR) src/cpp/$(DEPDIR) src/notclsci/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/scilab/modules/tclsci/includes/tclsci_gw.hxx b/scilab/modules/tclsci/includes/tclsci_gw.hxx
deleted file mode 100644 (file)
index 276b4f5..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-*  Copyright (C) 2015 - Scilab Enterprises - Cedric Delamarre
-*
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
-*
-*/
-
-#ifndef __TCLSCI_GW_HXX__
-#define __TCLSCI_GW_HXX__
-
-#include <string>
-
-extern "C"
-{
-#include "dynlib_tclsci.h"
-}
-
-class TclsciModule
-{
-private :
-    TclsciModule() {};
-    ~TclsciModule() {};
-    static int LoadDeps(const std::wstring& _functionName);
-
-public :
-    TCLSCI_IMPEXP static int Load();
-    TCLSCI_IMPEXP static int Unload()
-    {
-        return 1;
-    }
-};
-
-#endif /* __TCLSCI_GW_HXX__ */
diff --git a/scilab/modules/tclsci/sci_gateway/cpp/tclsci_gw.cpp b/scilab/modules/tclsci/sci_gateway/cpp/tclsci_gw.cpp
deleted file mode 100644 (file)
index f6c8154..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-*  Copyright (C) 2015 - Scilab Enterprises - Cedric Delamarre
-*
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
-*
-*/
-
-#include "tclsci_gw.hxx"
-#include "context.hxx"
-#include "configvariable.hxx"
-#include "function.hxx"
-
-extern "C"
-{
-#include "gw_tclsci.h"
-}
-
-#define MODULE_NAME L"tclsci"
-
-int TclsciModule::Load()
-{
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"TCL_DoOneEvent",   &sci_TCL_DoOneEvent,   MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"TCL_EvalStr",      &sci_TCL_EvalStr,      MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"TCL_GetVar",       &sci_TCL_GetVar,       MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"TCL_SetVar",       &sci_TCL_SetVar,       MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"sci_opentk",       &sci_opentk,           MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"TCL_GetVersion",   &sci_TCL_GetVersion,   MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"TCL_UnsetVar",     &sci_TCL_UnsetVar,     MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"TCL_ExistVar",     &sci_TCL_ExistVar,     MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"TCL_UpVar",        &sci_TCL_UpVar,        MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"TCL_DeleteInterp", &sci_TCL_DeleteInterp, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"TCL_ExistInterp",  &sci_TCL_ExistInterp,  MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"TCL_ExistArray",   &sci_TCL_ExistArray,   MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"TCL_EvalFile",     &sci_TCL_EvalFile,     MODULE_NAME));
-    return 1;
-}
index 9cf87e3..218d864 100644 (file)
  * along with this program.
  *
  */
-#include "tclsci_gw.hxx"
 extern "C"
 {
 #include "BOOL.h"
 #include "localization.h"
 #include "Scierror.h"
-    /*--------------------------------------------------------------------------*/
 #ifndef _MSC_VER
     int XTKsocket = 0;
 #endif
 }
 
-/*--------------------------------------------------------------------------*/
-int TclsciModule::Load()
-{
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
-
 extern "C"
 {
     /*--------------------------------------------------------------------------*/
index 0d3c286..16eac7b 100644 (file)
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="sci_gateway\cpp\tclsci_gw.cpp" />
     <ClCompile Include="src\cpp\ScilabEval.cpp" />
     <ClCompile Include="src\c\EnvTclTk.c" />
     <ClCompile Include="src\c\GlobalTclInterp.c" />
index c2c5bcf..247db47 100644 (file)
     <ClCompile Include="src\cpp\ScilabEval.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\tclsci_gw.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="includes\dynlib_tclsci.h">
index 4ce7397..c8e4cc6 100644 (file)
@@ -68,8 +68,7 @@ GATEWAY_CXX_SOURCES = \
     sci_gateway/cpp/sci_browsevar.cpp \
     sci_gateway/cpp/sci_filebrowser.cpp \
     sci_gateway/cpp/sci_updatebrowsevar.cpp \
-    sci_gateway/cpp/sci_closeEditvar.cpp \
-    sci_gateway/cpp/ui_data_gw.cpp
+    sci_gateway/cpp/sci_closeEditvar.cpp
 
 
 libsciui_data_la_CPPFLAGS = \
@@ -114,8 +113,7 @@ libsciui_data_disable_la_CPPFLAGS = \
     $(AM_CPPFLAGS)
 
 UI_DATA_DISABLE_C_SOURCES = src/noui_data/noui_data.c
-UI_DATA_DISABLE_CXX_SOURCES = src/noui_data/noui_data_gw.cpp
-libsciui_data_disable_la_SOURCES = $(UI_DATA_DISABLE_C_SOURCES) $(UI_DATA_DISABLE_CXX_SOURCES)
+libsciui_data_disable_la_SOURCES = $(UI_DATA_DISABLE_C_SOURCES)
 
 pkglib_LTLIBRARIES = libsciui_data-disable.la
 
index d3873bb..5039d57 100644 (file)
@@ -204,22 +204,18 @@ am__v_lt_1 =
 @GUI_TRUE@am_libsciui_data_algo_la_rpath =
 libsciui_data_disable_la_LIBADD =
 am__objects_4 = src/noui_data/libsciui_data_disable_la-noui_data.lo
-am__objects_5 =  \
-       src/noui_data/libsciui_data_disable_la-noui_data_gw.lo
-am_libsciui_data_disable_la_OBJECTS = $(am__objects_4) \
-       $(am__objects_5)
+am_libsciui_data_disable_la_OBJECTS = $(am__objects_4)
 libsciui_data_disable_la_OBJECTS =  \
        $(am_libsciui_data_disable_la_OBJECTS)
 am__DEPENDENCIES_1 =
 libsciui_data_la_DEPENDENCIES = libsciui_data-algo.la \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am__objects_6 = sci_gateway/cpp/libsciui_data_la-sci_editvar.lo \
+am__objects_5 = sci_gateway/cpp/libsciui_data_la-sci_editvar.lo \
        sci_gateway/cpp/libsciui_data_la-sci_browsevar.lo \
        sci_gateway/cpp/libsciui_data_la-sci_filebrowser.lo \
        sci_gateway/cpp/libsciui_data_la-sci_updatebrowsevar.lo \
-       sci_gateway/cpp/libsciui_data_la-sci_closeEditvar.lo \
-       sci_gateway/cpp/libsciui_data_la-ui_data_gw.lo
-am_libsciui_data_la_OBJECTS = $(am__objects_6)
+       sci_gateway/cpp/libsciui_data_la-sci_closeEditvar.lo
+am_libsciui_data_la_OBJECTS = $(am__objects_5)
 libsciui_data_la_OBJECTS = $(am_libsciui_data_la_OBJECTS)
 libsciui_data_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
@@ -649,8 +645,7 @@ GATEWAY_CXX_SOURCES = \
     sci_gateway/cpp/sci_browsevar.cpp \
     sci_gateway/cpp/sci_filebrowser.cpp \
     sci_gateway/cpp/sci_updatebrowsevar.cpp \
-    sci_gateway/cpp/sci_closeEditvar.cpp \
-    sci_gateway/cpp/ui_data_gw.cpp
+    sci_gateway/cpp/sci_closeEditvar.cpp
 
 libsciui_data_la_CPPFLAGS = \
     $(JAVA_JNI_INCLUDE) \
@@ -695,8 +690,7 @@ libsciui_data_disable_la_CPPFLAGS = \
     $(AM_CPPFLAGS)
 
 UI_DATA_DISABLE_C_SOURCES = src/noui_data/noui_data.c
-UI_DATA_DISABLE_CXX_SOURCES = src/noui_data/noui_data_gw.cpp
-libsciui_data_disable_la_SOURCES = $(UI_DATA_DISABLE_C_SOURCES) $(UI_DATA_DISABLE_CXX_SOURCES)
+libsciui_data_disable_la_SOURCES = $(UI_DATA_DISABLE_C_SOURCES)
 pkglib_LTLIBRARIES = libsciui_data-disable.la $(am__append_3)
 @GUI_TRUE@noinst_LTLIBRARIES = libsciui_data-algo.la
 libsciui_data_la_LDFLAGS = $(AM_LDFLAGS)
@@ -937,12 +931,9 @@ src/noui_data/$(DEPDIR)/$(am__dirstamp):
 src/noui_data/libsciui_data_disable_la-noui_data.lo:  \
        src/noui_data/$(am__dirstamp) \
        src/noui_data/$(DEPDIR)/$(am__dirstamp)
-src/noui_data/libsciui_data_disable_la-noui_data_gw.lo:  \
-       src/noui_data/$(am__dirstamp) \
-       src/noui_data/$(DEPDIR)/$(am__dirstamp)
 
 libsciui_data-disable.la: $(libsciui_data_disable_la_OBJECTS) $(libsciui_data_disable_la_DEPENDENCIES) $(EXTRA_libsciui_data_disable_la_DEPENDENCIES) 
-       $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libsciui_data_disable_la_OBJECTS) $(libsciui_data_disable_la_LIBADD) $(LIBS)
+       $(AM_V_CCLD)$(LINK) -rpath $(pkglibdir) $(libsciui_data_disable_la_OBJECTS) $(libsciui_data_disable_la_LIBADD) $(LIBS)
 sci_gateway/cpp/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/cpp
        @: > sci_gateway/cpp/$(am__dirstamp)
@@ -964,9 +955,6 @@ sci_gateway/cpp/libsciui_data_la-sci_updatebrowsevar.lo:  \
 sci_gateway/cpp/libsciui_data_la-sci_closeEditvar.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/cpp/libsciui_data_la-ui_data_gw.lo:  \
-       sci_gateway/cpp/$(am__dirstamp) \
-       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 
 libsciui_data.la: $(libsciui_data_la_OBJECTS) $(libsciui_data_la_DEPENDENCIES) $(EXTRA_libsciui_data_la_DEPENDENCIES) 
        $(AM_V_CXXLD)$(libsciui_data_la_LINK) $(am_libsciui_data_la_rpath) $(libsciui_data_la_OBJECTS) $(libsciui_data_la_LIBADD) $(LIBS)
@@ -992,7 +980,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciui_data_la-sci_editvar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciui_data_la-sci_filebrowser.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciui_data_la-sci_updatebrowsevar.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciui_data_la-ui_data_gw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciui_data_algo_la-PutScilabVariable.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libsciui_data_algo_la-BrowseVarManager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libsciui_data_algo_la-FileBrowserChDir.Plo@am__quote@
@@ -1001,7 +988,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/jni/$(DEPDIR)/libsciui_data_algo_la-FileBrowser.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/jni/$(DEPDIR)/libsciui_data_algo_la-ui_data_wrap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/noui_data/$(DEPDIR)/libsciui_data_disable_la-noui_data.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/noui_data/$(DEPDIR)/libsciui_data_disable_la-noui_data_gw.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -1107,13 +1093,6 @@ src/cpp/libsciui_data_algo_la-FileBrowserChDir.lo: src/cpp/FileBrowserChDir.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciui_data_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libsciui_data_algo_la-FileBrowserChDir.lo `test -f 'src/cpp/FileBrowserChDir.cpp' || echo '$(srcdir)/'`src/cpp/FileBrowserChDir.cpp
 
-src/noui_data/libsciui_data_disable_la-noui_data_gw.lo: src/noui_data/noui_data_gw.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciui_data_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/noui_data/libsciui_data_disable_la-noui_data_gw.lo -MD -MP -MF src/noui_data/$(DEPDIR)/libsciui_data_disable_la-noui_data_gw.Tpo -c -o src/noui_data/libsciui_data_disable_la-noui_data_gw.lo `test -f 'src/noui_data/noui_data_gw.cpp' || echo '$(srcdir)/'`src/noui_data/noui_data_gw.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/noui_data/$(DEPDIR)/libsciui_data_disable_la-noui_data_gw.Tpo src/noui_data/$(DEPDIR)/libsciui_data_disable_la-noui_data_gw.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/noui_data/noui_data_gw.cpp' object='src/noui_data/libsciui_data_disable_la-noui_data_gw.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciui_data_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/noui_data/libsciui_data_disable_la-noui_data_gw.lo `test -f 'src/noui_data/noui_data_gw.cpp' || echo '$(srcdir)/'`src/noui_data/noui_data_gw.cpp
-
 sci_gateway/cpp/libsciui_data_la-sci_editvar.lo: sci_gateway/cpp/sci_editvar.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciui_data_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciui_data_la-sci_editvar.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciui_data_la-sci_editvar.Tpo -c -o sci_gateway/cpp/libsciui_data_la-sci_editvar.lo `test -f 'sci_gateway/cpp/sci_editvar.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_editvar.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciui_data_la-sci_editvar.Tpo sci_gateway/cpp/$(DEPDIR)/libsciui_data_la-sci_editvar.Plo
@@ -1149,13 +1128,6 @@ sci_gateway/cpp/libsciui_data_la-sci_closeEditvar.lo: sci_gateway/cpp/sci_closeE
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciui_data_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciui_data_la-sci_closeEditvar.lo `test -f 'sci_gateway/cpp/sci_closeEditvar.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_closeEditvar.cpp
 
-sci_gateway/cpp/libsciui_data_la-ui_data_gw.lo: sci_gateway/cpp/ui_data_gw.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciui_data_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciui_data_la-ui_data_gw.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciui_data_la-ui_data_gw.Tpo -c -o sci_gateway/cpp/libsciui_data_la-ui_data_gw.lo `test -f 'sci_gateway/cpp/ui_data_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/ui_data_gw.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciui_data_la-ui_data_gw.Tpo sci_gateway/cpp/$(DEPDIR)/libsciui_data_la-ui_data_gw.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/ui_data_gw.cpp' object='sci_gateway/cpp/libsciui_data_la-ui_data_gw.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciui_data_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciui_data_la-ui_data_gw.lo `test -f 'sci_gateway/cpp/ui_data_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/ui_data_gw.cpp
-
 mostlyclean-libtool:
        -rm -f *.lo
 
index 0e74d78..2ee1e5a 100644 (file)
 #define __UI_DATA_GW_HXX__
 
 #include "cpp_gateway_prototype.hxx"
-#include "c_gateway_prototype.h"
+
+extern "C" {
 #include "dynlib_ui_data.h"
+#include "c_gateway_prototype.h"
 
-class UiDataModule
-{
-private:
-    UiDataModule() {};
-    ~UiDataModule() {};
-public:
-    UI_DATA_IMPEXP static int Load();
-    UI_DATA_IMPEXP static int Unload()
-    {
-        return 1;
-    }
-};
+    UI_DATA_IMPEXP STACK_GATEWAY_PROTOTYPE(sci_editvar);
+}
 
-CPP_GATEWAY_PROTOTYPE(sci_browsevar);
-STACK_GATEWAY_PROTOTYPE(sci_editvar);
-CPP_GATEWAY_PROTOTYPE(sci_filebrowser);
-CPP_GATEWAY_PROTOTYPE(sci_updatebrowsevar);
-CPP_GATEWAY_PROTOTYPE(sci_closeEditvar);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_browsevar, UI_DATA_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_filebrowser, UI_DATA_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_updatebrowsevar, UI_DATA_IMPEXP);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_closeEditvar, UI_DATA_IMPEXP);
 
 #endif /* __UI_DATA_GW_HXX__ */
index 50b9176..632044a 100644 (file)
@@ -20,6 +20,7 @@
 #include "EditVar.hxx"
 #include "GiwsException.hxx"
 //#include "ScilabToJava.hxx"
+#include "ui_data_gw.hxx"
 
 extern "C"
 {
diff --git a/scilab/modules/ui_data/sci_gateway/cpp/ui_data_gw.cpp b/scilab/modules/ui_data/sci_gateway/cpp/ui_data_gw.cpp
deleted file mode 100644 (file)
index e4868e0..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-*  Copyright (C) 2008-2008 - DIGITEO - Antoine ELIAS
-*  Copyright (C) 2011-2011 - DIGITEO - Bruno JOFRET
-*
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
-*
-*/
-
-#include "ui_data_gw.hxx"
-#include "context.hxx"
-#include "overload.hxx"
-#include "Scierror.h"
-#include "localization.h"
-#include "charEncoding.h"
-
-#define MODULE_NAME L"ui_data"
-
-int UiDataModule::Load()
-{
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"browsevar", &sci_browsevar, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"editvar", &sci_editvar, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"filebrowser", &sci_filebrowser, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"updatebrowsevar", &sci_updatebrowsevar, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(types::Function::createFunction(L"closeEditvar", &sci_closeEditvar, MODULE_NAME));
-
-    return 0;
-}
\ No newline at end of file
diff --git a/scilab/modules/ui_data/sci_gateway/ui_data_gateway.xml b/scilab/modules/ui_data/sci_gateway/ui_data_gateway.xml
new file mode 100644 (file)
index 0000000..b5fd129
--- /dev/null
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE module SYSTEM "../../functions/xml/gateway.dtd">
+<!--
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2011 - DIGITEO - Antoine ELIAS
+ *
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ */
+ Scilab
+ Interface description. In this file, we define the list of the function which
+ will be available into Scilab and the link to the "native" function.
+
+ Don't touch if you do not know what you are doing
+-->
+<module name="ui_data">
+    <gateway name="sci_browsevar"       function="browsevar"        type="1" />
+    <gateway name="sci_editvar"         function="editvar"          type="0" />
+    <gateway name="sci_filebrowser"     function="filebrowser"      type="1" />
+    <gateway name="sci_updatebrowsevar" function="updatebrowsevar"  type="1" />
+    <gateway name="sci_closeEditvar"    function="closeEditvar"     type="1" />
+</module>
index 4c98368..927d576 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
     <ClCompile Include="..\..\sci_gateway\cpp\sci_closeEditvar.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_filebrowser.cpp" />
     <ClCompile Include="..\..\sci_gateway\cpp\sci_updatebrowsevar.cpp" />
-    <ClCompile Include="..\..\sci_gateway\cpp\ui_data_gw.cpp" />
     <ClCompile Include="..\cpp\FileBrowserChDir.cpp" />
     <ClCompile Include="..\cpp\BrowseVarManager.cpp" />
     <ClCompile Include="..\jni\BrowseVar.cpp" />
index ddeba92..ef76e58 100644 (file)
@@ -65,9 +65,6 @@
     <ClCompile Include="..\cpp\BrowseVarManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\cpp\ui_data_gw.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\jni\ui_data_wrap.c">
       <Filter>Source Files</Filter>
     </ClCompile>
index 6a4438d..5b46467 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
   <ItemGroup>
     <ClCompile Include="..\c\DllmainUi_data.c" />
     <ClCompile Include="noui_data.c" />
-    <ClCompile Include="noui_data_gw.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="noui_data.rc" />
index 4dc7d16..6159bae 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -21,9 +21,6 @@
     <ClCompile Include="noui_data.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="noui_data_gw.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\c\DllmainUi_data.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -33,4 +30,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/scilab/modules/ui_data/src/noui_data/noui_data_gw.cpp b/scilab/modules/ui_data/src/noui_data/noui_data_gw.cpp
deleted file mode 100644 (file)
index 6e37649..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2015 - Scilab Enterprises - Vincent COUVERT
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- */
-
-#include "ui_data_gw.hxx"
-
-int UiDataModule::Load()
-{
-    /* Do Nothing */
-    return true;
-}