update action_binding
Allan Cornet [Sat, 27 Oct 2007 08:00:06 +0000 (08:00 +0000)]
13 files changed:
scilab/modules/action_binding/LibScilab_Import.def [new file with mode: 0644]
scilab/modules/action_binding/action_binding.iss
scilab/modules/action_binding/action_binding.vcproj [moved from scilab/modules/action_binding/src/c/action_binding.vcproj with 61% similarity]
scilab/modules/action_binding/action_binding_header.def [new file with mode: 0644]
scilab/modules/action_binding/build.xml [deleted file]
scilab/modules/action_binding/etc/action_binding.quit
scilab/modules/action_binding/etc/action_binding.start
scilab/modules/action_binding/languages/en_US/errors.xml [deleted file]
scilab/modules/action_binding/languages/en_US/menus.xml [deleted file]
scilab/modules/action_binding/languages/en_US/messages.xml [deleted file]
scilab/modules/action_binding/src/c/DllmainAction_Binding.c [new file with mode: 0644]
scilab/modules/action_binding/src/c/InterpreterManagement.h
scilab/modules/action_binding/src/c/action_binding.def [deleted file]

diff --git a/scilab/modules/action_binding/LibScilab_Import.def b/scilab/modules/action_binding/LibScilab_Import.def
new file mode 100644 (file)
index 0000000..e73dc37
--- /dev/null
@@ -0,0 +1,26 @@
+LIBRARY    LibScilab.dll\r
+\r
+\r
+EXPORTS\r
+ sciprint\r
+ putlhsvar_\r
+ error_\r
+ cluni0_\r
+ createvar_\r
+ stack_\r
+ com_\r
+ getrhsvar_\r
+ checklhs_\r
+ checkrhs_\r
+ intersci_\r
+ createvarfromptr_\r
+ Scierror\r
+ callFunctionFromGateway\r
+ iop_\r
+ message_scilab\r
+ sciprint_full\r
+ ScilabEventsLoop\r
+ ;\r
+ ;core_f\r
+ sigbas_\r
+\r
index 3f75831..a05ca40 100644 (file)
@@ -14,9 +14,6 @@
 Source: bin\sciaction_binding.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#ACTION_BINDING}\jar\org.scilab.modules.action_binding.jar;DestDir: {app}\modules\{#ACTION_BINDING}\jar; Components: {#COMPN_SCILAB}
-Source: thirdparty\JRosetta-API-1.0.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\JRosetta-1.0.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: modules\{#ACTION_BINDING}\etc\configuration.xml; DestDir: {app}\modules\{#ACTION_BINDING}\etc; Components: {#COMPN_SCILAB};
 ;
 ;Source: bin\noaction_binding.dll; DestDir: {app}\bin; DestName: sciaction_binding.dll; Components: not ({#COMPN_ACTION_BINDING})
 ;
@@ -27,7 +24,7 @@ Source: modules\{#ACTION_BINDING}\version.xml; DestDir: {app}\modules\{#ACTION_B
 ;
 ;Source: modules\{#ACTION_BINDING}\sci_gateway\action_binding.xml; DestDir: {app}\modules\{#ACTION_BINDING}\sci_gateway; Components: {#COMPN_SCILAB}
 ;
-;Source: modules\{#ACTION_BINDING}\includes\*.h; DestDir: {app}\modules\{#ACTION_BINDING}\includes; Components: {#COMPN_SCILAB}
+Source: modules\{#ACTION_BINDING}\includes\*.h; DestDir: {app}\modules\{#ACTION_BINDING}\includes; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#ACTION_BINDING}\help\addchapter.sce; DestDir: {app}\modules\{#ACTION_BINDING}\help; Flags: recursesubdirs; Components:  {#COMPN_SCILAB}
 Source: modules\{#ACTION_BINDING}\help\removechapter.sce; DestDir: {app}\modules\{#ACTION_BINDING}\help; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
@@ -35,9 +32,7 @@ Source: modules\{#ACTION_BINDING}\help\removechapter.sce; DestDir: {app}\modules
 Source: modules\{#ACTION_BINDING}\etc\{#ACTION_BINDING}.quit; DestDir: {app}\modules\{#ACTION_BINDING}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#ACTION_BINDING}\etc\{#ACTION_BINDING}.start; DestDir: {app}\modules\{#ACTION_BINDING}\etc; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#ACTION_BINDING}\etc\configuration.xml; DestDir: {app}\modules\{#ACTION_BINDING}\etc; Components: {#COMPN_SCILAB}
-;
-Source: modules\{#ACTION_BINDING}\help\*.htm; DestDir: {app}\modules\{#ACTION_BINDING}\help; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+;Source: modules\{#ACTION_BINDING}\help\*.htm; DestDir: {app}\modules\{#ACTION_BINDING}\help; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 ;
 ;
 Source: modules\{#ACTION_BINDING}\macros\buildmacros.sce; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB}
@@ -3,7 +3,7 @@
        ProjectType="Visual C++"\r
        Version="8,00"\r
        Name="action_binding"\r
-       ProjectGUID="{A85DE33C-F594-47A1-88F3-6FC4E75A1F1E}"\r
+       ProjectGUID="{8A654CC5-22C1-4972-A8CF-1B89F78B5383}"\r
        RootNamespace="action_binding"\r
        Keyword="Win32Proj"\r
        >\r
@@ -40,8 +40,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes"\r
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS"\r
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../../libs/MALLOC/includes;../../libs/intl"\r
+                               PreprocessorDefinitions="FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="0"\r
                                RuntimeLibrary="3"\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                                Description="Make dependencies"\r
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n action_binding.dll %%f &gt;nul&#x0D;&#x0A;copy *.def action_bindingtmp.def &gt;nul&#x0D;&#x0A;copy ..\action_binding_header.def+action_bindingtmp.def  ..\action_binding.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n action_binding.dll %%f &gt;nul&#x0D;&#x0A;copy *.def action_bindingtmp.def &gt;nul&#x0D;&#x0A;copy ..\action_binding_header.def+action_bindingtmp.def  ..\action_binding.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/fixed:no"\r
                                AdditionalDependencies="LibScilab.lib"\r
-                               OutputFile="../../../../bin/$(ProjectName).dll"\r
+                               OutputFile="../../bin/sci$(ProjectName).dll"\r
                                LinkIncremental="1"\r
                                ModuleDefinitionFile="action_binding.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               ImportLibrary="../../../../bin/$(ProjectName).lib"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                InlineFunctionExpansion="1"\r
                                FavorSizeOrSpeed="1"\r
                                WholeProgramOptimization="false"\r
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes"\r
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS"\r
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../../libs/MALLOC/includes;../../libs/intl"\r
+                               PreprocessorDefinitions="FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS;_CRT_SECURE_NO_DEPRECATE"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
                                EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
-                               DebugInformationFormat="3"\r
+                               DebugInformationFormat="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                                Description="Make dependencies"\r
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n action_binding.dll %%f &gt;nul&#x0D;&#x0A;copy *.def action_bindingtmp.def &gt;nul&#x0D;&#x0A;copy ..\action_binding_header.def+action_bindingtmp.def  ..\action_binding.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n action_binding.dll %%f &gt;nul&#x0D;&#x0A;copy *.def action_bindingtmp.def &gt;nul&#x0D;&#x0A;copy ..\action_binding_header.def+action_bindingtmp.def  ..\action_binding.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="LibScilab.lib"\r
-                               OutputFile="../../../../bin/$(ProjectName).dll"\r
+                               OutputFile="../../bin/sci$(ProjectName).dll"\r
                                LinkIncremental="1"\r
                                ModuleDefinitionFile="action_binding.def"\r
                                GenerateDebugInformation="false"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                LinkTimeCodeGeneration="0"\r
-                               ImportLibrary="../../../../bin/$(ProjectName).lib"\r
+                               ImportLibrary="../../bin/$(ProjectName).lib"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
        <Files>\r
                <Filter\r
                        Name="Source Files"\r
-                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\sci_gateway\c\gw_action_binding.c"\r
+                               RelativePath=".\src\c\DllmainAction_Binding.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\action_binding.rc"\r
+                               RelativePath=".\src\c\dynamic_menus.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\InterpreterManagement.c"\r
+                               RelativePath=".\src\c\InterpreterManagement.c"\r
                                >\r
                        </File>\r
                </Filter>\r
                <Filter\r
                        Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\includes\dynamic_menus.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\src\c\InterpreterManagement.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\src\c\resource.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
                        <File\r
-                               RelativePath=".\resource.h"\r
+                               RelativePath=".\src\c\action_binding.rc"\r
                                >\r
                        </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="localization"\r
+                       >\r
                        <File\r
-                               RelativePath=".\InterpreterManagement.h"\r
+                               RelativePath=".\locales\en_US\messages.pot"\r
                                >\r
                        </File>\r
                </Filter>\r
                <File\r
-                       RelativePath="..\..\Makefile.am"\r
+                       RelativePath=".\action_binding.iss"\r
                        >\r
                </File>\r
                <File\r
-                       RelativePath="..\..\sci_gateway\action_binding_gateway.xml"\r
+                       RelativePath=".\LibScilab_Import.def"\r
                        >\r
                </File>\r
                <File\r
-                       RelativePath="..\..\action_binding.iss"\r
+                       RelativePath=".\Makefile.am"\r
                        >\r
                </File>\r
                <File\r
-                       RelativePath="..\..\version.xml"\r
+                       RelativePath=".\version.xml"\r
                        >\r
                </File>\r
        </Files>\r
diff --git a/scilab/modules/action_binding/action_binding_header.def b/scilab/modules/action_binding/action_binding_header.def
new file mode 100644 (file)
index 0000000..29233c0
--- /dev/null
@@ -0,0 +1,4 @@
+LIBRARY    sciaction_binding.dll\r
+\r
+\r
+EXPORTS\r
diff --git a/scilab/modules/action_binding/build.xml b/scilab/modules/action_binding/build.xml
deleted file mode 100644 (file)
index 3029288..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-@author Allan CORNET
-@author Sylvestre LEDRU
-@author Vincent COUVERT
-INRIA 2007
--->
-<project name="action_binding" default="compile">
-  <import file="../../build.incl.xml"/>
-
-  <property name="library.name" value="${library.action_binding.name}" />
-
-  <description>
-       Build the console Scilab module
-  </description>
-
-<!-- 
-  <target name="compile" description="build sources" depends="init,checkstyle-scilab">
--->
-  <target name="jar" description="Build the jar file" depends="compile">
-       <jar destfile="${build.jar.dir}/${library.name}" basedir="${classes.dir}">
-         <manifest>
-         </manifest>
-       </jar>
-  </target>
-</project>
index e69de29..380f0f3 100644 (file)
@@ -0,0 +1,8 @@
+// ====================================================================\r
+// This file contains command to be executed at the end \r
+// of a scilab session for action_binding module\r
+// Copyright INRIA 2007\r
+// ====================================================================\r
+// delete help chapter\r
+//del_module_help_chapter("action_binding");\r
+// ====================================================================\r
index e69de29..d754ca7 100644 (file)
@@ -0,0 +1,11 @@
+// ====================================================================\r
+// action_binding module initialisation file \r
+// Copyright INRIA 2007\r
+// ====================================================================\r
+//Load  functions librarie\r
+//load("SCI/modules/action_binding/macros/lib");\r
+// ====================================================================\r
+//add help chapter\r
+//add_module_help_chapter("action_binding");\r
+//clear add_module_help_chapter;\r
+// ====================================================================\r
diff --git a/scilab/modules/action_binding/languages/en_US/errors.xml b/scilab/modules/action_binding/languages/en_US/errors.xml
deleted file mode 100644 (file)
index 21c50a7..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
diff --git a/scilab/modules/action_binding/languages/en_US/menus.xml b/scilab/modules/action_binding/languages/en_US/menus.xml
deleted file mode 100644 (file)
index 21c50a7..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
diff --git a/scilab/modules/action_binding/languages/en_US/messages.xml b/scilab/modules/action_binding/languages/en_US/messages.xml
deleted file mode 100644 (file)
index 21c50a7..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE LOCALIZATION SYSTEM "../../../localization/xml/localization.dtd">\r
-<LOCALIZATION>\r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-               \r
-<entry>\r
-       <tag></tag>\r
-       <string></string>\r
-</entry>       \r
-\r
-</LOCALIZATION>\r
diff --git a/scilab/modules/action_binding/src/c/DllmainAction_Binding.c b/scilab/modules/action_binding/src/c/DllmainAction_Binding.c
new file mode 100644 (file)
index 0000000..cc8f9e4
--- /dev/null
@@ -0,0 +1,25 @@
+/*-----------------------------------------------------------------------------------*/\r
+/* INRIA 2007 */\r
+/* Allan CORNET */\r
+/*-----------------------------------------------------------------------------------*/ \r
+#include <windows.h> \r
+/*-----------------------------------------------------------------------------------*/ \r
+#pragma comment(lib,"../../bin/intl.lib")\r
+/*-----------------------------------------------------------------------------------*/ \r
+int WINAPI DllMain (HINSTANCE hInstance , DWORD reason, PVOID pvReserved)\r
+{\r
+  switch (reason) \r
+    {\r
+    case DLL_PROCESS_ATTACH:\r
+      break;\r
+    case DLL_PROCESS_DETACH:\r
+      break;\r
+    case DLL_THREAD_ATTACH:\r
+      break;\r
+    case DLL_THREAD_DETACH:\r
+      break;\r
+    }\r
+  return 1;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+\r
index ef16ebf..3fd5bb7 100644 (file)
@@ -7,8 +7,6 @@
 #ifndef __INTERPRETERMANAGEMENT_H__
 #define __INTERPRETERMANAGEMENT_H__
 
-#include "machine.h"
-
 /**
  * Put a command in Scilab command queue so that Scilab executes it
  * The command is displayed in Scilab Window
diff --git a/scilab/modules/action_binding/src/c/action_binding.def b/scilab/modules/action_binding/src/c/action_binding.def
deleted file mode 100644 (file)
index 95f787b..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-LIBRARY    action_binding.dll\r
-\r
-\r
-EXPORTS\r
-; --------------------------------------- \r
-; action_binding\r
-; --------------------------------------- \r