fix bug_14405: add typesjni.lib and typesjni.dll in Windows installer 58/19058/3
Antoine ELIAS [Wed, 8 Feb 2017 15:58:19 +0000 (16:58 +0100)]
Change-Id: I64046a381228bf625fba2ca074b51e1df75b3a67

scilab/CHANGES.md
scilab/modules/types/tests/nonreg_tests/bug_14405.tst [new file with mode: 0644]
scilab/modules/types/types.iss
scilab/modules/types/typesjni/typesjni.vcxproj

index e46c6b8..9749cc0 100644 (file)
@@ -411,6 +411,7 @@ Bug Fixes
 * [#14367](http://bugzilla.scilab.org/show_bug.cgi?id=14367): `edit_curv` failed opening due to a `[]+1` operation.
 * [#14379](http://bugzilla.scilab.org/show_bug.cgi?id=14379): Problem with lists of functions having 2 arguments.
 * [#14395](http://bugzilla.scilab.org/show_bug.cgi?id=14395): `dir` displayed a []+".." warning when no subdirectory exists.
+* [#14405](http://bugzilla.scilab.org/show_bug.cgi?id=14405): `xcosPalAdd` did not work on Windows.
 * [#14411](http://bugzilla.scilab.org/show_bug.cgi?id=14411): `abort` used in a `while`loop crashed Scilab.
 * [#14437](http://bugzilla.scilab.org/show_bug.cgi?id=14437): Changing the field of a struct embedded in a list sometimes misworked.
 * [#14448](http://bugzilla.scilab.org/show_bug.cgi?id=14448): `havewindow` is removed but was still documented.
diff --git a/scilab/modules/types/tests/nonreg_tests/bug_14405.tst b/scilab/modules/types/tests/nonreg_tests/bug_14405.tst
new file mode 100644 (file)
index 0000000..64f3ab0
--- /dev/null
@@ -0,0 +1,23 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2016 - Scilab Enterprises - Nicolas Carrez
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- Non-regression test for bug 14405 -->
+//
+// <-- XCOS TEST -->
+// <-- NO CHECK REF -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=14405
+//
+// <-- Short Description -->
+// xcosPalAdd doesn't work
+
+loadXcosLibs();
+pal = xcosPal();
+pal = xcosPalAddBlock(pal, "SUM_f");
+pal = xcosPalAddBlock(pal, "BIGSOM_f");
+assert_checktrue(xcosPalAdd(pal, "my Summation blocks"));
index 85b5b70..f31644e 100644 (file)
@@ -20,6 +20,9 @@
 ;
 #define TYPES "types"
 ;
+Source: bin\{#TYPES}jni.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\{#TYPES}jni.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+;
 Source: modules\{#TYPES}\jar\org.scilab.modules.{#TYPES}.jar;DestDir: {app}\modules\{#TYPES}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
 Source: modules\{#TYPES}\license.txt; DestDir: {app}\modules\{#TYPES}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
index 2c5ad2e..a33425b 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -91,7 +91,7 @@
     <Link>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>../../bin/$(ProjectName).lib</ImportLibrary>
+      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
       <AdditionalDependencies>
       </AdditionalDependencies>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
     <Link>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>../../bin/$(ProjectName).lib</ImportLibrary>
+      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
       <AdditionalDependencies>
       </AdditionalDependencies>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
     </ClCompile>
     <Link>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <ImportLibrary>../../bin/$(ProjectName).lib</ImportLibrary>
+      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
       <AdditionalDependencies>
       </AdditionalDependencies>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
     </ClCompile>
     <Link>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <ImportLibrary>../../bin/$(ProjectName).lib</ImportLibrary>
+      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
       <AdditionalDependencies>
       </AdditionalDependencies>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file