From de14a5628ad439e20770d10733ebdac46562a860 Mon Sep 17 00:00:00 2001
From: Jorawar Singh
Date: Fri, 7 Jul 2017 13:00:37 +0530
Subject: Raspberry Pi function changes and minor gui changes

---
 etc/scilab2c.start | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'etc/scilab2c.start')

diff --git a/etc/scilab2c.start b/etc/scilab2c.start
index 2f364c68..91a5861e 100644
--- a/etc/scilab2c.start
+++ b/etc/scilab2c.start
@@ -44,10 +44,10 @@ end
 // =============================================================================
 
 if or(getscilabmode() == ["NW";"STD"]) then
-    mprintf("\tLoad demos\n");
+   mprintf("\tLoad demos\n");
    pathdemos = pathconvert(root_tlbx + "/demos/scilab2c.dem.gateway.sce",%f,%t);
 
-//   add_demo(gettext("Scilab2C"),pathdemos);
+   add_demo(gettext("Scilab2C"),pathdemos);
    clear pathdemos ;
 end
 
-- 
cgit 


From 3f52712f806fbd80d66dfdcaff401e5cf94dcca4 Mon Sep 17 00:00:00 2001
From: yash1112
Date: Fri, 7 Jul 2017 21:20:49 +0530
Subject: sci2c arduino updated

---
 etc/scilab2c.start | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 etc/scilab2c.start

(limited to 'etc/scilab2c.start')

diff --git a/etc/scilab2c.start b/etc/scilab2c.start
new file mode 100644
index 00000000..59cf0865
--- /dev/null
+++ b/etc/scilab2c.start
@@ -0,0 +1,62 @@
+// This file is released into the public domain
+
+mprintf("Start Scilab 2 C module\n");
+
+etc_tlbx  = get_absolute_file_path("scilab2c.start");
+etc_tlbx  = getshortpathname(etc_tlbx);
+root_tlbx = strncpy( etc_tlbx, length(etc_tlbx)-length('\etc\') );
+
+//Load  functions library
+// =============================================================================
+pathmacros = pathconvert( root_tlbx ) + 'macros'+ filesep();
+mprintf("\tLoad macros\n");
+sci2c_mainlib            = lib(pathmacros);
+sci2c_ASTManagementlib   = lib(pathmacros + "ASTManagement"      + filesep());
+sci2c_CCodeGenerationlib = lib(pathmacros + "CCodeGeneration"    + filesep());
+sci2c_ErrorMessageslib   = lib(pathmacros + "ErrorMessages"      + filesep());
+sci2c_FunAnnotationlib   = lib(pathmacros + "FunctionAnnotation" + filesep());
+sci2c_FunListlib         = lib(pathmacros + "FunctionList"       + filesep());
+sci2c_GenFunctionslib    = lib(pathmacros + "GeneralFunctions"   + filesep());
+sci2c_SymbolTablelib     = lib(pathmacros + "SymbolTable"        + filesep());
+sci2c_ToolInitlib        = lib(pathmacros + "ToolInitialization" + filesep());
+sci2c_finDeps            = lib(pathmacros + "findDeps"           + filesep());
+sci2c_AVRlib		 	 = lib(pathmacros + "Hardware\AVR"       + filesep());
+sci2c_RPilib		 	 = lib(pathmacros + "Hardware\RasberryPi"+ filesep());
+sci2c_ScilabArduinolib	 = lib(pathmacros + "Scilab-Arduino"     + filesep());
+sci2c_CVCorelib	     	 = lib(pathmacros + "ImageProcessing\core" + filesep());
+sci2c_CVHighguilib    	 = lib(pathmacros + "ImageProcessing\highgui" + filesep());
+sci2c_CVImgproclib	     = lib(pathmacros + "ImageProcessing\imgproc" + filesep());
+clear pathmacros;
+
+// Load and add help chapter
+// =============================================================================
+
+if or(getscilabmode() == ["NW";"STD"]) then
+	mprintf("\tLoad help\n");
+	path_addchapter = pathconvert(root_tlbx+"/jar");
+	if isdir(path_addchapter) then
+		add_help_chapter("Scilab 2 C", path_addchapter, %F);
+	clear add_help_chapter path_addchapter
+	end
+end
+
+// Add demos
+// =============================================================================
+
+if or(getscilabmode() == ["NW";"STD"]) then
+    mprintf("\tLoad demos\n");
+   pathdemos = pathconvert(root_tlbx + "/demos/scilab2c.dem.gateway.sce",%f,%t);
+
+   add_demo(gettext("Scilab2C"),pathdemos);
+   clear pathdemos ;
+end
+
+mprintf("\tVersion: "+getScilab2cVersion()+"\n");
+
+global SCI2CHOME
+SCI2CHOME = root_tlbx;
+clear SCI2CHOME;
+
+// =============================================================================
+clear root_tlbx;
+clear etc_tlbx;
-- 
cgit 


From bd03b38be0918837e147e969c6bb2014900009db Mon Sep 17 00:00:00 2001
From: Brijeshcr
Date: Sat, 8 Jul 2017 20:18:17 +0530
Subject: Revert "SCi2cDeps updated, Windows compatibility resolved"

---
 etc/scilab2c.start | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'etc/scilab2c.start')

diff --git a/etc/scilab2c.start b/etc/scilab2c.start
index ff243e98..91a5861e 100644
--- a/etc/scilab2c.start
+++ b/etc/scilab2c.start
@@ -20,21 +20,12 @@ sci2c_GenFunctionslib    = lib(pathmacros + "GeneralFunctions"   + filesep());
 sci2c_SymbolTablelib     = lib(pathmacros + "SymbolTable"        + filesep());
 sci2c_ToolInitlib        = lib(pathmacros + "ToolInitialization" + filesep());
 sci2c_finDeps            = lib(pathmacros + "findDeps"           + filesep());
-<<<<<<< HEAD
 sci2c_AVRlib	    	 = lib(pathmacros + "Hardware\AVR"       + filesep());
 sci2c_RPilib    		 = lib(pathmacros + "Hardware\RasberryPi"+ filesep());
 sci2c_ScilabArduinolib	 = lib(pathmacros + "Scilab-Arduino"     + filesep());
 sci2c_CVCorelib	     	 = lib(pathmacros + "ImageProcessing\core" + filesep());
 sci2c_CVHighguilib    	 = lib(pathmacros + "ImageProcessing\highgui" + filesep());
 sci2c_CVImgproclib  	 = lib(pathmacros + "ImageProcessing\imgproc" + filesep());
-=======
-sci2c_AVRlib		 	 = lib(pathmacros + "Hardware\AVR"       + filesep());
-sci2c_RPilib		 	 = lib(pathmacros + "Hardware\RasberryPi"+ filesep());
-sci2c_ScilabArduinolib	 = lib(pathmacros + "Scilab-Arduino"     + filesep());
-sci2c_CVCorelib	     	 = lib(pathmacros + "ImageProcessing\core" + filesep());
-sci2c_CVHighguilib    	 = lib(pathmacros + "ImageProcessing\highgui" + filesep());
-sci2c_CVImgproclib	     = lib(pathmacros + "ImageProcessing\imgproc" + filesep());
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 clear pathmacros;
 
 // Load and add help chapter
-- 
cgit