add external_objects_java on windows solution 41/11841/1
Antoine ELIAS [Fri, 28 Jun 2013 12:41:59 +0000 (14:41 +0200)]
Some tests failed du to file locked and leak of java compiler configuration

Change-Id: I1ec5611cc97a55079573d36338b80ca006c6ed2b

23 files changed:
scilab/Scilab.sln
scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
scilab/modules/external_objects/includes/ScilabAbstractMemoryAllocator.hxx
scilab/modules/external_objects_java/core_Import.def [deleted file]
scilab/modules/external_objects_java/core_f_Import.def [deleted file]
scilab/modules/external_objects_java/external_objects_java.iss
scilab/modules/external_objects_java/external_objects_java.rc
scilab/modules/external_objects_java/external_objects_java.vcxproj
scilab/modules/external_objects_java/external_objects_java.vcxproj.filters
scilab/modules/external_objects_java/includes/ScilabAbstractMemoryAllocator.hxx
scilab/modules/external_objects_java/includes/ScilabEnvironments.hxx
scilab/modules/external_objects_java/includes/ScilabGatewayOptions.hxx
scilab/modules/external_objects_java/includes/ScilabObjects.hxx
scilab/modules/external_objects_java/includes/dynlib_external_objects_java_scilab.h
scilab/modules/external_objects_java/sci_gateway/cpp/sci_jallowClassReloading.cpp
scilab/modules/external_objects_java/sci_gateway/cpp/sci_jvoid.cpp
scilab/modules/external_objects_java/src/cpp/ScilabJavaEnvironment.cpp
scilab/modules/external_objects_java/src/cpp/ScilabJavaEnvironment.hxx
scilab/modules/external_objects_java/src/cpp/ScilabJavaEnvironmentWrapper.cpp
scilab/modules/external_objects_java/src/cpp/ScilabJavaObjectHelper.hxx
scilab/modules/external_objects_java/src/cpp/WrapAsDirectBufferTemplate.hpp
scilab/modules/external_objects_java/src/cpp/dllMain.cpp
scilab/modules/external_objects_java/tests/unit_tests/jenableTrace.tst

index 6b46c88..9e91685 100644 (file)
@@ -501,6 +501,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nographic_objects", "module
 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}") = "external_objects_java", "modules\external_objects_java\external_objects_java.vcxproj", "{C51BA525-D7C8-4385-862D-F8E67187B827}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -1561,6 +1563,14 @@ Global
                {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Release|Win32.Build.0 = Release|Win32
                {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Release|x64.ActiveCfg = Release|x64
                {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Release|x64.Build.0 = Release|x64
+               {C51BA525-D7C8-4385-862D-F8E67187B827}.Debug|Win32.ActiveCfg = Debug|Win32
+               {C51BA525-D7C8-4385-862D-F8E67187B827}.Debug|Win32.Build.0 = Debug|Win32
+               {C51BA525-D7C8-4385-862D-F8E67187B827}.Debug|x64.ActiveCfg = Debug|x64
+               {C51BA525-D7C8-4385-862D-F8E67187B827}.Debug|x64.Build.0 = Debug|x64
+               {C51BA525-D7C8-4385-862D-F8E67187B827}.Release|Win32.ActiveCfg = Release|Win32
+               {C51BA525-D7C8-4385-862D-F8E67187B827}.Release|Win32.Build.0 = Release|Win32
+               {C51BA525-D7C8-4385-862D-F8E67187B827}.Release|x64.ActiveCfg = Release|x64
+               {C51BA525-D7C8-4385-862D-F8E67187B827}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 543737e..9ccd343 100644 (file)
@@ -74,6 +74,7 @@ cd $(SolutionDir)modules\prebuildjava && call ant
 cd $(SolutionDir)modules\javasci && call ant \r
 cd $(SolutionDir)modules\hdf5 && call ant\r
 cd $(SolutionDir)modules\xcos && call ant\r
+cd $(SolutionDir)modules\external_objects_java && call ant\r
 </NMakeBuildCommandLine>\r
     <NMakeReBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk\r
 set PATH=$(SolutionDir)java\ant\bin;%PATH%;\r
@@ -81,7 +82,7 @@ cd $(SolutionDir)modules\prebuildjava &amp;&amp; call ant clean &amp;&amp; call
 cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean &amp;&amp; call ant \r
 cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean &amp;&amp; call ant\r
 cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean &amp;&amp; call ant\r
-\r
+cd $(SolutionDir)modules\external_objects_java &amp;&amp; call ant clean &amp;&amp; call ant\r
 \r
 </NMakeReBuildCommandLine>\r
     <NMakeCleanCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk\r
@@ -90,6 +91,7 @@ cd $(SolutionDir)modules\prebuildjava &amp;&amp; call ant clean
 cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean \r
 cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean\r
 cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean\r
+cd $(SolutionDir)modules\external_objects_java &amp;&amp; call ant clean\r
 \r
 \r
 \r
@@ -105,6 +107,7 @@ cd $(SolutionDir)modules\prebuildjava &amp;&amp; call ant
 cd $(SolutionDir)modules\javasci &amp;&amp; call ant \r
 cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant\r
 cd $(SolutionDir)modules\xcos &amp;&amp; call ant\r
+cd $(SolutionDir)modules\external_objects_java &amp;&amp; call ant\r
 </NMakeBuildCommandLine>\r
     <NMakeReBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk\r
 set PATH=$(SolutionDir)java\ant\bin;%PATH%;\r
@@ -112,7 +115,7 @@ cd $(SolutionDir)modules\prebuildjava &amp;&amp; call ant clean &amp;&amp; call
 cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean &amp;&amp; call ant \r
 cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean &amp;&amp; call ant\r
 cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean &amp;&amp; call ant\r
-\r
+cd $(SolutionDir)modules\external_objects_java &amp;&amp; call ant clean &amp;&amp; call ant\r
 \r
 </NMakeReBuildCommandLine>\r
     <NMakeCleanCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk\r
@@ -121,6 +124,7 @@ cd $(SolutionDir)modules\prebuildjava &amp;&amp; call ant clean
 cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean \r
 cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean\r
 cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean\r
+cd $(SolutionDir)modules\external_objects_java &amp;&amp; call ant clean\r
 \r
 \r
 \r
@@ -136,6 +140,7 @@ cd $(SolutionDir)modules\prebuildjava &amp;&amp; call ant
 cd $(SolutionDir)modules\javasci &amp;&amp; call ant \r
 cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant\r
 cd $(SolutionDir)modules\xcos &amp;&amp; call ant\r
+cd $(SolutionDir)modules\external_objects_java &amp;&amp; call ant\r
 </NMakeBuildCommandLine>\r
     <NMakeReBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk\r
 set PATH=$(SolutionDir)java\ant\bin;%PATH%;\r
@@ -143,7 +148,7 @@ cd $(SolutionDir)modules\prebuildjava &amp;&amp; call ant clean &amp;&amp; call
 cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean &amp;&amp; call ant \r
 cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean &amp;&amp; call ant\r
 cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean &amp;&amp; call ant\r
-\r
+cd $(SolutionDir)modules\external_objects_java &amp;&amp; call ant clean &amp;&amp; call ant\r
 \r
 </NMakeReBuildCommandLine>\r
     <NMakeCleanCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk\r
@@ -152,6 +157,7 @@ cd $(SolutionDir)modules\prebuildjava &amp;&amp; call ant clean
 cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean \r
 cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean\r
 cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean\r
+cd $(SolutionDir)modules\external_objects_java &amp;&amp; call ant clean\r
 \r
 \r
 \r
@@ -167,6 +173,7 @@ cd $(SolutionDir)modules\prebuildjava &amp;&amp; call ant
 cd $(SolutionDir)modules\javasci &amp;&amp; call ant \r
 cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant\r
 cd $(SolutionDir)modules\xcos &amp;&amp; call ant\r
+cd $(SolutionDir)modules\external_objects_java &amp;&amp; call ant\r
 </NMakeBuildCommandLine>\r
     <NMakeReBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk\r
 set PATH=$(SolutionDir)java\ant\bin;%PATH%;\r
@@ -174,7 +181,7 @@ cd $(SolutionDir)modules\prebuildjava &amp;&amp; call ant clean &amp;&amp; call
 cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean &amp;&amp; call ant \r
 cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean &amp;&amp; call ant\r
 cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean &amp;&amp; call ant\r
-\r
+cd $(SolutionDir)modules\external_objects_java &amp;&amp; call ant clean &amp;&amp; call ant\r
 \r
 </NMakeReBuildCommandLine>\r
     <NMakeCleanCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk\r
@@ -183,6 +190,7 @@ cd $(SolutionDir)modules\prebuildjava &amp;&amp; call ant clean
 cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean \r
 cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean\r
 cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean\r
+cd $(SolutionDir)modules\external_objects_java &amp;&amp; call ant clean\r
 \r
 \r
 \r
index 7d41cbb..890d9af 100644 (file)
 #include "ScilabAbstractEnvironmentWrapper.hxx"
 #include "ScilabAbstractEnvironmentException.hxx"
 
-extern "C" {
+extern "C"
+{
 #include "api_scilab.h"
 }
-
 namespace org_modules_external_objects
 {
 
diff --git a/scilab/modules/external_objects_java/core_Import.def b/scilab/modules/external_objects_java/core_Import.def
deleted file mode 100644 (file)
index 2107999..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-       LIBRARY    core.dll
-
-
-EXPORTS
-;
-;core
-;
-callFunctionFromGateway
-com_
-backtrace_print
-recu_
-stack_
-vstk_
-iop_
-intersci_
-scistring_
-str2name_
\ No newline at end of file
diff --git a/scilab/modules/external_objects_java/core_f_Import.def b/scilab/modules/external_objects_java/core_f_Import.def
deleted file mode 100644 (file)
index 5fb9cd4..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-       LIBRARY    core_f.dll
-
-
-EXPORTS
-;
-;core_f
-;
-varfunptr_
-funs_
\ No newline at end of file
index f6efe84..217f60d 100644 (file)
 ; Inno Setup Script (5.3 and more) for Scilab (UNICODE version required)
 ;
 ;--------------------------------------------------------------------------------------------------------------
-; external_objects module
+; EXTERNAL_OBJECTS_JAVA module
 ;--------------------------------------------------------------------------------------------------------------
 ;
-#define EXTERNAL_OBJECTS "external_objects"
+#define EXTERNAL_OBJECTS_JAVA_JAVA "EXTERNAL_OBJECTS_JAVA_java"
 ;
-Source: bin\external_objects.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\external_objects.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\EXTERNAL_OBJECTS_JAVA.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: bin\EXTERNAL_OBJECTS_JAVA.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#EXTERNAL_OBJECTS}\sci_gateway\{#EXTERNAL_OBJECTS}_gateway.xml; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\sci_gateway\{#EXTERNAL_OBJECTS_JAVA}_gateway.xml; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\sci_gateway; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#EXTERNAL_OBJECTS}\includes\*.h; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\includes; Components: {#COMPN_SCILAB}
-Source: modules\{#EXTERNAL_OBJECTS}\includes\*.hxx; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\includes; Components: {#COMPN_SCILAB}
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\includes\*.h; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\includes; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\includes\*.hxx; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\includes; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#EXTERNAL_OBJECTS}\etc\{#EXTERNAL_OBJECTS}.quit; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\etc; Components: {#COMPN_SCILAB}
-Source: modules\{#EXTERNAL_OBJECTS}\etc\{#EXTERNAL_OBJECTS}.start; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\etc; Components: {#COMPN_SCILAB}
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\etc\{#EXTERNAL_OBJECTS_JAVA}.quit; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\etc\{#EXTERNAL_OBJECTS_JAVA}.start; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#EXTERNAL_OBJECTS}\macros\buildmacros.sce; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#EXTERNAL_OBJECTS}\macros\buildmacros.bat; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#EXTERNAL_OBJECTS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#EXTERNAL_OBJECTS}\macros\*.bin; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#EXTERNAL_OBJECTS}\macros\*.sci; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#EXTERNAL_OBJECTS}\macros\lib; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#EXTERNAL_OBJECTS}\macros\names; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\buildmacros.sce; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\buildmacros.bat; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\cleanmacros.bat; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\*.bin; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\*.sci; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\lib; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\names; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-;Source: modules\{#EXTERNAL_OBJECTS}\tests\*.*; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\lib; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\names; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\*.sci; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\*.bin; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\tests\*.*; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE} and {#COMPN_TESTS}
+
 ;--------------------------------------------------------------------------------------------------------------
index 432bf09..f0300e8 100644 (file)
@@ -65,12 +65,12 @@ BEGIN
     BEGIN
         BLOCK "040c04b0"
         BEGIN
-            VALUE "FileDescription", "external_objects module"
+            VALUE "FileDescription", "external_objects_java module"
             VALUE "FileVersion", "5, 5, 0, 0"
-            VALUE "InternalName", "external_objects module"
+            VALUE "InternalName", "external_objects_java module"
             VALUE "LegalCopyright", "Copyright (C) 2013"
-            VALUE "OriginalFilename", "external_objects.dll"
-            VALUE "ProductName", " external_objects"
+            VALUE "OriginalFilename", "external_objects_java.dll"
+            VALUE "ProductName", " external_objects_java"
             VALUE "ProductVersion", "5, 5, 0, 0"
         END
     END
index 56f1a27..def1ae7 100644 (file)
@@ -19,7 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{3142E52C-309A-41D9-BD12-7B7E9E3BDD44}</ProjectGuid>
+    <ProjectGuid>{C51BA525-D7C8-4385-862D-F8E67187B827}</ProjectGuid>
     <RootNamespace>external_objects</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../output_stream/includes;../core/includes;../api_scilab/includes;../fileio/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;EXTERNAL_OBJECTS_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>includes;src/cpp;src/jni;../../java/jdk/include;../../java/jdk/include/win32;../../libs/intl;../windows_tools/includes;../commons/src/jni;../external_objects/includes;../api_scilab/includes;../core/includes;../localization/includes;../output_stream/includes;../jvm/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;EXTERNAL_OBJECTS_JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <PreLinkEvent>
-      <Message>Make dependencies</Message>
-      <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)core_f_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core_f.lib" 1&gt;NUL 2&gt;NUL</Command>
+      <Message>
+      </Message>
+      <Command>
+      </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>core_f.lib;core.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -103,18 +105,20 @@ lib /DEF:"$(ProjectDir)core_f_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../output_stream/includes;../core/includes;../api_scilab/includes;../fileio/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;EXTERNAL_OBJECTS_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>includes;src/cpp;src/jni;../../java/jdk/include;../../java/jdk/include/win32;../../libs/intl;../windows_tools/includes;../commons/src/jni;../external_objects/includes;../api_scilab/includes;../core/includes;../localization/includes;../output_stream/includes;../jvm/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;EXTERNAL_OBJECTS_JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <PreLinkEvent>
-      <Message>Make dependencies</Message>
-      <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)core_f_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core_f.lib" 1&gt;NUL 2&gt;NUL</Command>
+      <Message>
+      </Message>
+      <Command>
+      </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>core_f.lib;core.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -128,8 +132,8 @@ lib /DEF:"$(ProjectDir)core_f_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../output_stream/includes;../core/includes;../api_scilab/includes;../fileio/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;EXTERNAL_OBJECTS_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>includes;src/cpp;src/jni;../../java/jdk/include;../../java/jdk/include/win32;../../libs/intl;../windows_tools/includes;../commons/src/jni;../external_objects/includes;../api_scilab/includes;../core/includes;../localization/includes;../output_stream/includes;../jvm/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;EXTERNAL_OBJECTS_JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -137,12 +141,14 @@ lib /DEF:"$(ProjectDir)core_f_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <PreLinkEvent>
-      <Message>Make dependencies</Message>
-      <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)core_f_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core_f.lib" 1&gt;NUL 2&gt;NUL</Command>
+      <Message>
+      </Message>
+      <Command>
+      </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>core_f.lib;core.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -161,8 +167,8 @@ lib /DEF:"$(ProjectDir)core_f_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../output_stream/includes;../core/includes;../api_scilab/includes;../fileio/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;EXTERNAL_OBJECTS_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>includes;src/cpp;src/jni;../../java/jdk/include;../../java/jdk/include/win32;../../libs/intl;../windows_tools/includes;../commons/src/jni;../external_objects/includes;../api_scilab/includes;../core/includes;../localization/includes;../output_stream/includes;../jvm/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;EXTERNAL_OBJECTS_JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -170,12 +176,14 @@ lib /DEF:"$(ProjectDir)core_f_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <PreLinkEvent>
-      <Message>Make dependencies</Message>
-      <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)core_f_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core_f.lib" 1&gt;NUL 2&gt;NUL</Command>
+      <Message>
+      </Message>
+      <Command>
+      </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>core_f.lib;core.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -191,128 +199,85 @@ lib /DEF:"$(ProjectDir)core_f_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     <ClInclude Include="includes\dynlib_external_objects_java_scilab.h" />
     <ClInclude Include="includes\ExternalObjects.h" />
     <ClInclude Include="includes\ExternalObjectsFunction.h" />
-    <ClInclude Include="includes\gw_external_objects.h" />
-    <ClInclude Include="includes\OptionsHelper.hxx" />
-    <ClInclude Include="includes\ScilabAbstractEnvironment.hxx" />
-    <ClInclude Include="includes\ScilabAbstractEnvironmentException.hxx" />
-    <ClInclude Include="includes\ScilabAbstractEnvironmentWrapper.hxx" />
+    <ClInclude Include="includes\gw_external_objects_java.h" />
     <ClInclude Include="includes\ScilabAbstractInvoker.hxx" />
     <ClInclude Include="includes\ScilabAbstractMemoryAllocator.hxx" />
     <ClInclude Include="includes\ScilabAbstractOptionsSetter.hxx" />
-    <ClInclude Include="includes\ScilabAutoCleaner.hxx" />
     <ClInclude Include="includes\ScilabEnvironments.hxx" />
     <ClInclude Include="includes\ScilabGateway.hxx" />
     <ClInclude Include="includes\ScilabGatewayOptions.hxx" />
     <ClInclude Include="includes\ScilabObjects.hxx" />
     <ClInclude Include="includes\ScilabOptionsSetter.hxx" />
     <ClInclude Include="includes\ScilabStream.hxx" />
+    <ClInclude Include="src\cpp\JavaOptionsHelper.hxx" />
+    <ClInclude Include="src\cpp\JavaOptionsSetter.hxx" />
+    <ClInclude Include="src\cpp\JIMSwrapunwrap.h" />
+    <ClInclude Include="src\cpp\noMoreMemory.h" />
+    <ClInclude Include="src\cpp\NoMoreScilabMemoryException.hxx" />
+    <ClInclude Include="src\cpp\ScilabJavaEnvironment.hxx" />
+    <ClInclude Include="src\cpp\ScilabJavaEnvironmentWrapper.hxx" />
+    <ClInclude Include="src\cpp\ScilabJavaException.hxx" />
+    <ClInclude Include="src\cpp\ScilabJavaObjectHelper.hxx" />
+    <ClInclude Include="src\jni\ScilabClassLoader.hxx" />
+    <ClInclude Include="src\jni\ScilabJavaArray.hxx" />
+    <ClInclude Include="src\jni\ScilabJavaClass.hxx" />
+    <ClInclude Include="src\jni\ScilabJavaCompiler.hxx" />
+    <ClInclude Include="src\jni\ScilabJavaObject.hxx" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="sci_gateway\cpp\sci_doubleExclam_invoke_.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_invoke_lu.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EClass_e.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_0.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_1_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_2_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_3_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_4_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_5.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_a_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_disp.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_d_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_e.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_g_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_h_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_j_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_k_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_l_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_m_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_n_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_o_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_p.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_p_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_q_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_r_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_s_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_t.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_x_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_y_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_z_foo.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_percent_foo_i_EObj.cpp" />
-    <ClCompile Include="sci_gateway\c\gw_external_objects.c" />
-    <ClCompile Include="src\cpp\addNamedVariable.cpp" />
-    <ClCompile Include="src\cpp\addToClasspath.cpp" />
-    <ClCompile Include="src\cpp\array.cpp" />
-    <ClCompile Include="src\cpp\cast.cpp" />
-    <ClCompile Include="src\cpp\classExtract.cpp" />
-    <ClCompile Include="src\cpp\compile.cpp" />
-    <ClCompile Include="src\cpp\convMatrixMethod.cpp" />
-    <ClCompile Include="src\cpp\deff.cpp" />
-    <ClCompile Include="src\cpp\display.cpp" />
-    <ClCompile Include="src\cpp\doubleExclam_invoke.cpp" />
-    <ClCompile Include="src\cpp\evalString.cpp" />
-    <ClCompile Include="src\cpp\exists.cpp" />
-    <ClCompile Include="src\cpp\ExternalObjectsFunction.cpp" />
-    <ClCompile Include="src\cpp\getClassName.cpp" />
-    <ClCompile Include="src\cpp\getClasspath.cpp" />
-    <ClCompile Include="src\cpp\getEnvId.cpp" />
-    <ClCompile Include="src\cpp\getEnvironmentInfos.cpp" />
-    <ClCompile Include="src\cpp\getEnvironmentName.cpp" />
-    <ClCompile Include="src\cpp\getField.cpp" />
-    <ClCompile Include="src\cpp\getFields.cpp" />
-    <ClCompile Include="src\cpp\getMethods.cpp" />
-    <ClCompile Include="src\cpp\getNamedVariable.cpp" />
-    <ClCompile Include="src\cpp\getRepresentation.cpp" />
-    <ClCompile Include="src\cpp\getsetOptions.cpp" />
-    <ClCompile Include="src\cpp\import.cpp" />
-    <ClCompile Include="src\cpp\invoke.cpp" />
-    <ClCompile Include="src\cpp\invoker.cpp" />
-    <ClCompile Include="src\cpp\invoke_lu.cpp" />
-    <ClCompile Include="src\cpp\newInstance.cpp" />
-    <ClCompile Include="src\cpp\objectExtract.cpp" />
-    <ClCompile Include="src\cpp\objectInsert.cpp" />
-    <ClCompile Include="src\cpp\objectPrint.cpp" />
-    <ClCompile Include="src\cpp\operation.cpp" />
-    <ClCompile Include="src\cpp\OptionsHelper.cpp" />
-    <ClCompile Include="src\cpp\remove.cpp" />
-    <ClCompile Include="src\cpp\ScilabAutoCleaner.cpp" />
-    <ClCompile Include="src\cpp\ScilabEnvironments.cpp" />
-    <ClCompile Include="src\cpp\ScilabObjects.cpp" />
-    <ClCompile Include="src\cpp\ScilabOptionsSetter.cpp" />
-    <ClCompile Include="src\cpp\setField.cpp" />
-    <ClCompile Include="src\cpp\trace.cpp" />
-    <ClCompile Include="src\cpp\unwrap.cpp" />
-    <ClCompile Include="src\cpp\unwrapremove.cpp" />
-    <ClCompile Include="src\cpp\wrap.cpp" />
-    <ClCompile Include="src\cpp\wrapAsRef.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_jallowClassReloading.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_jarray.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_jcast.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_jcompile.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_jdeff.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_jdisableTrace.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_jenableTrace.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_jexists.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_jgetclassname.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_jgetfield.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_jgetfields.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_jgetmethods.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_jimport.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_jnewInstance.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_jremove.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_junwrap.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_junwraprem.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_jvoid.cpp" />
+    <ClCompile Include="sci_gateway\cpp\sci_jwrap.cpp" />
+    <ClCompile Include="sci_gateway\c\gw_external_objects_java.c" />
+    <ClCompile Include="src\cpp\dllMain.cpp" />
+    <ClCompile Include="src\cpp\JavaOptionsSetter.cpp" />
+    <ClCompile Include="src\cpp\NoMoreScilabMemoryException.cpp" />
+    <ClCompile Include="src\cpp\ScilabJavaEnvironment.cpp" />
+    <ClCompile Include="src\cpp\ScilabJavaEnvironmentWrapper.cpp" />
+    <ClCompile Include="src\jni\ScilabClassLoader.cpp" />
+    <ClCompile Include="src\jni\ScilabJavaArray.cpp" />
+    <ClCompile Include="src\jni\ScilabJavaClass.cpp" />
+    <ClCompile Include="src\jni\ScilabJavaCompiler.cpp" />
+    <ClCompile Include="src\jni\ScilabJavaObject.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\libs\MALLOC\MALLOC.vcxproj">
-      <Project>{6a84ad8c-ba18-4a3f-9c72-ec3df0939e9e}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\api_scilab\api_scilab.vcxproj">
       <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\fileio\fileio.vcxproj">
-      <Project>{4fc72d4a-80ee-4b1a-8724-0201c1a35621}</Project>
+    <ProjectReference 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="..\external_objects\external_objects.vcxproj">
+      <Project>{3142e52c-309a-41d9-bd12-7b7e9e3bdd44}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\localization\src\localization.vcxproj">
-      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
+    <ProjectReference Include="..\jvm\libjvm.vcxproj">
+      <Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
     </ProjectReference>
     <ProjectReference Include="..\output_stream\src\c\output_stream.vcxproj">
       <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
     </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\..\bin\libintl.lib" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="core_f_Import.def" />
-    <None Include="core_Import.def" />
-    <None Include="external_objects.iss" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="external_objects.rc" />
+    <ProjectReference Include="..\windows_tools\src\c\scilab_windows\scilab_windows.vcxproj">
+      <Project>{8028f371-6a94-4a26-8804-6e7f05f1d1aa}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
index b5cea21..d7e1145 100644 (file)
@@ -13,9 +13,6 @@
     <Filter Include="Libraries Dependencies">
       <UniqueIdentifier>{49ac0be0-21fc-461e-adf6-626a904f8064}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Libraries Dependencies\Imports">
-      <UniqueIdentifier>{a986ba00-0dde-4728-94ef-439b52ceb5d5}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="includes\dynlib_external_objects_java_scilab.h">
     <ClInclude Include="includes\ExternalObjectsFunction.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="includes\gw_external_objects.h">
+    <ClInclude Include="includes\gw_external_objects_java.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="includes\OptionsHelper.hxx">
+    <ClInclude Include="includes\ScilabAbstractInvoker.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="includes\ScilabAbstractEnvironment.hxx">
+    <ClInclude Include="includes\ScilabAbstractMemoryAllocator.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="includes\ScilabAbstractEnvironmentException.hxx">
+    <ClInclude Include="includes\ScilabAbstractOptionsSetter.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="includes\ScilabAbstractEnvironmentWrapper.hxx">
+    <ClInclude Include="includes\ScilabEnvironments.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="includes\ScilabAbstractInvoker.hxx">
+    <ClInclude Include="includes\ScilabGateway.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="includes\ScilabAbstractMemoryAllocator.hxx">
+    <ClInclude Include="includes\ScilabGatewayOptions.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="includes\ScilabAbstractOptionsSetter.hxx">
+    <ClInclude Include="includes\ScilabObjects.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="includes\ScilabAutoCleaner.hxx">
+    <ClInclude Include="includes\ScilabOptionsSetter.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="includes\ScilabEnvironments.hxx">
+    <ClInclude Include="includes\ScilabStream.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="includes\ScilabGateway.hxx">
+    <ClInclude Include="src\cpp\JavaOptionsHelper.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="includes\ScilabGatewayOptions.hxx">
+    <ClInclude Include="src\cpp\JavaOptionsSetter.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="includes\ScilabObjects.hxx">
+    <ClInclude Include="src\cpp\JIMSwrapunwrap.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="includes\ScilabOptionsSetter.hxx">
+    <ClInclude Include="src\cpp\noMoreMemory.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="includes\ScilabStream.hxx">
+    <ClInclude Include="src\cpp\NoMoreScilabMemoryException.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ScilabJavaEnvironment.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ScilabJavaEnvironmentWrapper.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ScilabJavaException.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpp\ScilabJavaObjectHelper.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\jni\ScilabClassLoader.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\jni\ScilabJavaArray.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\jni\ScilabJavaClass.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\jni\ScilabJavaCompiler.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\jni\ScilabJavaObject.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="sci_gateway\c\gw_external_objects.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_doubleExclam_invoke_.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_invoke_lu.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EClass_e.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_0.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_1_foo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_2_foo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_3_foo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_4_foo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_5.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_a_foo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_d_foo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_disp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_e.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_g_foo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_h_foo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_j_foo.cpp">
+    <ClCompile Include="src\cpp\ScilabJavaEnvironmentWrapper.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_k_foo.cpp">
+    <ClCompile Include="src\cpp\ScilabJavaEnvironment.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_l_foo.cpp">
+    <ClCompile Include="src\cpp\NoMoreScilabMemoryException.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_m_foo.cpp">
+    <ClCompile Include="src\cpp\JavaOptionsSetter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_n_foo.cpp">
+    <ClCompile Include="src\jni\ScilabClassLoader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_o_foo.cpp">
+    <ClCompile Include="src\jni\ScilabJavaArray.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_p.cpp">
+    <ClCompile Include="src\jni\ScilabJavaClass.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_p_foo.cpp">
+    <ClCompile Include="src\jni\ScilabJavaCompiler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_q_foo.cpp">
+    <ClCompile Include="src\jni\ScilabJavaObject.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_r_foo.cpp">
+    <ClCompile Include="sci_gateway\c\gw_external_objects_java.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_s_foo.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_jallowClassReloading.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_t.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_jarray.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_x_foo.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_jcast.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_y_foo.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_jcompile.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_EObj_z_foo.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_jdeff.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_percent_foo_i_EObj.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_jdisableTrace.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\addNamedVariable.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_jenableTrace.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\wrapAsRef.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_jexists.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\addToClasspath.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_jgetclassname.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\array.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_jgetfield.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\cast.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_jgetfields.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\classExtract.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_jgetmethods.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\compile.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_jimport.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\convMatrixMethod.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_jnewInstance.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\deff.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_jremove.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\display.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_junwrap.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\doubleExclam_invoke.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_junwraprem.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\evalString.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_jvoid.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\exists.cpp">
+    <ClCompile Include="sci_gateway\cpp\sci_jwrap.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\ExternalObjectsFunction.cpp">
+    <ClCompile Include="src\cpp\dllMain.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\getClassName.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\getClasspath.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\getEnvId.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\getEnvironmentInfos.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\getEnvironmentName.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\getField.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\getFields.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\getMethods.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\getNamedVariable.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\getRepresentation.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\getsetOptions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\import.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\invoke.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\invoke_lu.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\invoker.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\newInstance.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\objectExtract.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\objectInsert.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\objectPrint.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\operation.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\OptionsHelper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\remove.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ScilabAutoCleaner.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ScilabEnvironments.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ScilabObjects.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\ScilabOptionsSetter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\setField.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\trace.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\unwrap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\unwrapremove.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\wrap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\..\bin\libintl.lib" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="core_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
-    <None Include="core_f_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
-    <None Include="external_objects.iss" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="external_objects.rc">
-      <Filter>Resource File</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
index 7d41cbb..a70ad38 100644 (file)
 #include "ScilabAbstractEnvironmentWrapper.hxx"
 #include "ScilabAbstractEnvironmentException.hxx"
 
-extern "C" {
-#include "api_scilab.h"
-}
-
 namespace org_modules_external_objects
 {
 
index 6618eeb..8988b40 100644 (file)
@@ -13,6 +13,8 @@
 #ifndef __SCILABENVIRONMENTS_HXX__
 #define __SCILABENVIRONMENTS_HXX__
 
+#pragma warning(disable: 4251)
+
 #include <vector>
 
 #include "ScilabAbstractEnvironmentException.hxx"
index dba34d8..94e4856 100644 (file)
 #ifndef __SCILABGATEWAYOPTIONS_HXX__
 #define __SCILABGATEWAYOPTIONS_HXX__
 
-extern "C" {
-#include "api_scilab.h"
-}
-
 namespace org_modules_external_objects
 {
 
index 7301736..b40e67a 100644 (file)
 #include "OptionsHelper.hxx"
 #include "dynlib_external_objects_java_scilab.h"
 
-extern "C" {
-#include "api_scilab.h"
-#include "stack-c.h"
-#include "localization.h"
-}
-
 namespace org_modules_external_objects
 {
 class EXTERNAL_OBJECTS_JAVA_SCILAB_IMPEXP ScilabObjects
index fce1d2c..5874a8f 100644 (file)
 */
 
 /*--------------------------------------------------------------------------*/
-#ifndef __DYNLIB_JIMS_SRC_H__
-#define __DYNLIB_JIMS_SRC_H__
+#ifndef __DYNLIB_EXTERNAL_OBJECTS_JAVA_H__
+#define __DYNLIB_EXTERNAL_OBJECTS_JAVA_H__
 
 #ifdef _MSC_VER
-#ifdef JIMS_EXPORTS
+#ifdef EXTERNAL_OBJECTS_JAVA_EXPORTS
 #define EXTERNAL_OBJECTS_JAVA_SCILAB_IMPEXP __declspec(dllexport)
 #else
 #define EXTERNAL_OBJECTS_JAVA_SCILAB_IMPEXP __declspec(dllimport)
@@ -24,5 +24,5 @@
 #define EXTERNAL_OBJECTS_JAVA_SCILAB_IMPEXP
 #endif
 
-#endif /* __DYNLIB_JIMS_SRC_H__ */
+#endif /* __DYNLIB_EXTERNAL_OBJECTS_JAVA_H__ */
 /*--------------------------------------------------------------------------*/
index 2c8c078..a644358 100644 (file)
@@ -34,4 +34,6 @@ int sci_jallowClassReloading(char * fname, unsigned long fname_len)
         Scierror(999, "%s: An error occured: %s", fname, e.what());
         return 0;
     }
+
+    return 0;
 }
index 81fe80b..d39cbfe 100644 (file)
@@ -34,4 +34,6 @@ int sci_jvoid(char * fname, unsigned long fname_len)
         Scierror(999, "%s: An error occured: %s", fname, e.what());
         return 0;
     }
+
+    return 0;
 }
index 93859ef..9d0d42e 100644 (file)
  *
  */
 
+#ifdef _MSC_VER
+#include "windows.h"
+#endif
+
 #include <jni.h>
 
 #include "ScilabJavaEnvironment.hxx"
@@ -24,6 +28,7 @@
 //#include "ScilabJavaObjectHelper.hxx"
 extern "C" {
 #include "getScilabJavaVM.h"
+#include "tmpdir.h"
 }
 
 namespace org_scilab_modules_external_objects_java
@@ -77,7 +82,7 @@ int ScilabJavaEnvironment::start()
                 ScilabJavaOStream::setStdErrStream(&instance->scilabStream);*/
         instance->helper.setUseLastName(true);
         instance->helper.setNewAllowed(true);
-        instance->enabletrace("/tmp/eo_java.log");
+        instance->enabletrace((std::string(getTMPDIR()) + std::string("/eo_java.log")).c_str());
     }
 
     return envId;
@@ -475,7 +480,7 @@ bool ScilabJavaEnvironment::isvalidobject(int id)
 {
 
     JavaVM *vm = getScilabJavaVM();
-    int ret = ScilabJavaObject::isValidJavaObject(vm, id);
+    bool ret = ScilabJavaObject::isValidJavaObject(vm, id);
     writeLog("isvalidobject", "Test the validity of object %d which is%s valid.", id, ret ? "" : " not");
     return ret;
 }
index 237afe7..59e59df 100644 (file)
 #include <map>
 #include <string>
 
+#ifdef _MSC_VER
+#include "strdup_windows.h"
+#endif
+
 // #if defined(PIMS_EXPORTS)
 // #pragma message("defined(PIMS_EXPORTS)")
 // #else
@@ -393,6 +397,8 @@ private:
             case Geq :
                 return "ge";
         }
+
+        return "";
     }
 };
 
index 1a1741c..2d1a577 100644 (file)
  *
  */
 
+#ifdef _MSC_VER
+#include "windows.h"
+#endif
+
 #include "ScilabJavaEnvironmentWrapper.hxx"
 #include "ScilabJavaObject.hxx"
 
@@ -46,33 +50,38 @@ int ScilabJavaEnvironmentWrapper::wrap(double * x, const bool isRef) const
 int ScilabJavaEnvironmentWrapper::wrap(double * x, int xSize, const bool isRef) const
 {
     //  return wrapData<double>(x, xSize, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(double * x, int xSize, int xSizeCol, const bool isRef) const
 {
     //    return wrapData<double>(x, xSize, xSizeCol, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(double * re, double * im, const bool isRef) const
 {
-    /*    if (helper.getWrapSingleWithNumpy())
-        {
-            return wrapData(re, im, 1, isRef);
-        }
-        else
-        {
-            return wrapData(re, im, isRef);
-            }*/
+    //if (helper.getWrapSingleWithNumpy())
+    //{
+    //    return wrapData(re, im, 1, isRef);
+    //}
+    //else
+    //{
+    //    return wrapData(re, im, isRef);
+    //}
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(double * re, double * im, int xSize, const bool isRef) const
 {
     //    return wrapData(re, im, xSize, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(double * re, double * im, int xSize, int xSizeCol, const bool isRef) const
 {
     //    return wrapData(re, im, xSize, xSizeCol, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(char * x, const bool isRef) const
@@ -84,26 +93,31 @@ int ScilabJavaEnvironmentWrapper::wrap(char * x, const bool isRef) const
 int ScilabJavaEnvironmentWrapper::wrap(char * x, int xSize, const bool isRef) const
 {
     //    return wrapData<char>(x, xSize, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(char * x, int xSize, int xSizeCol, const bool isRef) const
 {
     //    return wrapData<char>(x, xSize, xSizeCol, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(unsigned char * x, const bool isRef) const
 {
     //    return wrapData<unsigned char>(x, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(unsigned char * x, int xSize, const bool isRef) const
 {
     //  return wrapData<unsigned char>(x, xSize, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(unsigned char * x, int xSize, int xSizeCol, const bool isRef) const
 {
     //    return wrapData<unsigned char>(x, xSize, xSizeCol, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(short * x, const bool isRef) const
@@ -115,11 +129,13 @@ int ScilabJavaEnvironmentWrapper::wrap(short * x, const bool isRef) const
 int ScilabJavaEnvironmentWrapper::wrap(short * x, int xSize, const bool isRef) const
 {
     //    return wrapData<short>(x, xSize, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(short * x, int xSize, int xSizeCol, const bool isRef) const
 {
     //    return wrapData<short>(x, xSize, xSizeCol, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(unsigned short * x, const bool isRef) const
@@ -131,11 +147,13 @@ int ScilabJavaEnvironmentWrapper::wrap(unsigned short * x, const bool isRef) con
 int ScilabJavaEnvironmentWrapper::wrap(unsigned short * x, int xSize, const bool isRef) const
 {
     //    return wrapData<unsigned short>(x, xSize, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(unsigned short * x, int xSize, int xSizeCol, const bool isRef) const
 {
     //    return wrapData<unsigned short>(x, xSize, xSizeCol, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(int * x, const bool isRef) const
@@ -147,11 +165,13 @@ int ScilabJavaEnvironmentWrapper::wrap(int * x, const bool isRef) const
 int ScilabJavaEnvironmentWrapper::wrap(int * x, int xSize, const bool isRef) const
 {
     //    return wrapData<int>(x, xSize, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(int * x, int xSize, int xSizeCol, const bool isRef) const
 {
     //    return wrapData<int>(x, xSize, xSizeCol, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(unsigned int * x, const bool isRef) const
@@ -163,11 +183,13 @@ int ScilabJavaEnvironmentWrapper::wrap(unsigned int * x, const bool isRef) const
 int ScilabJavaEnvironmentWrapper::wrap(unsigned int * x, int xSize, const bool isRef) const
 {
     //    return wrapData<unsigned int>(x, xSize, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(unsigned int * x, int xSize, int xSizeCol, const bool isRef) const
 {
     //    return wrapData<unsigned int>(x, xSize, xSizeCol, isRef);
+    return 0;
 }
 
 #ifdef __SCILAB_INT64__
@@ -181,16 +203,19 @@ int ScilabJavaEnvironmentWrapper::wrap(long long * x, const bool isRef) const
 int ScilabJavaEnvironmentWrapper::wrap(long long * x, int xSize, const bool isRef) const
 {
     //    return wrapData<long>(x, xSize, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(long long * x, int xSize, int xSizeCol, const bool isRef) const
 {
     //    return wrapData<long>(x, xSize, xSizeCol, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(unsigned long long * x, const bool isRef) const
 {
     //    return wrapData<unsigned long>(x, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(unsigned long long * x, int xSize, const bool isRef) const
@@ -201,6 +226,7 @@ int ScilabJavaEnvironmentWrapper::wrap(unsigned long long * x, int xSize, const
 int ScilabJavaEnvironmentWrapper::wrap(unsigned long long * x, int xSize, int xSizeCol, const bool isRef) const
 {
     //    return wrapData<unsigned long>(x, xSize, xSizeCol, isRef);
+    return 0;
 }
 
 #endif
@@ -214,27 +240,31 @@ int ScilabJavaEnvironmentWrapper::wrap(char ** x, const bool isRef) const
 int ScilabJavaEnvironmentWrapper::wrap(char ** x, int xSize, const bool isRef) const
 {
     //    return wrapData(x, xSize, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(char ** x, int xSize, int xSizeCol, const bool isRef) const
 {
     //    return wrapData(x, xSize, xSizeCol, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrapBool(int * x, const bool isRef) const
 {
     JavaVM *vm = getScilabJavaVM ();
-    return ScilabJavaObject::wrapBoolean(vm, *x);
+    return ScilabJavaObject::wrapBoolean(vm, *x != 0);
 }
 
 int ScilabJavaEnvironmentWrapper::wrapBool(int * x, int xSize, const bool isRef) const
 {
     //    return wrapData<int, bool, npy_bool>(x, xSize, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrapBool(int * x, int xSize, int xSizeCol, const bool isRef) const
 {
     //    return wrapData<int, bool, npy_bool>(x, xSize, xSizeCol, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(float * x, const bool isRef) const
@@ -246,11 +276,13 @@ int ScilabJavaEnvironmentWrapper::wrap(float * x, const bool isRef) const
 int ScilabJavaEnvironmentWrapper::wrap(float * x, int xSize, const bool isRef) const
 {
     //    return wrapData<float>(x, xSize, isRef);
+    return 0;
 }
 
 int ScilabJavaEnvironmentWrapper::wrap(float * x, int xSize, int xSizeCol, const bool isRef) const
 {
     //    return wrapData<float>(x, xSize, xSizeCol, isRef);
+    return 0;
 }
 
 void ScilabJavaEnvironmentWrapper::unwrapdouble(int id, const ScilabDoubleStackAllocator & allocator) const
index bc1b5d1..622cdfb 100644 (file)
@@ -13,7 +13,6 @@
 #include <jni.h>
 #include "GiwsException.hxx"
 #include "NoMoreScilabMemoryException.hxx"
-#include "api_scilab.h"
 #include "ScilabObjects.hxx"
 #include "OptionsHelper.hxx"
 
index c3a5f8f..a8ab8da 100644 (file)
@@ -12,6 +12,7 @@
 /*--------------------------------------------------------------------------*/
 #include <jni.h>
 #include "GiwsException.hxx"
+#include "ScilabJavaObjectHelper.hxx"
 /*--------------------------------------------------------------------------*/
 #define SCILABJAVAOBJECT "org/scilab/forge/jims/ScilabJavaObject"
 /*--------------------------------------------------------------------------*/
index 80381f0..9327153 100644 (file)
@@ -11,6 +11,8 @@
  */
 
 #include <windows.h>
+
+#pragma comment(lib,"../../bin/libintl.lib")
 /*--------------------------------------------------------------------------*/
 int WINAPI DllMain (HINSTANCE hInstance , DWORD reason, PVOID pvReserved)
 {
index 4c3b988..27f4296 100644 (file)
@@ -17,4 +17,4 @@ jdisableTrace();
 assert_checktrue(isfile(debugFile));
 mdelete(debugFile);
 jwrap(2);
-assert_checkfalse(isfile(debugFile));
\ No newline at end of file
+assert_checkfalse(isfile(debugFile));