* Bug #13011 fixed - ilib_compile failed under MacOS X 10.9.

Change-Id: I6389d58d5da505dade2bde9e3d93e964c37d28a1

diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X
index 9709d24..ad0791e 100644 (file)
--- a/scilab/CHANGES_5.5.X
+++ b/scilab/CHANGES_5.5.X
@@ -83,6 +83,8 @@ Scilab Bug Fixes
 
 * Bug #13008 fixed - 'help $' now opens the 'Symbols' help page.
 
+* Bug #13011 fixed - ilib_compile failed under MacOS X 10.9.
+
 * Bug #13012 fixed - Vectorial export of rotated strings was wrong.
 
 * Bug #13014 fixed - Update of the Efficiency inner variable improved in optim_ga.

diff --git a/scilab/modules/dynamic_link/macros/ilib_compile.sci b/scilab/modules/dynamic_link/macros/ilib_compile.sci
index 8701099..314b1f7 100644 (file)
--- a/scilab/modules/dynamic_link/macros/ilib_compile.sci
+++ b/scilab/modules/dynamic_link/macros/ilib_compile.sci
@@ -120,7 +120,8 @@ function libn = ilib_compile(lib_name, ..
         // Note that, for the configure, the setup is done by compilerDetection.sh
         cmdGCC="if test -x ""$(which gcc 2>/dev/null)""; then echo $(LC_ALL=C gcc -print-search-dirs|awk ''$1==""install:""{print $2}''); fi";
         [GCClibpath, ierr, stderr] = unix_g(cmdGCC);
-        if (GCClibpath <> "" & ierr == 0 & grep(getenv("LD_LIBRARY_PATH"),GCClibpath) == []) then
+
+        if (GCClibpath <> "" & GCClibpath <> [] & ierr == 0 & grep(getenv("LD_LIBRARY_PATH"),GCClibpath) == []) then
             setenv("LD_LIBRARY_PATH",GCClibpath+"/../../../:"+getenv("LD_LIBRARY_PATH"));
         end
 

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_13011.dia.ref b/scilab/modules/xcos/tests/nonreg_tests/bug_13011.dia.ref
new file mode 100644 (file)
index 0000000..91118fe
--- /dev/null
+++ b/scilab/modules/xcos/tests/nonreg_tests/bug_13011.dia.ref
@@ -0,0 +1,30 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2013 - Scilab Enterprises - Sylvestre Ledru
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- XCOS TEST -->
+// <-- ENGLISH IMPOSED -->
+// <-- Non-regression test for bug 13011 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=13011
+//
+// <-- Short Description -->
+// Fails under Mac OS X 10.9
+ilib_verbose(0);
+prot = funcprot();
+funcprot(0);
+// Stubbing the messagebox method
+function messagebox(msg, msg_title)
+endfunction
+funcprot(prot);
+importXcosDiagram(SCI+"/modules/xcos/tests/nonreg_tests/bug_12384.zcos");
+xcos_simulate(scs_m, 4);
+--------------------------------------------\
+ Main Modelica : TMPDIR/Loop_im.mo
+
+ Flat Modelica : TMPDIR/Loop_imf.mo
+ Simulation C code :TMPDIR/Loop_im.c
+WARNING: Diagram contains implicit blocks, compiling for implicit Solver.

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_13011.tst b/scilab/modules/xcos/tests/nonreg_tests/bug_13011.tst
new file mode 100644 (file)
index 0000000..d967625
--- /dev/null
+++ b/scilab/modules/xcos/tests/nonreg_tests/bug_13011.tst
@@ -0,0 +1,32 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2013 - Scilab Enterprises - Sylvestre Ledru
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- XCOS TEST -->
+
+// <-- ENGLISH IMPOSED -->
+
+// <-- Non-regression test for bug 13011 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=13011
+//
+// <-- Short Description -->
+// Fails under Mac OS X 10.9
+
+ilib_verbose(0);
+prot = funcprot();
+funcprot(0);
+
+// Stubbing the messagebox method
+function messagebox(msg, msg_title)
+endfunction
+
+funcprot(prot);
+
+importXcosDiagram(SCI+"/modules/xcos/tests/nonreg_tests/bug_12384.zcos");
+xcos_simulate(scs_m, 4);
+