Bug fixed for GSL library

7 files changed, 50 insertions, 8 deletions

diff --git a/2.3-1/macros/ASTManagement/lib b/2.3-1/macros/ASTManagement/lib
index 67ea09be..8b5224bf 100644
--- a/2.3-1/macros/ASTManagement/lib
+++ b/2.3-1/macros/ASTManagement/lib
@@ -13,7 +13,7 @@
   <macro name="%program_string" file="%program_string.bin" md5="879f4b4f005fd98d8dd1a198e85b4dce"/>
   <macro name="%variable_string" file="%variable_string.bin" md5="be1ccff22e2958638882c809403b2a36"/>
   <macro name="%while_string" file="%while_string.bin" md5="3f9300680176235c78bfc42abbe11715"/>
-  <macro name="AST2Ccode" file="AST2Ccode.bin" md5="15a60b078a7d01b0ef9aa6ba9ea3f0d9"/>
+  <macro name="AST2Ccode" file="AST2Ccode.bin" md5="ef63ed363eb7ed0ab5e3a6d19b3aa8fc"/>
   <macro name="AST_CheckCommonInOutArgs" file="AST_CheckCommonInOutArgs.bin" md5="7be23272bbff9b141535b71c0eefb3b4"/>
   <macro name="AST_CheckLastFunc" file="AST_CheckLastFunc.bin" md5="41af209af677f8fd3c68fd1920a7fcbb"/>
   <macro name="AST_CheckLineLength" file="AST_CheckLineLength.bin" md5="eb2c4ac2671c0cf8df0ed2fe354ac94c"/>
@@ -23,7 +23,7 @@
   <macro name="AST_GetASTFile" file="AST_GetASTFile.bin" md5="46b005d916ff66672d4424fe6c867371"/>
   <macro name="AST_GetFuncallPrm" file="AST_GetFuncallPrm.bin" md5="eae44f2db2aa35208413d2748f4b1eda"/>
   <macro name="AST_GetPrecAndLhsArg" file="AST_GetPrecAndLhsArg.bin" md5="a295fca5ee80625948428f8cccca4728"/>
-  <macro name="AST_HandleEOL" file="AST_HandleEOL.bin" md5="41ac83445b2b86cffcb1d592fd0c7560"/>
+  <macro name="AST_HandleEOL" file="AST_HandleEOL.bin" md5="f409b060684fb927473057b32ef5d7f0"/>
   <macro name="AST_HandleEndFor" file="AST_HandleEndFor.bin" md5="fdbd73e88f395b5af34aaff8f338257a"/>
   <macro name="AST_HandleEndGenFun" file="AST_HandleEndGenFun.bin" md5="df5c68198d63a3359690d0ab672cf062"/>
   <macro name="AST_HandleEndProgram" file="AST_HandleEndProgram.bin" md5="6c15e907c85813690569e22aafe1ad73"/>
diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
index 7dfb4da4..893ec938 100644
--- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
+++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
@@ -78,6 +78,25 @@ else
     PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
 	  PrintStringInfo('LDFLAGS = -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y');
   end 
+
+  //If ode function is used, add libgsl.
+  if(size(SharedInfo.Includelist) <> 0)
+    if((mtlb_strcmp(part(SharedInfo.Includelist(1),1:5),'odefn') == %T))
+      if(target == 'RPi')
+        PrintStringInfo('LDFLAGS = -lgsl -lcblas',FileInfo.MakefileFilename,'file','y','y');
+      else
+        PrintStringInfo('LDFLAGS = -lgsl',FileInfo.MakefileFilename,'file','y','y');
+      end
+        
+    end
+  end
+
+  if (target == 'RPi')
+    PrintStringInfo('LDFLAGS += -llapack -lrefblas -lgfortran -lwiringPi',FileInfo.MakefileFilename,'file','y','y');
+  else
+    PrintStringInfo('LDFLAGS += -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y');
+  end 
+
 	if(SharedInfo.OpenCVUsed == %T)
       PrintStringInfo('LDFLAGS += -lopencv_calib3d -lopencv_contrib -lopencv_features2d -lopencv_flann -lopencv_gpu',FileInfo.MakefileFilename,'file','y','y');
       PrintStringInfo('LDFLAGS += -lopencv_highgui -lopencv_imgproc -lopencv_legacy -lopencv_ml -lopencv_nonfree',FileInfo.MakefileFilename,'file','y','y');
diff --git a/2.3-1/macros/CCodeGeneration/lib b/2.3-1/macros/CCodeGeneration/lib
index 2db4b8c8..28e3346a 100644
--- a/2.3-1/macros/CCodeGeneration/lib
+++ b/2.3-1/macros/CCodeGeneration/lib
@@ -6,7 +6,7 @@
   <macro name="C_GenDeclarations" file="C_GenDeclarations.bin" md5="ee8ec8971503228c9717c5125fce85f3"/>
   <macro name="C_GenerateFunName" file="C_GenerateFunName.bin" md5="085877ab44748da056c79995d3555ec2"/>
   <macro name="C_GenerateLaunchScript" file="C_GenerateLaunchScript.bin" md5="6a7eebd266f6ba252a610a9b6e5e12fe"/>
-  <macro name="C_GenerateMakefile" file="C_GenerateMakefile.bin" md5="2786ec422a65d735cbeef69d14e1e801"/>
+  <macro name="C_GenerateMakefile" file="C_GenerateMakefile.bin" md5="7874d54e825ecb576f9b3e0d9c7d781b"/>
   <macro name="C_GenerateMakefile_msvc" file="C_GenerateMakefile_msvc.bin" md5="d2962ecb30341f5815ddc52e6fc03543"/>
   <macro name="C_GenerateSCI2CHeader" file="C_GenerateSCI2CHeader.bin" md5="0718f257ee598048a8c8c0fcdb06c8fc"/>
   <macro name="C_IfElseBlocks" file="C_IfElseBlocks.bin" md5="78d53c95511b9b46ea8739a177efd631"/>
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index f0a83604..009ff539 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -6527,15 +6527,34 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
 PrintStringInfo('NIN=         1',ClassFileName,'file','y');

 PrintStringInfo('NOUT=         2',ClassFileName,'file','y');

 PrintStringInfo('OUT(1).TP=    ''d''',ClassFileName,'file','y');

-PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= FA_SZ_2(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y');

 PrintStringInfo('OUT(1).SZ(2)= FA_SZ_1(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y');

 PrintStringInfo('OUT(2).TP=    ''d''',ClassFileName,'file','y');

-PrintStringInfo('OUT(2).SZ(1)= FA_SZ_2(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y');

+PrintStringInfo('OUT(2).SZ(1)= FA_SZ_1(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y');

+PrintStringInfo('OUT(2).SZ(2)= FA_SZ_1(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y');

+

+PrintStringInfo('NIN=         3',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         2',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    ''d''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= FA_SZ_2(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= FA_SZ_1(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y');

+PrintStringInfo('OUT(2).TP=    ''d''',ClassFileName,'file','y');

+PrintStringInfo('OUT(2).SZ(1)= FA_SZ_1(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y');

+PrintStringInfo('OUT(2).SZ(2)= FA_SZ_1(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y');

+

+PrintStringInfo('NIN=         4',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         2',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    ''d''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= FA_SZ_2(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= FA_SZ_1(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y');

+PrintStringInfo('OUT(2).TP=    ''d''',ClassFileName,'file','y');

+PrintStringInfo('OUT(2).SZ(1)= FA_SZ_1(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y');

 PrintStringInfo('OUT(2).SZ(2)= FA_SZ_1(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y');

 

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('ss2'+ArgSeparator+'d2d2',ClassFileName,'file','y');

-

+PrintStringInfo('ss2d2d2'+ArgSeparator+'d2d2',ClassFileName,'file','y');

+PrintStringInfo('ss2d2d2d2'+ArgSeparator+'d2d2',ClassFileName,'file','y');

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'lqr'; 

 PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

diff --git a/2.3-1/macros/ToolInitialization/lib b/2.3-1/macros/ToolInitialization/lib
index 4d03bdc5..f92adcd7 100644
--- a/2.3-1/macros/ToolInitialization/lib
+++ b/2.3-1/macros/ToolInitialization/lib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <scilablib name="scilab2clib">
   <macro name="INIT_CreateDirs" file="INIT_CreateDirs.bin" md5="5b23f4434e84d9a783841b3bbd77a8ed"/>
-  <macro name="INIT_FillSCI2LibCDirs" file="INIT_FillSCI2LibCDirs.bin" md5="ee49a61032430fd6560031777c35bc76"/>
+  <macro name="INIT_FillSCI2LibCDirs" file="INIT_FillSCI2LibCDirs.bin" md5="44aca48a3736c5f88da03cea2e948f97"/>
   <macro name="INIT_GenAnnFLFunctions" file="INIT_GenAnnFLFunctions.bin" md5="682d03ac085a9d855a7057ba0a7f539a"/>
   <macro name="INIT_GenFileInfo" file="INIT_GenFileInfo.bin" md5="a4e048fb09778089af4740d69f1bdbe7"/>
   <macro name="INIT_GenLibraries" file="INIT_GenLibraries.bin" md5="f839fe378df2a79345c693ad0a1a6ed5"/>
diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index b7f26b33..dd8b7e1c 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -247,4 +247,8 @@ function allHeaders = getAllHeaders(SharedInfo)
       allHeaders = cat(1,allHeaders,OpenCV_headers);
   end
 
+  if((mtlb_strcmp(part(SharedInfo.Includelist(1),1:5),'odefn') == %T))
+  	allHeaders = cat(1,allHeaders,"thirdparty/includes/GSL");
+  end
+
 endfunction
diff --git a/2.3-1/macros/findDeps/lib b/2.3-1/macros/findDeps/lib
index a49dc793..d426d8cd 100644
--- a/2.3-1/macros/findDeps/lib
+++ b/2.3-1/macros/findDeps/lib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <scilablib name="scilab2clib">
   <macro name="findDeps" file="findDeps.bin" md5="84601fa84fc20d60cf13a314f416eb7a"/>
-  <macro name="getAllHeaders" file="getAllHeaders.bin" md5="8e21ae3669d6db632552aba41eb23170"/>
+  <macro name="getAllHeaders" file="getAllHeaders.bin" md5="3c63954ca20ef81c5d932af02322fec4"/>
   <macro name="getAllInterfaces" file="getAllInterfaces.bin" md5="9d04a03e4f869830242dcc4172a5ab96"/>
   <macro name="getAllLibraries" file="getAllLibraries.bin" md5="66f2a3077700b6a833c7256fcb1a8c9c"/>
   <macro name="getAllSources" file="getAllSources.bin" md5="3f7100c25098af239631246751f666c9"/>