update action_binding
Allan Cornet [Sat, 27 Oct 2007 08:43:18 +0000 (08:43 +0000)]
(f2c solution will come when i will finished fortran solution)

18 files changed:
scilab/Scilab.sln
scilab/modules/action_binding/LibScilab_Import.def [deleted file]
scilab/modules/action_binding/build.xml [new file with mode: 0644]
scilab/modules/action_binding/src/c/DllmainAction_Binding.c
scilab/modules/action_binding/src/c/InterpreterManagement.h
scilab/modules/action_binding/src/c/LibScilab_Import.def
scilab/modules/action_binding/src/c/action_binding.vcproj [moved from scilab/modules/action_binding/action_binding.vcproj with 53% similarity]
scilab/modules/action_binding/src/c/action_binding_header.def [moved from scilab/modules/action_binding/action_binding_header.def with 100% similarity]
scilab/modules/action_binding/src/c/libjvm_Import.def [new file with mode: 0644]
scilab/modules/action_binding/src/java/action_binding-JAVA.vcproj
scilab/modules/console/etc/console.quit
scilab/modules/console/etc/console.start
scilab/modules/console/src/c/LibScilab_Import.def
scilab/modules/console/src/c/console.vcproj
scilab/modules/console/src/c/dropFiles.c
scilab/modules/helptools/macros/xmlfiletohtml.sci
scilab/modules/localization/src/c/InitializeLocalization.c
scilab/modules/tclsci/LibScilab_Import.def

index 4a8f7ce..6cc1521 100644 (file)
@@ -376,10 +376,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckHelp", "modules\helpto
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tclsci", "modules\tclsci\tclsci.vcproj", "{C456D5B8-8A32-496A-A2EE-164B0D734126}"
        ProjectSection(ProjectDependencies) = postProject
+               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {8A654CC5-22C1-4972-A8CF-1B89F78B5383} = {8A654CC5-22C1-4972-A8CF-1B89F78B5383}
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
-               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "javasci", "modules\javasci\Javasci.vcproj", "{0BD503EF-5CB6-4277-BAC4-8955C97F247D}"
@@ -705,18 +706,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "modules\rendere
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console", "modules\console\src\c\console.vcproj", "{445D3B85-C9B1-498B-9C88-0A3C2390B1CC}"
        ProjectSection(ProjectDependencies) = postProject
-               {45CA5B12-7601-4968-AE16-16069FD1A152} = {45CA5B12-7601-4968-AE16-16069FD1A152}
                {805AA73F-EF7B-4177-BF46-200B72D8F83A} = {805AA73F-EF7B-4177-BF46-200B72D8F83A}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {8A654CC5-22C1-4972-A8CF-1B89F78B5383} = {8A654CC5-22C1-4972-A8CF-1B89F78B5383}
+               {45CA5B12-7601-4968-AE16-16069FD1A152} = {45CA5B12-7601-4968-AE16-16069FD1A152}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console-Ant", "modules\console\src\java\console-JAVA.vcproj", "{251D7C8F-9B69-4CE9-959E-57F343DDC883}"
        ProjectSection(ProjectDependencies) = postProject
-               {B5E4D0C2-8C6A-4437-81BF-DBFA95900C9D} = {B5E4D0C2-8C6A-4437-81BF-DBFA95900C9D}
+               {B2911268-79E2-4FE5-AD59-2C3CB7CB794E} = {B2911268-79E2-4FE5-AD59-2C3CB7CB794E}
                {63965A84-E354-4CBC-BFAC-FDFC8224573F} = {63965A84-E354-4CBC-BFAC-FDFC8224573F}
+               {B5E4D0C2-8C6A-4437-81BF-DBFA95900C9D} = {B5E4D0C2-8C6A-4437-81BF-DBFA95900C9D}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doublylinkedlist", "libs\doublylinkedlist\doublylinkedlist.vcproj", "{ED02137F-0A4F-4EF0-AC58-97ACE37FA89D}"
@@ -789,6 +792,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spreadsheet", "modules\spre
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nospreadsheet", "modules\spreadsheet\src\nospreadsheet\nospreadsheet.vcproj", "{AC43B2A6-601A-4E15-97DF-2B296FFAD4F9}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "action_binding", "modules\action_binding\src\c\action_binding.vcproj", "{8A654CC5-22C1-4972-A8CF-1B89F78B5383}"
+       ProjectSection(ProjectDependencies) = postProject
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "action_binding-Ant", "modules\action_binding\src\java\action_binding-JAVA.vcproj", "{B2911268-79E2-4FE5-AD59-2C3CB7CB794E}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -1293,6 +1303,14 @@ Global
                {AC43B2A6-601A-4E15-97DF-2B296FFAD4F9}.Debug|Win32.Build.0 = Debug|Win32
                {AC43B2A6-601A-4E15-97DF-2B296FFAD4F9}.Release|Win32.ActiveCfg = Release|Win32
                {AC43B2A6-601A-4E15-97DF-2B296FFAD4F9}.Release|Win32.Build.0 = Release|Win32
+               {8A654CC5-22C1-4972-A8CF-1B89F78B5383}.Debug|Win32.ActiveCfg = Debug|Win32
+               {8A654CC5-22C1-4972-A8CF-1B89F78B5383}.Debug|Win32.Build.0 = Debug|Win32
+               {8A654CC5-22C1-4972-A8CF-1B89F78B5383}.Release|Win32.ActiveCfg = Release|Win32
+               {8A654CC5-22C1-4972-A8CF-1B89F78B5383}.Release|Win32.Build.0 = Release|Win32
+               {B2911268-79E2-4FE5-AD59-2C3CB7CB794E}.Debug|Win32.ActiveCfg = Debug|Win32
+               {B2911268-79E2-4FE5-AD59-2C3CB7CB794E}.Debug|Win32.Build.0 = Debug|Win32
+               {B2911268-79E2-4FE5-AD59-2C3CB7CB794E}.Release|Win32.ActiveCfg = Release|Win32
+               {B2911268-79E2-4FE5-AD59-2C3CB7CB794E}.Release|Win32.Build.0 = Release|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
diff --git a/scilab/modules/action_binding/LibScilab_Import.def b/scilab/modules/action_binding/LibScilab_Import.def
deleted file mode 100644 (file)
index e73dc37..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-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
diff --git a/scilab/modules/action_binding/build.xml b/scilab/modules/action_binding/build.xml
new file mode 100644 (file)
index 0000000..1f6b28f
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!--\r
+@author Allan CORNET\r
+@author Sylvestre LEDRU\r
+@author Vincent COUVERT\r
+INRIA 2007\r
+-->\r
+<project name="action_binding" default="compile">\r
+  <import file="../../build.incl.xml"/>\r
+\r
+  <property name="library.name" value="${library.action_binding.name}" />\r
+\r
+  <description>\r
+       Build the action_binding Scilab module\r
+  </description>\r
+\r
+<!-- \r
+  <target name="compile" description="build sources" depends="init,checkstyle-scilab">\r
+-->\r
+  <target name="jar" description="Build the jar file" depends="compile">\r
+       <jar destfile="${build.jar.dir}/${library.name}" basedir="${classes.dir}">\r
+         <manifest>\r
+         </manifest>\r
+       </jar>\r
+  </target>\r
+</project>\r
+\r
index cc8f9e4..15c928f 100644 (file)
@@ -4,7 +4,7 @@
 /*-----------------------------------------------------------------------------------*/ \r
 #include <windows.h> \r
 /*-----------------------------------------------------------------------------------*/ \r
-#pragma comment(lib,"../../bin/intl.lib")\r
+#pragma comment(lib,"../../../../bin/intl.lib")\r
 /*-----------------------------------------------------------------------------------*/ \r
 int WINAPI DllMain (HINSTANCE hInstance , DWORD reason, PVOID pvReserved)\r
 {\r
index 3fd5bb7..9fea6c2 100644 (file)
@@ -7,6 +7,8 @@
 #ifndef __INTERPRETERMANAGEMENT_H__
 #define __INTERPRETERMANAGEMENT_H__
 
+#include "BOOL.h" /* BOOL */
+
 /**
  * Put a command in Scilab command queue so that Scilab executes it
  * The command is displayed in Scilab Window
@@ -27,6 +29,12 @@ int execScilabEventLoop(void);
 * @return execution status
 */
 int interruptScilab(void);
+
+/*
+* Check Queue 
+* return TRUE if it is not empty
+*/
+BOOL haveCommandsInTheQueue(void);
 /*-----------------------------------------------------------------------------------*/
 
 #endif /* __INTERPRETERMANAGEMENT_H__ */
index 8dbe5bb..e73dc37 100644 (file)
@@ -1,17 +1,26 @@
-       LIBRARY    Libscilab.dll\r
+LIBRARY    LibScilab.dll\r
 \r
 \r
 EXPORTS\r
-;core\r
-com_\r
-stack_\r
-sciprint\r
-ExceptionMessage\r
-createvarfromptr_\r
-putlhsvar_\r
-check_scalar\r
-getrhsvar_\r
-checkrhs_\r
-checklhs_\r
-intersci_\r
-;\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
@@ -13,6 +13,9 @@
                />\r
        </Platforms>\r
        <ToolFiles>\r
+               <ToolFile\r
+                       RelativePath="..\..\..\..\VS-2005-settings\swig.rules"\r
+               />\r
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
@@ -29,6 +32,9 @@
                                Name="VCCustomBuildTool"\r
                        />\r
                        <Tool\r
+                               Name="swig rule"\r
+                       />\r
+                       <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\r
                        <Tool\r
@@ -40,8 +46,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\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
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS"\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;lib /DEF:&quot;$(InputDir)libjvm_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)libjvm.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 sciaction_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/sci$(ProjectName).dll"\r
+                               AdditionalDependencies="LibScilab.lib libjvm.lib"\r
+                               OutputFile="../../../../bin/sciaction_binding.dll"\r
                                LinkIncremental="1"\r
                                ModuleDefinitionFile="action_binding.def"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               ImportLibrary="../../../../bin/sciaction_binding.lib"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               CommandLine=""\r
                        />\r
                </Configuration>\r
                <Configuration\r
                                Name="VCCustomBuildTool"\r
                        />\r
                        <Tool\r
+                               Name="swig rule"\r
+                       />\r
+                       <Tool\r
                                Name="VCXMLDataGeneratorTool"\r
                        />\r
                        <Tool\r
                                InlineFunctionExpansion="1"\r
                                FavorSizeOrSpeed="1"\r
                                WholeProgramOptimization="false"\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
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
                                EnableEnhancedInstructionSet="1"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="false"\r
-                               DebugInformationFormat="0"\r
+                               DebugInformationFormat="3"\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;lib /DEF:&quot;$(InputDir)libjvm_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)libjvm.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 sciaction_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/sci$(ProjectName).dll"\r
+                               AdditionalDependencies="LibScilab.lib libjvm.lib"\r
+                               OutputFile="../../../../bin/sciaction_binding.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/sciaction_binding.lib"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
+                               CommandLine=""\r
                        />\r
                </Configuration>\r
        </Configurations>\r
        <Files>\r
                <Filter\r
                        Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
                        >\r
                        <File\r
-                               RelativePath=".\src\c\DllmainAction_Binding.c"\r
+                               RelativePath=".\DllmainAction_Binding.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\src\c\dynamic_menus.c"\r
+                               RelativePath=".\dynamic_menus.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\src\c\InterpreterManagement.c"\r
+                               RelativePath=".\InterpreterManagement.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\jni\InterpreterManagement_wrap.c"\r
                                >\r
                        </File>\r
                </Filter>\r
                <Filter\r
                        Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       Filter="h;hpp;hxx;hm;inl"\r
                        >\r
                        <File\r
-                               RelativePath=".\includes\dynamic_menus.h"\r
+                               RelativePath="..\..\includes\dynamic_menus.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\InterpreterManagement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\src\c\InterpreterManagement.h"\r
+                               RelativePath=".\resource.h"\r
                                >\r
                        </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="localization"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Swig Files"\r
+                       >\r
                        <File\r
-                               RelativePath=".\src\c\resource.h"\r
+                               RelativePath="..\jni\InterpreterManagement.i"\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
+                       Name="Libraries Dependencies"\r
                        >\r
                        <File\r
-                               RelativePath=".\src\c\action_binding.rc"\r
+                               RelativePath=".\libjvm_Import.def"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\LibScilab_Import.def"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\bin\MALLOC.lib"\r
                                >\r
                        </File>\r
                </Filter>\r
                <Filter\r
-                       Name="localization"\r
+                       Name="Ressources"\r
                        >\r
                        <File\r
-                               RelativePath=".\locales\en_US\messages.pot"\r
+                               RelativePath=".\action_binding.rc"\r
                                >\r
                        </File>\r
                </Filter>\r
                <File\r
-                       RelativePath=".\action_binding.iss"\r
+                       RelativePath="..\..\action_binding.iss"\r
                        >\r
                </File>\r
                <File\r
-                       RelativePath=".\LibScilab_Import.def"\r
+                       RelativePath="..\..\action_binding.xml"\r
                        >\r
                </File>\r
                <File\r
-                       RelativePath=".\Makefile.am"\r
+                       RelativePath=".\action_binding_header.def"\r
                        >\r
                </File>\r
                <File\r
-                       RelativePath=".\version.xml"\r
+                       RelativePath="..\..\Makefile.am"\r
                        >\r
                </File>\r
        </Files>\r
diff --git a/scilab/modules/action_binding/src/c/libjvm_Import.def b/scilab/modules/action_binding/src/c/libjvm_Import.def
new file mode 100644 (file)
index 0000000..6a5ea35
--- /dev/null
@@ -0,0 +1,4 @@
+LIBRARY    libjvm.dll\r
+\r
+\r
+EXPORTS\r
index e69de29..ab7bfd9 100644 (file)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8,00"\r
+       Name="action_binding-Ant"\r
+       ProjectGUID="{B2911268-79E2-4FE5-AD59-2C3CB7CB794E}"\r
+       RootNamespace="action_binding-Ant"\r
+       Keyword="MakeFileProj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant jar&#x0D;&#x0A;"\r
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant jar&#x0D;&#x0A;"\r
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;&#x0D;&#x0A;"\r
+                               Output=""\r
+                               PreprocessorDefinitions="WIN32;_DEBUG"\r
+                               IncludeSearchPath=""\r
+                               ForcedIncludes=""\r
+                               AssemblySearchPath=""\r
+                               ForcedUsingAssemblies=""\r
+                               CompileAsManaged=""\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant jar&#x0D;&#x0A;"\r
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant jar&#x0D;&#x0A;"\r
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;&#x0D;&#x0A;"\r
+                               Output=""\r
+                               PreprocessorDefinitions="WIN32;NDEBUG"\r
+                               IncludeSearchPath=""\r
+                               ForcedIncludes=""\r
+                               AssemblySearchPath=""\r
+                               ForcedUsingAssemblies=""\r
+                               CompileAsManaged=""\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\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=".\org\scilab\modules\action_binding\InterpreterManagement.java"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\org\scilab\modules\action_binding\InterpreterManagementJNI.java"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
index aba2cdb..d30a0a6 100644 (file)
@@ -4,5 +4,5 @@
 // Copyright INRIA 2007
 // ====================================================================
 // delete help chapter
-del_module_help_chapter("console");
+//del_module_help_chapter("console");
 // ====================================================================
index a4b0016..11a8fe2 100644 (file)
@@ -6,6 +6,6 @@
 //load("SCI/modules/console/macros/lib");
 // ====================================================================
 //add help chapter
-add_module_help_chapter("console");
-clear add_module_help_chapter;
+//add_module_help_chapter("console");
+//clear add_module_help_chapter;
 // ====================================================================
index fe6519c..c915ff0 100644 (file)
@@ -4,8 +4,6 @@
 EXPORTS
 ; core 
 ;
-StoreCommand1
-StoreCommand
 getScilabMode
 scilab_timer_check
 ScilabEventsLoop
index a242011..bff6d0f 100644 (file)
                                >
                        </File>
                        <File
-                               RelativePath=".\InterpreterManagement.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\jni\InterpreterManagement_wrap.c"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\cpp\PromptToHome.cpp"
                                >
                        </File>
                                RelativePath="..\jni\GuiManagement.i"
                                >
                        </File>
-                       <File
-                               RelativePath="..\jni\InterpreterManagement.i"
-                               >
-                       </File>
                </Filter>
                <Filter
                        Name="Libraries Dependencies"
index 9e7353f..f4a76c7 100644 (file)
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include "dropFiles.h"
 #include "MALLOC.h"
-#include "dynamic_menus.h" /* storecommand */
+#include "../../../action_binding/includes/dynamic_menus.h" /* storecommand */
 #include "../../../fileio/includes/FindFileExtension.h"
 #include "../../../fileio/includes/URIFileToFilename.h"
 /*-----------------------------------------------------------------------------------*/
index b426a92..864ef05 100644 (file)
@@ -18,7 +18,7 @@ function ok = xmlfiletohtml(path,xsl,directory_language,default_language)
        if MSDOS then
          generate_cmd='sabcmd';
        else
-         generate_cmd='sabcmd';
+         generate_cmd='xsltproc';
        end
        
        [lhs,rhs] = argn(0);
index 3fbd05f..72877a4 100644 (file)
@@ -14,7 +14,6 @@
 #include "setgetlanguage.h"
 #include "../../../io/includes/setenvc.h"
 /*-----------------------------------------------------------------------------------*/ 
-
 /**
  * Export the variable LC_ALL to the system
  *
@@ -38,7 +37,13 @@ BOOL InitializeLocalization(void)
        char *pathLocales=NULL;
        char *ret=NULL;
 
+#ifndef _MSC_VER
        ret=setlocale(LC_MESSAGES,"");
+#else
+       /* MS VS (setlocale) doesn't know LC_MESSAGES */
+       /* http://msdn2.microsoft.com/en-us/library/x99tb11d(vs.71).aspx */
+       ret = setlocale(LC_CTYPE,"");
+#endif
        if (ret==NULL){
                fprintf(stderr, "I18N: Doesn't support your locale.\n" );
                return FALSE;
index 9e1e465..a88cba6 100644 (file)
@@ -9,10 +9,6 @@ EXPORTS
  iop_
  cf_type
  GetData
- SetCommandflag
- StoreCommand
- GetCommand
- ismenu
  recu_
  syncexec_
  GetScreenProperty