diff options
38 files changed, 117 insertions, 151 deletions
@@ -3,9 +3,9 @@ This is a scilab toolbox to call octave functions. It requires octave to be installed on the system. ## This toolbox has been built and tested using -1. `OS - Linux Debian 10, Ubuntu 18.10 (64-bit)` +1. `OS - Linux Debian 10, Ubuntu 18.10 and 19.10 (64-bit)` 2. `Octave - Version 4.4.1, 5.1.0` -3. `Scilab - Version 6.0.1` +3. `Scilab - Version 6.0.x` ## Software prerequisites: Run the following commands in the linux terminal diff --git a/build.sce b/build.sce deleted file mode 100644 index 29e822b..0000000 --- a/build.sce +++ /dev/null @@ -1,12 +0,0 @@ -try exec unloader.sce -end - -exec cleaner.sce -clear - -try ulink -end - -help_from_sci("macros","help/en_US") -exec builder.sce -exec loader.sce diff --git a/changelog.txt b/changelog.txt index 1ebfa89..0e22697 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,13 +1,6 @@ -changelog of the toolbox_skeleton - -Please update this file to describe the modifications of your toolbox - -A format of change log could be: - - -toolbox_skeleton (version) - * Change 1 - * Change 2 - * ... - -- Author <author@email.com> Tue, 18 Dec 2007 14:50:02 +0100 +Version 0.2 (April 19, 2020) + -Fixed bug in start file + -Toolbox cleanup +Version 0.1 (November 15, 2019) + -Published the first release diff --git a/demos/c_sum.dem.sce b/demos/c_sum.dem.sce deleted file mode 100644 index 68ea6d0..0000000 --- a/demos/c_sum.dem.sce +++ /dev/null @@ -1,16 +0,0 @@ -// -// This file is released under the 3-clause BSD license. See COPYING-BSD. - - -function demo_c_sum() - - mode(-1); - lines(0); - - disp("c_sum(3,4)"); - disp(c_sum(3,4)); - -endfunction - -demo_c_sum(); -clear demo_c_sum; diff --git a/demos/cpp_find.dem.sce b/demos/cpp_find.dem.sce deleted file mode 100644 index 5614737..0000000 --- a/demos/cpp_find.dem.sce +++ /dev/null @@ -1,18 +0,0 @@ -// -// This file is released under the 3-clause BSD license. See COPYING-BSD. - - -function demo_cpp_find() - mode(-1); - lines(0); - - disp("cpp_find(''Scilab is a numerical computational package'',''numerical'')"); - disp("position : " + string(cpp_find("Scilab is a numerical computational package","numerical"))); - disp("cpp_find(''Scilab is a numerical computational package'',''package'')"); - disp("position: " + string(cpp_find("Scilab is a numerical computational package","package"))); - -endfunction - - -demo_cpp_find(); -clear demo_cpp_find;
\ No newline at end of file diff --git a/demos/fortran_sum.dem.sce b/demos/fortran_sum.dem.sce deleted file mode 100644 index de96506..0000000 --- a/demos/fortran_sum.dem.sce +++ /dev/null @@ -1,16 +0,0 @@ -// -// This file is released under the 3-clause BSD license. See COPYING-BSD. - -function demo_fortran_sum() - - mode(-1); - lines(0); - - disp("fortran_sum(3,4)"); - disp(fortran_sum(3,4)); - -endfunction - -demo_fortran_sum(); -clear demo_fortran_sum; - diff --git a/demos/scilab_sum.dem.sce b/demos/scilab_sum.dem.sce deleted file mode 100644 index 6e872aa..0000000 --- a/demos/scilab_sum.dem.sce +++ /dev/null @@ -1,15 +0,0 @@ -// This file is released under the 3-clause BSD license. See COPYING-BSD. - -function demo_scilab_sum() - - mode(-1); - lines(0); - - disp("scilab_sum(3,4)"); - disp(scilab_sum(3,4)); - -endfunction - - -demo_scilab_sum(); -clear demo_scilab_sum;
\ No newline at end of file diff --git a/demos/toolbox_skeleton.dem.gateway.sce b/demos/toolbox_skeleton.dem.gateway.sce deleted file mode 100644 index 09d6bf6..0000000 --- a/demos/toolbox_skeleton.dem.gateway.sce +++ /dev/null @@ -1,17 +0,0 @@ -// -// This file is released under the 3-clause BSD license. See COPYING-BSD. - -function subdemolist = demo_gateway() - demopath = get_absolute_file_path("toolbox_skeleton.dem.gateway.sce"); - - subdemolist = ["sum with Scilab" ,"scilab_sum.dem.sce"; .. - "A c sum " ,"c_sum.dem.sce" ; .. - "The sum with fortran" ,"fortran_sum.dem.sce" ; .. - "A find in cpp" ,"cpp_find.dem.sce" ; ]; - - subdemolist(:,2) = demopath + subdemolist(:,2); - -endfunction - -subdemolist = demo_gateway(); -clear demo_gateway; // remove demo_gateway on stack diff --git a/etc/scilab_toolbox.quit b/etc/scilab_octave.quit index f3ee38e..6851b65 100644 --- a/etc/scilab_toolbox.quit +++ b/etc/scilab_octave.quit @@ -4,7 +4,7 @@ function quitModule() - etc_tlbx = get_absolute_file_path("scilab_toolbox.quit"); + etc_tlbx = get_absolute_file_path("scilab_octave.quit"); etc_tlbx = getshortpathname(etc_tlbx); root_tlbx = strncpy( etc_tlbx, length(etc_tlbx)-length("\etc\") ); diff --git a/etc/scilab_toolbox.start b/etc/scilab_octave.start index d1fc447..05e3dd5 100644 --- a/etc/scilab_toolbox.start +++ b/etc/scilab_octave.start @@ -3,19 +3,19 @@ // This file is released under the 3-clause BSD license. See COPYING-BSD. -function scilab_toolboxlib = startModule() +function scilab_octavelib = startModule() TOOLBOX_NAME = "scilab_octave"; TOOLBOX_TITLE = "scilab_octave"; mprintf("Start " + TOOLBOX_TITLE + "\n"); - if isdef("scilab_toolboxlib") then - warning("scilab_toolbox library is already loaded"); + if isdef("scilab_octavelib") then + warning("scilab_octave library is already loaded"); return; end - etc_tlbx = get_absolute_file_path("scilab_toolbox.start"); + etc_tlbx = get_absolute_file_path("scilab_octave.start"); etc_tlbx = getshortpathname(etc_tlbx); root_tlbx = strncpy( etc_tlbx, length(etc_tlbx)-length("\etc\") ); @@ -23,7 +23,7 @@ function scilab_toolboxlib = startModule() // ============================================================================= mprintf("\tLoad macros\n"); pathmacros = pathconvert( root_tlbx ) + "macros" + filesep(); - scilab_toolboxlib = lib(pathmacros); + scilab_octavelib = lib(pathmacros); // load gateways and Java libraries // ============================================================================= @@ -61,5 +61,5 @@ function scilab_toolboxlib = startModule() endfunction -scilab_toolboxlib = startModule(); +scilab_octavelib = startModule(); clear startModule; // remove startModule on stack diff --git a/help/en_US/master_help.xml b/help/en_US/master_help.xml index 275890c..42de660 100644 --- a/help/en_US/master_help.xml +++ b/help/en_US/master_help.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE book [ <!--Begin Entities--> -<!ENTITY a2ed2d4be3584d8c38302185542e7a55c SYSTEM "/home/rupak/scilab-toolbox/scilab_octave/help/en_US/octave_fun.xml"> +<!ENTITY a2f62ac6eea8f91207887f252e499ff51 SYSTEM "/home/rupak19/scilab-octave-toolbox/fossee-scilab-octave-toolbox/help/en_US/octave_fun.xml"> <!--End Entities--> ]> <book version="5.0-subset Scilab" xml:lang="en_US" @@ -16,8 +16,8 @@ <title>scilab_octave</title> </info> -<part xml:id='section_597319ec0f8f262cff8ce5d679429f35'> +<part xml:id='section_1c1bd9c3fd43e22beeaa17904025e167'> <title>scilab_octave</title> -&a2ed2d4be3584d8c38302185542e7a55c; +&a2f62ac6eea8f91207887f252e499ff51; </part> </book> diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP Binary files differindex f3f4017..171b814 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP diff --git a/help/en_US/scilab_en_US_help/ScilabCaution.png b/help/en_US/scilab_en_US_help/ScilabCaution.png Binary files differindex 98d26d9..77a9f4a 100644 --- a/help/en_US/scilab_en_US_help/ScilabCaution.png +++ b/help/en_US/scilab_en_US_help/ScilabCaution.png diff --git a/help/en_US/scilab_en_US_help/ScilabEdit.png b/help/en_US/scilab_en_US_help/ScilabEdit.png Binary files differindex e3ad3b8..4eb8bb9 100644 --- a/help/en_US/scilab_en_US_help/ScilabEdit.png +++ b/help/en_US/scilab_en_US_help/ScilabEdit.png diff --git a/help/en_US/scilab_en_US_help/ScilabExecute.png b/help/en_US/scilab_en_US_help/ScilabExecute.png Binary files differindex 9bfead1..06716cb 100644 --- a/help/en_US/scilab_en_US_help/ScilabExecute.png +++ b/help/en_US/scilab_en_US_help/ScilabExecute.png diff --git a/help/en_US/scilab_en_US_help/ScilabImportant.png b/help/en_US/scilab_en_US_help/ScilabImportant.png Binary files differindex 7793271..1993bb3 100644 --- a/help/en_US/scilab_en_US_help/ScilabImportant.png +++ b/help/en_US/scilab_en_US_help/ScilabImportant.png diff --git a/help/en_US/scilab_en_US_help/ScilabNote.png b/help/en_US/scilab_en_US_help/ScilabNote.png Binary files differindex d32cffa..04e0e54 100644 --- a/help/en_US/scilab_en_US_help/ScilabNote.png +++ b/help/en_US/scilab_en_US_help/ScilabNote.png diff --git a/help/en_US/scilab_en_US_help/ScilabTip.png b/help/en_US/scilab_en_US_help/ScilabTip.png Binary files differindex d32cffa..04e0e54 100644 --- a/help/en_US/scilab_en_US_help/ScilabTip.png +++ b/help/en_US/scilab_en_US_help/ScilabTip.png diff --git a/help/en_US/scilab_en_US_help/ScilabWarning.png b/help/en_US/scilab_en_US_help/ScilabWarning.png Binary files differindex 98d26d9..77a9f4a 100644 --- a/help/en_US/scilab_en_US_help/ScilabWarning.png +++ b/help/en_US/scilab_en_US_help/ScilabWarning.png diff --git a/help/en_US/scilab_en_US_help/index.html b/help/en_US/scilab_en_US_help/index.html index e39997b..a7bcb41 100644 --- a/help/en_US/scilab_en_US_help/index.html +++ b/help/en_US/scilab_en_US_help/index.html @@ -31,7 +31,7 @@ <h3 class="book-title">scilab_octave</h3> <ul class="list-part"><a name="scilab_octave_manual"></a><div class="info"></div> -<li><a href="section_597319ec0f8f262cff8ce5d679429f35.html" class="part">scilab_octave</a> +<li><a href="section_1c1bd9c3fd43e22beeaa17904025e167.html" class="part">scilab_octave</a> <ul class="list-chapter"><li><a href="octave_fun.html" class="refentry">octave_fun</a> — <span class="refentry-description">Calls an octave function with given inputs and returns the expected output</span></li></ul></li></ul> <br /> diff --git a/help/en_US/scilab_en_US_help/jhelpmap.jhm b/help/en_US/scilab_en_US_help/jhelpmap.jhm index db10acc..f46231d 100644 --- a/help/en_US/scilab_en_US_help/jhelpmap.jhm +++ b/help/en_US/scilab_en_US_help/jhelpmap.jhm @@ -2,6 +2,6 @@ <!DOCTYPE map PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 1.0//EN" "http://java.sun.com/products/javahelp/map_1_0.dtd"> <map version="1.0"> <mapID target="index" url="index.html"/> -<mapID target="section_597319ec0f8f262cff8ce5d679429f35" url="section_597319ec0f8f262cff8ce5d679429f35.html"/> +<mapID target="section_1c1bd9c3fd43e22beeaa17904025e167" url="section_1c1bd9c3fd43e22beeaa17904025e167.html"/> <mapID target="octave_fun" url="octave_fun.html"/> </map>
\ No newline at end of file diff --git a/help/en_US/scilab_en_US_help/jhelptoc.xml b/help/en_US/scilab_en_US_help/jhelptoc.xml index 5eb0f55..0a9d60c 100644 --- a/help/en_US/scilab_en_US_help/jhelptoc.xml +++ b/help/en_US/scilab_en_US_help/jhelptoc.xml @@ -2,7 +2,7 @@ <!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" "http://java.sun.com/products/javahelp/toc_1_0.dtd"> <toc version="1.0"> <tocitem target="index" text="scilab_octave"> -<tocitem target="section_597319ec0f8f262cff8ce5d679429f35" text="scilab_octave"> +<tocitem target="section_1c1bd9c3fd43e22beeaa17904025e167" text="scilab_octave"> <tocitem target="octave_fun" text="octave_fun"/> </tocitem> </tocitem> diff --git a/help/en_US/scilab_en_US_help/octave_fun.html b/help/en_US/scilab_en_US_help/octave_fun.html index d7da7b2..3bff286 100644 --- a/help/en_US/scilab_en_US_help/octave_fun.html +++ b/help/en_US/scilab_en_US_help/octave_fun.html @@ -12,11 +12,11 @@ <div class="manualnavbar"> <table width="100%"><tr> <td width="30%"> - <span class="previous"><a href="section_597319ec0f8f262cff8ce5d679429f35.html"><< scilab_octave</a></span> + <span class="previous"><a href="section_1c1bd9c3fd43e22beeaa17904025e167.html"><< scilab_octave</a></span> </td> <td width="40%" class="center"> - <span class="top"><a href="section_597319ec0f8f262cff8ce5d679429f35.html">scilab_octave</a></span> + <span class="top"><a href="section_1c1bd9c3fd43e22beeaa17904025e167.html">scilab_octave</a></span> </td> <td width="30%" class="next"> @@ -28,7 +28,7 @@ - <span class="path"><a href="index.html">scilab_octave</a> >> <a href="section_597319ec0f8f262cff8ce5d679429f35.html">scilab_octave</a> > octave_fun</span> + <span class="path" dir="ltr"><a href="index.html">scilab_octave</a> >> <a href="section_1c1bd9c3fd43e22beeaa17904025e167.html">scilab_octave</a> > octave_fun</span> <br /><br /> <div class="refnamediv"><h1 class="refname">octave_fun</h1> @@ -94,11 +94,11 @@ <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> <tr> <td width="30%"> - <span class="previous"><a href="section_597319ec0f8f262cff8ce5d679429f35.html"><< scilab_octave</a></span> + <span class="previous"><a href="section_1c1bd9c3fd43e22beeaa17904025e167.html"><< scilab_octave</a></span> </td> <td width="40%" class="center"> - <span class="top"><a href="section_597319ec0f8f262cff8ce5d679429f35.html">scilab_octave</a></span> + <span class="top"><a href="section_1c1bd9c3fd43e22beeaa17904025e167.html">scilab_octave</a></span> </td> <td width="30%" class="next"> diff --git a/help/en_US/scilab_en_US_help/section_597319ec0f8f262cff8ce5d679429f35.html b/help/en_US/scilab_en_US_help/section_1c1bd9c3fd43e22beeaa17904025e167.html index a828712..a6d3f49 100644 --- a/help/en_US/scilab_en_US_help/section_597319ec0f8f262cff8ce5d679429f35.html +++ b/help/en_US/scilab_en_US_help/section_1c1bd9c3fd43e22beeaa17904025e167.html @@ -27,7 +27,7 @@ - <span class="path"><a href="index.html">scilab_octave</a> >> scilab_octave</span> + <span class="path" dir="ltr"><a href="index.html">scilab_octave</a> >> scilab_octave</span> <br /><br /> <h3 class="title-part">scilab_octave</h3> diff --git a/help/en_US/scilab_en_US_help/style.css b/help/en_US/scilab_en_US_help/style.css index 93bd898..edc0b85 100644 --- a/help/en_US/scilab_en_US_help/style.css +++ b/help/en_US/scilab_en_US_help/style.css @@ -68,6 +68,7 @@ h5 { color:#333333; line-height:120%; padding:10px; + direction: ltr; } .literal { @@ -91,12 +92,14 @@ h5 { font-family: monospace; font-size: 100%; color: #32b9b9; + direction: ltr; } .varname { font-family: monospace; font-weight: bold; font-size: 100%; + direction: ltr; } .constant { @@ -130,6 +133,7 @@ a:hover { pre { margin-bottom: 0px; margin-top: 0px; + direction: ltr; } .leftpart { @@ -203,9 +207,10 @@ ul.toc li { /* Top and bottom navigation controls on manual pages --------------------- */ div.manualnavbar { background-color: #F0F0FF; - color: inherit; - padding: 4px; - margin-bottom: 10px; + color: inherit; + padding: 4px; + margin-bottom: 10px; + direction: ltr; } div.manualnavbar .prev { padding-right: 4px; @@ -375,4 +380,7 @@ td.revnumber { vertical-align: top; } - +tr +{ + vertical-align: top; +} diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar Binary files differindex c0b1669..ff4e566 100644 --- a/jar/scilab_en_US_help.jar +++ b/jar/scilab_en_US_help.jar @@ -4,7 +4,7 @@ oldmode = mode(); mode(-1); oldlines = lines()(2); lines(0); try - exec(get_absolute_file_path("loader.sce")+"etc/"+"scilab_toolbox.start"); + exec(get_absolute_file_path("loader.sce")+"etc/"+"scilab_octave.start"); catch [errmsg, tmp, nline, func] = lasterror() msg = "%s: error on line #%d: ""%s""\n" diff --git a/locales/en_US/LC_MESSAGES/scilab_octave.po b/locales/en_US/LC_MESSAGES/scilab_octave.po new file mode 100644 index 0000000..7ba878b --- /dev/null +++ b/locales/en_US/LC_MESSAGES/scilab_octave.po @@ -0,0 +1,35 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: sci_gateway\c\sci_cerror.c:17 +msgid "%s: I'm waiting only one argument.\n" +msgstr "" + +#: sci_gateway\c\sci_cerror.c:22 +#: macros\scilab_error.sci:17 +msgid "%s: Yeah! %d is a good number of arguments but I prefer fail, sorry.\n" +msgstr "" + +#: macros\scilab_error.sci:13 +msgid "%s: I''m waiting for only one argument.\n" +msgstr "" + +msgid "Rectangle" +msgstr "" + +msgid "My Title" +msgstr "" + +msgid "Height" +msgstr "" + +msgid "Width" +msgstr "" + +msgid "Color" +msgstr "" + +msgid "Outline" +msgstr "" diff --git a/locales/fr_FR/LC_MESSAGES/scilab_octave.po b/locales/fr_FR/LC_MESSAGES/scilab_octave.po new file mode 100644 index 0000000..e585710 --- /dev/null +++ b/locales/fr_FR/LC_MESSAGES/scilab_octave.po @@ -0,0 +1,32 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: sci_gateway\c\sci_cerror.c:17 +#: macros\scilab_error.sci:13 +msgid "%s: I'm waiting for only one argument.\n" +msgstr "%s : Je n'attends qu'un seul argument.\n" + +#: sci_gateway\c\sci_cerror.c:22 +#: macros\scilab_error.sci:17 +msgid "%s: Yeah! %d is a good number of arguments but I prefer fail, sorry.\n" +msgstr "%s : Oui ! %d est un bon nombre d'arguments mais je préfère échouer, désolé.\n" + +msgid "Rectangle" +msgstr "Rectangle" + +msgid "My Title" +msgstr "Mon Titre" + +msgid "Height" +msgstr "Hauteur" + +msgid "Width" +msgstr "Largeur" + +msgid "Color" +msgstr "Couleur" + +msgid "Outline" +msgstr "Contour" diff --git a/macros/octave_fun.bin b/macros/octave_fun.bin Binary files differindex ae7dd13..ba7dc3f 100644 --- a/macros/octave_fun.bin +++ b/macros/octave_fun.bin diff --git a/sci_gateway/cpp/builder_gateway_cpp.sce b/sci_gateway/cpp/builder_gateway_cpp.sce index f4747d1..b83ab7a 100644 --- a/sci_gateway/cpp/builder_gateway_cpp.sce +++ b/sci_gateway/cpp/builder_gateway_cpp.sce @@ -5,7 +5,7 @@ // you should have received as part of this distribution. The terms // are also available at // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -// Author: Harpreet Singh, Yash Kataria, Adarsh Shah +// Author: Rupak Rokade // Organization: FOSSEE, IIT Bombay // Email: toolbox@scilab.in @@ -37,20 +37,20 @@ Version = opt(2); //Build_64Bits = %f; if getos()=="Windows" then - third_dir = path_builder+filesep()+'..'+filesep()+'..'+filesep()+'thirdparty'; + + third_dir = path_builder+filesep()+'..'+filesep()+'..'+filesep()+'thirdparty'; lib_base_dir = third_dir + filesep() + 'windows' + filesep() + 'lib' + filesep() + Version + filesep(); - //inc_base_dir = third_dir + filesep() + 'windows' + filesep() + 'include' + filesep() + 'coin'; - inc_base_dir = third_dir + filesep() + 'linux' + filesep() + 'include' + filesep() + 'coin'; + inc_base_dir = third_dir + filesep() + 'linux' + filesep() + 'include'; threads_dir=third_dir + filesep() + 'linux' + filesep() + 'include' + filesep() + 'pthreads-win32'; C_Flags=['-D__USE_DEPRECATED_STACK_FUNCTIONS__ -I -w '+path_builder+' '+ '-I '+inc_base_dir+' '+'-I '+threads_dir+' '] - Linker_Flag = [lib_base_dir+"libcoinblas.lib "+lib_base_dir+"libcoinlapack.lib "+lib_base_dir+"libcoinmumps.lib "+lib_base_dir+"libClp.lib "+lib_base_dir+"libipopt.lib "+lib_base_dir+"libOsi.lib "+lib_base_dir+"libOsiClp.lib "+lib_base_dir+"libCoinUtils.lib "+lib_base_dir+"libCgl.lib "+lib_base_dir+"libOsiSym.lib "+lib_base_dir+"libSym.lib "+lib_base_dir+"libCbcSolver.lib "+lib_base_dir+"libCbc.lib "+lib_base_dir+"libbonmin.lib "+lib_base_dir+"pthreadVC2.lib " ] + Linker_Flag = [lib_base_dir+"liblibraryname.lib"] elseif getos()=="Darwin" then third_dir = path_builder+filesep()+'..'+filesep()+'..'+filesep()+'thirdparty'; lib_base_dir = third_dir + filesep() + 'Mac' + filesep() + 'lib' + filesep() + Version + filesep(); - inc_base_dir = third_dir + filesep() + 'Mac' + filesep() + 'include' + filesep() + 'coin'; + inc_base_dir = third_dir + filesep() + 'linux' + filesep() + 'include'; C_Flags=["-D__USE_DEPRECATED_STACK_FUNCTIONS__ -w -fpermissive -I"+path_builder+" -I"+inc_base_dir+" -Wl,-rpath "+lib_base_dir+" "] - Linker_Flag = ["-L"+lib_base_dir+"libSym"+" "+"-L"+lib_base_dir+"libipopt"+" "+"-L"+lib_base_dir+"libClp"+" "+"-L"+lib_base_dir+"libOsiClp"+" "+"-L"+lib_base_dir+"libCoinUtils" + " "+"-L"+lib_base_dir+"libbonmin" ] + Linker_Flag = ["-L"+lib_base_dir+"liblibraryname"]; else//LINUX @@ -59,19 +59,11 @@ else//LINUX inc_base_dir = third_dir + filesep() + 'linux' + filesep() + 'include'; - //C_Flags=["-w -fpermissive -I"+path_builder+" -I"+inc_base_dir+" -Wl,-rpath="+lib_base_dir+" "+"-std=gnu++11"] - - //C_Flags = ["-D_GLIBCXX_USE_CXX11_ABI=0"+" "+"-Wall -L"+lib_base_dir+" "+ "-Wl,-rpath="+lib_base_dir+" -I"+inc_base_dir+" "+"-I/usr/include/octave-4.4.1/octave/"] C_Flags = ["-I"+inc_base_dir]; -//disp(inc_base_dir) - //Linker_Flag = ["-loctave"+" "+"-loctinterp"+" "+"-L/usr/lib/x86_64-linux-gnu/libqrupdate.so.1"+" "+"-L/usr/lib/x86_64-linux-gnu/libamd.so.2"+" "+"-L/usr/lib/x86_64-linux-gnu/libccolamd.so.2"+" "+"-L/usr/lib/x86_64-linux-gnu/libcolamd.so.2"+" "+"-L/usr/lib/x86_64-linux-gnu/libcholmod.so.3"+" "+"-L/usr/lib/x86_64-linux-gnu/libcolamd.so.2"+" "+"-L/usr/lib/x86_64-linux-gnu/libumfpack.so.5"+" "+"-L/usr/lib/x86_64-linux-gnu/libcxsparse.so.3"+" "+"-L/usr/lib/x86_64-linux-gnu/hdf5/serial/libhdf5.so"+" "+"-Wl,-rpath="+lib_base_dir] - -// Linker_Flag = ["-loctave"+" "+"-loctinterp"+" "+"#-L/usr/lib/x86_64-linux-gnu/libfftw3_threads.so.3"+" "+"-Wl,-rpath="+lib_base_dir] - Linker_Flag = ["-loctave -loctinterp -L" + lib_base_dir + " -lfun -Wl,-rpath="+lib_base_dir] + Linker_Flag = ["-L" + lib_base_dir + " -lfun -Wl,-rpath="+lib_base_dir+" -loctave -loctinterp"] - //Linker_Flag = ["-lutil -g -Wall"+" "+"-L"+lib_base_dir+" " + "-loctave"+" "+ "-loctinterp"] - disp(C_Flags); - disp(Linker_Flag); + //disp(C_Flags); + //disp(Linker_Flag); end diff --git a/sci_gateway/cpp/libscilab_octave.so b/sci_gateway/cpp/libscilab_octave.so Binary files differBinary files differindex e8bea75..229a76c 100755 --- a/sci_gateway/cpp/libscilab_octave.so +++ b/sci_gateway/cpp/libscilab_octave.so diff --git a/src/libfun.so b/src/libfun.so Binary files differindex ab56601..777cb3f 100755 --- a/src/libfun.so +++ b/src/libfun.so diff --git a/src/testfun b/src/testfun Binary files differindex f64961d..5e607f7 100755 --- a/src/testfun +++ b/src/testfun diff --git a/demo.sce b/tests/demo.sce index a5f901e..a5f901e 100644 --- a/demo.sce +++ b/tests/demo.sce diff --git a/thirdparty/linux/lib/x64/libfun.so b/thirdparty/linux/lib/x64/libfun.so Binary files differindex ab56601..777cb3f 100755 --- a/thirdparty/linux/lib/x64/libfun.so +++ b/thirdparty/linux/lib/x64/libfun.so diff --git a/unloader.sce b/unloader.sce index 4d6f6ac..33df55b 100644 --- a/unloader.sce +++ b/unloader.sce @@ -4,7 +4,7 @@ oldmode = mode(); mode(-1); oldlines = lines()(2); lines(0); try - fileQuit = get_absolute_file_path("unloader.sce") + "etc/" + "scilab_toolbox.quit"; + fileQuit = get_absolute_file_path("unloader.sce") + "etc/" + "scilab_octave.quit"; if isfile(fileQuit) then exec(fileQuit); end |
