Gui restored to working state

20 files changed, 11 insertions, 48 deletions

diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin
index 30216052..59529769 100644
--- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin
+++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin
diff --git a/2.3-1/macros/CCodeGeneration/C_Type.bin b/2.3-1/macros/CCodeGeneration/C_Type.bin
index 1655c4e9..a18a4112 100644
--- a/2.3-1/macros/CCodeGeneration/C_Type.bin
+++ b/2.3-1/macros/CCodeGeneration/C_Type.bin
diff --git a/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin b/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin
index 88208c94..2d1a99bd 100644
--- a/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin
+++ b/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin
diff --git a/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin b/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin
index 29f9d382..5a434384 100644
--- a/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin
+++ b/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin
diff --git a/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin b/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin
index 4b0e0301..771bad76 100644
--- a/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin
+++ b/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin
diff --git a/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin b/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin
index d46d5be6..e5a6dd8e 100644
--- a/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin
+++ b/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin
diff --git a/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin b/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin
index 607948ca..08a1b5af 100644
--- a/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin
+++ b/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin
diff --git a/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.sci b/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.sci
index 9731af30..7b8826c4 100644
--- a/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.sci
@@ -1,4 +1,4 @@
-function SharedInfo = INIT_GenSharedInfo(RunMode,UserScilabMainFile,TotTempScalarVars,EnableTempVarsReuse,Sci2CLibMainHeaderFName,CopySciCodeIntoCCode,OutputFormat)

+function SharedInfo = INIT_GenSharedInfo(RunMode,UserScilabMainFile,TotTempScalarVars,EnableTempVarsReuse,Sci2CLibMainHeaderFName,CopySciCodeIntoCCode)

 // function SharedInfo = INIT_GenSharedInfo(WorkingDir,OutCCCodeDir,UserSciFilesPaths,...

 //    RunMode,UserScilabMainFile,TotTempScalarVars,EnableTempVarsReuse,Sci2CLibMainHeaderFName)

 // -----------------------------------------------------------------

@@ -115,10 +115,4 @@ SharedInfo.Extension.FuncListClasses     = '.lcls';  // Stands for list class
 // --- Resize Approach. ---

 // ------------------------

 SharedInfo.ResizeApproach = 'NO_RESIZE'; // 'NO_RESIZE', 'RESIZE_ALL', 'RESIZE_TEMP', 'RESIZE_LOCAL', 'RESIZE_GLOBAL', 'REALLOC_ALL_RESIZE_ALL'

-

-//-------------------------

-//--- Output format -------

-//-------------------------

-SharedInfo.OutputFormat = OutputFormat;

-

 endfunction

diff --git a/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin b/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin
index 7cad5391..fef3558e 100644
--- a/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin
+++ b/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin
diff --git a/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin b/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin
index 884ac563..e8c2a050 100644
--- a/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin
+++ b/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin
diff --git a/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin b/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin
index 0ff35b15..acf8236c 100644
--- a/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin
+++ b/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin
diff --git a/2.3-1/macros/ToolInitialization/INIT_SCI2C.sci b/2.3-1/macros/ToolInitialization/INIT_SCI2C.sci
index 99d0f0ff..8b3e5b2f 100644
--- a/2.3-1/macros/ToolInitialization/INIT_SCI2C.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_SCI2C.sci
@@ -1,5 +1,5 @@
 function [FileInfoDatFile,SharedInfoDatFile] = ...

-    INIT_SCI2C(UserScilabMainFile, UserSciFilesPaths, SCI2COutputDir, RunMode, OutputFormat)

+    INIT_SCI2C(UserScilabMainFile, UserSciFilesPaths, SCI2COutputDir, RunMode)

 // function [FileInfoDatFile,SharedInfoDatFile] = INIT_SCI2C(SCI2CInputPrmFile)

 // -----------------------------------------------------------------

 // #RNU_RES_B

@@ -68,7 +68,7 @@ OutCCCodeDir = SCI2CResultDir;
 

 //-- FIXME : MainLibHeader and Verbose mode are (?) configurable

 SharedInfo = INIT_GenSharedInfo(RunMode,UserScilabMainFile, ...

-				TotTempScalarVars,EnableTempVarsReuse,"sci2clib.h", %t,OutputFormat);

+				TotTempScalarVars,EnableTempVarsReuse,"sci2clib.h", %t);

 

 // ----------------------------

 // --- Initialize FileInfo. ---

diff --git a/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin b/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin
index 46781bd1..72dbd5b7 100644
--- a/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin
+++ b/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin
diff --git a/2.3-1/macros/ToolInitialization/ManageNextConversion.bin b/2.3-1/macros/ToolInitialization/ManageNextConversion.bin
index 8fd0220c..ba4cf85f 100644
--- a/2.3-1/macros/ToolInitialization/ManageNextConversion.bin
+++ b/2.3-1/macros/ToolInitialization/ManageNextConversion.bin
diff --git a/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin b/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin
index c916b2e6..8b62bd72 100644
--- a/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin
+++ b/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin
diff --git a/2.3-1/macros/findDeps/getAllHeaders.bin b/2.3-1/macros/findDeps/getAllHeaders.bin
index ce2193a1..7d24b150 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.bin
+++ b/2.3-1/macros/findDeps/getAllHeaders.bin
diff --git a/2.3-1/macros/findDeps/getAllInterfaces.bin b/2.3-1/macros/findDeps/getAllInterfaces.bin
index 7788c2e4..e9133b65 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.bin
+++ b/2.3-1/macros/findDeps/getAllInterfaces.bin
diff --git a/2.3-1/macros/findDeps/getAllSources.bin b/2.3-1/macros/findDeps/getAllSources.bin
index 503b87d5..1d756fb2 100644
--- a/2.3-1/macros/findDeps/getAllSources.bin
+++ b/2.3-1/macros/findDeps/getAllSources.bin
diff --git a/2.3-1/macros/runsci2c.sci b/2.3-1/macros/runsci2c.sci
index a0a84a17..fbdad316 100644
--- a/2.3-1/macros/runsci2c.sci
+++ b/2.3-1/macros/runsci2c.sci
@@ -1,4 +1,4 @@
-function runsci2c(UserScilabMainFile, UserSciFilesPaths, SCI2COutputPath, Runmode, BuildTool, OutputFormat)

+function runsci2c(UserScilabMainFile, UserSciFilesPaths, SCI2COutputPath, Runmode, BuildTool)

 // function runsci2c(SCI2CInputPrmFile)

 // -----------------------------------------------------------------

 // ===         hArtes/PoliBa/GAP SCI2C tool                      ===

@@ -51,7 +51,7 @@ disp(RunSci2CMainDir);
 

 // --- Initialize the SCI2C tool directories and files. ---

 [FileInfoDatFile,SharedInfoDatFile] = INIT_SCI2C(UserScilabMainFile, ...

-						 UserSciFilesPaths, SCI2COutputPath, RunMode, OutputFormat);

+						 UserSciFilesPaths, SCI2COutputPath, RunMode);

 

 // -- Load FileInfo and SharedInfo

 load(SharedInfoDatFile,'SharedInfo');

diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci
index 82b64da3..d922e0b1 100644
--- a/2.3-1/macros/scilab2c.sci
+++ b/2.3-1/macros/scilab2c.sci
@@ -34,8 +34,7 @@ function scilab2c(varargin)
     CCodeOutputDir = varargin(2);
     UserSciFilesPaths = [];
     RunMode = 'All';
-    BuildTool = getNativeBuildTool();
-    OutputFormat = 'StandAlone';
+	BuildTool = getNativeBuildTool();
     //
 // scilab2c(UserScilabMainFile, CCodeOutputDir, UserSciFilesPaths)
 //
@@ -54,8 +53,7 @@ function scilab2c(varargin)
       UserSciFilesPaths = varargin(3);
     end
     RunMode = "All";
-    BuildTool = getNativeBuildTool();
-    OutputFormat = 'StandAlone';
+	BuildTool = getNativeBuildTool();
 	//
 // scilab2c(UserScilabMainFile, CCodeOutputDir, UserSciFilesPaths, RunMode)
 //
@@ -78,9 +76,7 @@ function scilab2c(varargin)
       UserSciFilesPaths = varargin(3);
     end
     RunMode = varargin(4);
-    BuildTool = getNativeBuildTool();
-    OutputFormat = 'StandAlone';
-
+	BuildTool = getNativeBuildTool();
    case 5
 	for i = 1:4
       if typeof(varargin(i)) <> "string"
@@ -104,34 +100,7 @@ function scilab2c(varargin)
       UserSciFilesPaths = varargin(3);
     end
     RunMode = varargin(4);
-    BuildTool = varargin(5);
-    OutputFormat = 'StandAlone';
-
-   case 6
-	for i = 1:4
-      if typeof(varargin(i)) <> "string"
-		error(msprintf(gettext("%s: Wrong type for input argument #%d: String expected.\n"),"scilab2c",i));
-		return
-      end
-    end
-    if varargin(4) <> "All" & varargin(4) <> "Translate" & varargin(4) <> "GenLibraryStructure"
-	  error(msprintf(gettext("%s: argument #%d must be: ""All"", ""Translate"" or ""GenLibraryStructure"".\n"),"scilab2c",4));
-      return
-    end
-	if varargin(5) <> "make" & varargin(5) <> "nmake"
-	  error(msprintf(gettext("%s: argument #%d must be: ""make"" or ""nmake"".\n"),"scilab2c",5));
-      return
-    end
-	UserScilabMainFile = varargin(1);
-    CCodeOutputDir = varargin(2);
-    if varargin(3) == ""
-      UserSciFilesPaths = [];
-    else
-      UserSciFilesPaths = varargin(3);
-    end
-    RunMode = varargin(4);
-    BuildTool = varargin(5);
-    OutputFormat = varargin(6);
+	BuildTool = varargin(5);
   else
 //
 // Calling scilab2c with more than understood values
@@ -152,7 +121,7 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),
   end
   if (userchoice == 1)
 // --- LAUNCH SCI2C ---
-	runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool, OutputFormat);
+	runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool);
   end
 
 endfunction
@@ -163,4 +132,4 @@ function BuildTool = getNativeBuildTool()
   else
 	BuildTool = "make"
   end
-endfunction
+endfunction
\ No newline at end of file