build macros in subdirectory of optimization module

diff --git a/scilab/modules/optimization/etc/optimization.start b/scilab/modules/optimization/etc/optimization.start
index 9ea8588..8e67926 100644 (file)
--- a/scilab/modules/optimization/etc/optimization.start
+++ b/scilab/modules/optimization/etc/optimization.start
@@ -10,6 +10,9 @@
 // Load  functions libraries
 // =============================================================================
 load('SCI/modules/optimization/macros/lib');
+load('SCI/modules/optimization/macros/neldermead/lib');
+load('SCI/modules/optimization/macros/optimbase/lib');
+load('SCI/modules/optimization/macros/optimsimplex/lib');
 
 // Add help chapter
 // =============================================================================

diff --git a/scilab/modules/optimization/macros/buildmacros.sce b/scilab/modules/optimization/macros/buildmacros.sce
index 9111aca..8c28e8d 100644 (file)
--- a/scilab/modules/optimization/macros/buildmacros.sce
+++ b/scilab/modules/optimization/macros/buildmacros.sce
@@ -6,4 +6,7 @@ if (isdef('genlib') == %f) then
 end
 //------------------------------------
 genlib('optimizationlib','SCI/modules/optimization/macros',%f,%t);
+genlib('neldermeadlib','SCI/modules/optimization/macros/neldermead',%f,%t);
+genlib('optimbaselib','SCI/modules/optimization/macros/optimbase',%f,%t);
+genlib('optimsimplexlib','SCI/modules/optimization/macros/optimsimplex',%f,%t);
 //------------------------------------

diff --git a/scilab/modules/optimization/macros/cleanmacros.bat b/scilab/modules/optimization/macros/cleanmacros.bat
index 5079dfd..66c35f8 100644 (file)
--- a/scilab/modules/optimization/macros/cleanmacros.bat
+++ b/scilab/modules/optimization/macros/cleanmacros.bat
@@ -1,3 +1,3 @@
-@del *.bin 2>NUL
-@del lib 2>NUL
-@del names 2>NUL
\ No newline at end of file
+@del *.bin /s 2>NUL
+@del lib /s 2>NUL
+@del names /s 2>NUL
\ No newline at end of file

diff --git a/scilab/modules/optimization/optimization.iss b/scilab/modules/optimization/optimization.iss
index 486c8b0..e7b73a4 100644 (file)
--- a/scilab/modules/optimization/optimization.iss
+++ b/scilab/modules/optimization/optimization.iss
@@ -31,10 +31,10 @@ Source: modules\{#OPTIMIZATION}\includes\*.h; DestDir: {app}\modules\{#OPTIMIZAT
 Source: modules\{#OPTIMIZATION}\macros\buildmacros.sce; DestDir: {app}\modules\{#OPTIMIZATION}\macros; Components: {#COMPN_OPTIM}
 Source: modules\{#OPTIMIZATION}\macros\buildmacros.bat; DestDir: {app}\modules\{#OPTIMIZATION}\macros; Components: {#COMPN_OPTIM}
 Source: modules\{#OPTIMIZATION}\macros\cleanmacros.bat; DestDir: {app}\modules\{#OPTIMIZATION}\macros; Components: {#COMPN_OPTIM}
-Source: modules\{#OPTIMIZATION}\macros\lib; DestDir: {app}\modules\{#OPTIMIZATION}\macros; Components: {#COMPN_OPTIM}
-Source: modules\{#OPTIMIZATION}\macros\names; DestDir: {app}\modules\{#OPTIMIZATION}\macros; Components: {#COMPN_OPTIM}
-Source: modules\{#OPTIMIZATION}\macros\*.bin; DestDir: {app}\modules\{#OPTIMIZATION}\macros; Components: {#COMPN_OPTIM}
-Source: modules\{#OPTIMIZATION}\macros\*.sci; DestDir: {app}\modules\{#OPTIMIZATION}\macros; Components: {#COMPN_OPTIM}
+Source: modules\{#OPTIMIZATION}\macros\lib; DestDir: {app}\modules\{#OPTIMIZATION}\macros;Flags: recursesubdirs; Components: {#COMPN_OPTIM}
+Source: modules\{#OPTIMIZATION}\macros\names; DestDir: {app}\modules\{#OPTIMIZATION}\macros;Flags: recursesubdirs; Components: {#COMPN_OPTIM}
+Source: modules\{#OPTIMIZATION}\macros\*.bin; DestDir: {app}\modules\{#OPTIMIZATION}\macros;Flags: recursesubdirs; Components: {#COMPN_OPTIM}
+Source: modules\{#OPTIMIZATION}\macros\*.sci; DestDir: {app}\modules\{#OPTIMIZATION}\macros;Flags: recursesubdirs; Components: {#COMPN_OPTIM}
 ;
 Source: modules\{#OPTIMIZATION}\demos\*.*; DestDir: {app}\modules\{#OPTIMIZATION}\demos; Flags: recursesubdirs; Components: {#COMPN_OPTIM}
 ;