* Bug #14405 fixed - GetScilabVariableJNI symbol was not resolved on xcosPalAdd() 25/18125/6
Clément DAVID [Tue, 26 Apr 2016 12:58:54 +0000 (14:58 +0200)]
Change-Id: I6b7c5c3f1b6323c9582a9a8226ba7bdfa8c301fc

scilab/CHANGES
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/types/src/java/org/scilab/modules/types/GetScilabVariableJNI.java
scilab/modules/types/src/jni/getScilabVariable.i
scilab/modules/types/typesjni/typesjni.vcxproj
scilab/modules/types/typesjni/typesjni.vcxproj.filters

index e1d6755..6ee8fbc 100644 (file)
@@ -413,6 +413,8 @@ In 6.0.0:
 
 * Bug #14398 fixed - Matrix extraction was mistakenly considered a function call in calling sequence
 
+* Bug #14405 fixed - GetScilabVariableJNI symbol was not resolved on xcosPalAdd()
+
 * Bug #14415 fixed - Corrected some spellings error in help pages
 
 * Bug #14416 fixed - The file extension filter in Scinotes "Save as" window did not re-used the active file's extension when applicable.
index 7f0134e..bd9f064 100644 (file)
@@ -61,6 +61,7 @@ spreadsheet \
 tclsci \
 commons \
 jvm \
+types \
 action_binding \
 graphic_objects \
 renderer \
@@ -93,7 +94,6 @@ ui_data \
 history_browser \
 preferences \
 xml \
-types \
 external_objects \
 slint \
 coverage
@@ -149,6 +149,7 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
        $(top_builddir)/modules/ui_data/libsciui_data.la \
        $(top_builddir)/modules/history_browser/libscihistory_browser.la \
        $(top_builddir)/modules/commons/libscicommons.la \
+       $(top_builddir)/modules/types/libscitypes-java.la \
        $(top_builddir)/modules/preferences/libscipreferences.la \
        $(top_builddir)/modules/external_objects_java/libsciexternal_objects_java.la \
        $(top_builddir)/modules/helptools/libscihelptools.la \
index 3fd0689..77455e0 100644 (file)
@@ -281,13 +281,13 @@ DIST_SUBDIRS = prebuildjava threads output_stream arnoldi \
        linear_algebra localization polynomials special_functions time \
        windows_tools sparse completion history_manager string hdf5 \
        fftw statistics dynamic_link console spreadsheet tclsci \
-       commons jvm action_binding graphic_objects renderer gui \
+       commons jvm types action_binding graphic_objects renderer gui \
        graphic_export graphics optimization randlib interpolation \
        sound overloading m2sci development_tools \
        compatibility_functions helptools umfpack demo_tools \
        genetic_algorithms simulated_annealing matio atoms graph ast \
        scinotes parallel modules_manager ui_data history_browser \
-       preferences xml types external_objects slint coverage \
+       preferences xml external_objects slint coverage \
        external_objects_java scicos_blocks scicos xcos mpi . javasci
 am__DIST_COMMON = $(srcdir)/Makefile.in \
        $(top_srcdir)/config/mkinstalldirs
@@ -613,13 +613,13 @@ SUBDIRS = prebuildjava threads output_stream arnoldi \
        polynomials special_functions time windows_tools sparse \
        completion history_manager output_stream string hdf5 fftw \
        statistics dynamic_link console arnoldi spreadsheet tclsci \
-       commons jvm action_binding graphic_objects renderer gui \
+       commons jvm types action_binding graphic_objects renderer gui \
        graphic_export graphics optimization randlib interpolation \
        sound overloading m2sci development_tools \
        compatibility_functions helptools umfpack demo_tools \
        genetic_algorithms simulated_annealing parameters matio atoms \
        hdf5 graph ast scinotes parallel modules_manager ui_data \
-       history_browser preferences xml types external_objects slint \
+       history_browser preferences xml external_objects slint \
        coverage $(am__append_1) $(am__append_2) $(am__append_3) \
        $(am__append_4) . $(am__append_5)
 
@@ -649,6 +649,7 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
        $(top_builddir)/modules/ui_data/libsciui_data.la \
        $(top_builddir)/modules/history_browser/libscihistory_browser.la \
        $(top_builddir)/modules/commons/libscicommons.la \
+       $(top_builddir)/modules/types/libscitypes-java.la \
        $(top_builddir)/modules/preferences/libscipreferences.la \
        $(top_builddir)/modules/external_objects_java/libsciexternal_objects_java.la \
        $(top_builddir)/modules/helptools/libscihelptools.la \
index 3232741..36683b9 100644 (file)
@@ -29,7 +29,7 @@ class GetScilabVariableJNI {
   static {
     try {
         if (System.getProperty("os.name").toLowerCase().contains("windows")) {
-           System.loadLibrary("scitypes");
+           System.loadLibrary("typesjni");
         } else {
            System.loadLibrary("scilab");
         }
index bb980d6..f6d2992 100644 (file)
@@ -53,7 +53,7 @@ class%}
   static {
     try {
         if (System.getProperty("os.name").toLowerCase().contains("windows")) {
-           System.loadLibrary("scitypes");
+           System.loadLibrary("typesjni");
         } else {
            System.loadLibrary("scilab");
         }
index 17fae3a..2c5ad2e 100644 (file)
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\cpp\ScilabToJava.cpp" />
+    <ClCompile Include="..\src\jni\getScilabVariable_wrap.c" />
     <ClCompile Include="..\src\jni\ScilabPolynomialToJava.cpp" />
     <ClCompile Include="..\src\jni\ScilabVariables.cpp" />
     <ClCompile Include="..\src\jni\ScilabVariablesRefresh.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\includes\GetScilabVariable.h" />
     <ClInclude Include="..\includes\ScilabToJava.hxx" />
     <ClInclude Include="..\src\jni\ScilabPolynomialToJava.hxx" />
     <ClInclude Include="..\src\jni\ScilabVariables.hxx" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 2ad9a43..8a64e72 100644 (file)
@@ -18,6 +18,9 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\src\jni\getScilabVariable_wrap.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\jni\ScilabPolynomialToJava.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClInclude Include="..\src\jni\ScilabVariablesRefresh.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\includes\GetScilabVariable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\includes\ScilabToJava.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>