install: install scilab legacy api header files 88/14588/6
Simon Marchetto [Wed, 28 May 2014 16:29:32 +0000 (18:29 +0200)]
Change-Id: I9ff00f6cf816f47fc37ee1c3e33dcb1760de9963

95 files changed:
scilab/bin/bin.iss
scilab/contrib/Makefile.am
scilab/contrib/Makefile.in
scilab/contrib/toolbox_skeleton.iss
scilab/contrib/toolbox_skeleton/toolbox_skeleton_redist.iss
scilab/libs/libs.iss
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/api_scilab.iss
scilab/modules/arnoldi/arnoldi.iss
scilab/modules/ast/Makefile.am
scilab/modules/ast/Makefile.in
scilab/modules/ast/ast.iss
scilab/modules/atoms/atoms.iss
scilab/modules/cacsd/cacsd.iss
scilab/modules/compatibility_functions/compatibility_functions.iss
scilab/modules/completion/completion.iss
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/core.iss
scilab/modules/data_structures/data_structures.iss
scilab/modules/demo_tools/demo_tools.iss
scilab/modules/development_tools/development_tools.iss
scilab/modules/differential_equations/differential_equations.iss
scilab/modules/dynamic_link/dynamic_link.iss
scilab/modules/dynamic_link/macros/ilib_build.sci
scilab/modules/dynamic_link/macros/ilib_compile.sci
scilab/modules/elementary_functions/elementary_functions.iss
scilab/modules/external_objects/external_objects.iss
scilab/modules/external_objects/macros/!_deff_wrapper.sci [new file with mode: 0644]
scilab/modules/external_objects/macros/buildmacros.bat
scilab/modules/fileio/fileio.iss
scilab/modules/functions/functions.iss
scilab/modules/genetic_algorithms/genetic_algorithms.iss
scilab/modules/graphics/graphics.iss
scilab/modules/gui/gui.iss
scilab/modules/helptools/helptools.iss
scilab/modules/history_manager/history_manager.iss
scilab/modules/integer/integer.iss
scilab/modules/interpolation/interpolation.iss
scilab/modules/io/io.iss
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/jvm.iss
scilab/modules/linear_algebra/linear_algebra.iss
scilab/modules/m2sci/m2sci.iss
scilab/modules/matio/matio.iss
scilab/modules/modules_manager/modules_manager.iss
scilab/modules/operations/Makefile.am
scilab/modules/operations/Makefile.in
scilab/modules/operations/macros/cleanmacros.bat [new file with mode: 0644]
scilab/modules/operations/operations.iss
scilab/modules/optimization/optimization.iss
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/output_stream.iss
scilab/modules/overloading/overloading.iss
scilab/modules/parameters/parameters.iss
scilab/modules/parse/Makefile.am
scilab/modules/parse/Makefile.in
scilab/modules/parse/parse.iss
scilab/modules/polynomials/polynomials.iss
scilab/modules/preferences/preferences.iss
scilab/modules/randlib/randlib.iss
scilab/modules/scicos/scicos.iss
scilab/modules/scicos_blocks/scicos_blocks.iss
scilab/modules/scinotes/scinotes.iss
scilab/modules/signal_processing/signal_processing.iss
scilab/modules/simulated_annealing/simulated_annealing.iss
scilab/modules/sound/sound.iss
scilab/modules/sparse/sparse.iss
scilab/modules/special_functions/special_functions.iss
scilab/modules/spreadsheet/spreadsheet.iss
scilab/modules/statistics/statistics.iss
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/string.iss
scilab/modules/symbol/Makefile.am
scilab/modules/symbol/Makefile.in
scilab/modules/symbol/symbol.iss [new file with mode: 0644]
scilab/modules/system_env/Makefile.am
scilab/modules/system_env/Makefile.in
scilab/modules/system_env/system_env.iss
scilab/modules/tclsci/tclsci.iss
scilab/modules/threads/Makefile.am
scilab/modules/threads/Makefile.in
scilab/modules/time/time.iss
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/types/types.iss
scilab/modules/umfpack/umfpack.iss
scilab/modules/windows_tools/windows_tools.iss
scilab/modules/xcos/xcos.iss
scilab/tools/innosetup/files.iss

index 70fe09c..a24ee45 100644 (file)
@@ -42,22 +42,12 @@ Source: bin\libintl.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\GNU_gettext.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
 
-;YaSp files
-Source: bin\ast.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\ast-tools.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\operations.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\functions_manager.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\symbol.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\types.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\system_env.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\parse.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-;
-
 Source: bin\zlib1.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\GetWindowsVersion.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\lapack.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\libf2c.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\scilab_windows.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\scilab_windows.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\libxml2.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\libcurl.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\pcre.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
@@ -66,7 +56,6 @@ Source: bin\pcreposix.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\libf2c.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\lapack.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
-Source: bin\scilab_windows.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
 Source: bin\Scilex.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\WScilex.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
index c36b65f..b9eff7c 100644 (file)
@@ -45,7 +45,12 @@ toolbox_skeleton/readme.txt \
 toolbox_skeleton/sci_gateway/builder_gateway.sce \
 toolbox_skeleton/sci_gateway/c/builder_gateway_c.sce \
 toolbox_skeleton/sci_gateway/cpp/builder_gateway_cpp.sce \
+toolbox_skeleton/sci_gateway/cpp/sci_cpperror.cpp \
 toolbox_skeleton/sci_gateway/cpp/sci_cpp_find.cxx \
+toolbox_skeleton/sci_gateway/cpp/sci_cppfoo.cpp \
+toolbox_skeleton/sci_gateway/cpp/sci_cppmultiplybypi.cpp \
+toolbox_skeleton/sci_gateway/cpp/sci_cppsub.cpp \
+toolbox_skeleton/sci_gateway/cpp/sci_cppsum.cpp \
 toolbox_skeleton/sci_gateway/c/sci_cerror.c \
 toolbox_skeleton/sci_gateway/c/sci_csub.c \
 toolbox_skeleton/sci_gateway/c/sci_csum.c \
index 20e4696..89db80a 100644 (file)
@@ -455,7 +455,12 @@ toolbox_skeleton/readme.txt \
 toolbox_skeleton/sci_gateway/builder_gateway.sce \
 toolbox_skeleton/sci_gateway/c/builder_gateway_c.sce \
 toolbox_skeleton/sci_gateway/cpp/builder_gateway_cpp.sce \
+toolbox_skeleton/sci_gateway/cpp/sci_cpperror.cpp \
 toolbox_skeleton/sci_gateway/cpp/sci_cpp_find.cxx \
+toolbox_skeleton/sci_gateway/cpp/sci_cppfoo.cpp \
+toolbox_skeleton/sci_gateway/cpp/sci_cppmultiplybypi.cpp \
+toolbox_skeleton/sci_gateway/cpp/sci_cppsub.cpp \
+toolbox_skeleton/sci_gateway/cpp/sci_cppsum.cpp \
 toolbox_skeleton/sci_gateway/c/sci_cerror.c \
 toolbox_skeleton/sci_gateway/c/sci_csub.c \
 toolbox_skeleton/sci_gateway/c/sci_csum.c \
index 575c581..4d25d27 100644 (file)
@@ -41,6 +41,11 @@ Source: contrib\{#TOOLBOX_SKELETON}\sci_gateway\c\sci_multiplybypi.c; DestDir: {
 Source: contrib\{#TOOLBOX_SKELETON}\sci_gateway\c\sci_foo.c; DestDir: {app}\contrib\{#TOOLBOX_SKELETON}\sci_gateway\c; Components: {#COMPN_TOOLBOX_SKELETON}
 Source: contrib\{#TOOLBOX_SKELETON}\sci_gateway\c\sci_cerror.c; DestDir: {app}\contrib\{#TOOLBOX_SKELETON}\sci_gateway\c; Components: {#COMPN_TOOLBOX_SKELETON}
 Source: contrib\{#TOOLBOX_SKELETON}\sci_gateway\cpp\sci_cpp_find.cxx; DestDir: {app}\contrib\{#TOOLBOX_SKELETON}\sci_gateway\cpp; Components: {#COMPN_TOOLBOX_SKELETON}
+Source: contrib\{#TOOLBOX_SKELETON}\sci_gateway\cpp\sci_cpperror.cpp; DestDir: {app}\contrib\{#TOOLBOX_SKELETON}\sci_gateway\cpp; Components: {#COMPN_TOOLBOX_SKELETON}
+Source: contrib\{#TOOLBOX_SKELETON}\sci_gateway\cpp\sci_cppfoo.cpp; DestDir: {app}\contrib\{#TOOLBOX_SKELETON}\sci_gateway\cpp; Components: {#COMPN_TOOLBOX_SKELETON}
+Source: contrib\{#TOOLBOX_SKELETON}\sci_gateway\cpp\sci_cppmultiplybypi.cpp; DestDir: {app}\contrib\{#TOOLBOX_SKELETON}\sci_gateway\cpp; Components: {#COMPN_TOOLBOX_SKELETON}
+Source: contrib\{#TOOLBOX_SKELETON}\sci_gateway\cpp\sci_cppsub.cpp; DestDir: {app}\contrib\{#TOOLBOX_SKELETON}\sci_gateway\cpp; Components: {#COMPN_TOOLBOX_SKELETON}
+Source: contrib\{#TOOLBOX_SKELETON}\sci_gateway\cpp\sci_cppsum.cpp; DestDir: {app}\contrib\{#TOOLBOX_SKELETON}\sci_gateway\cpp; Components: {#COMPN_TOOLBOX_SKELETON}
 Source: contrib\{#TOOLBOX_SKELETON}\sci_gateway\cpp\builder_gateway_cpp.sce; DestDir: {app}\contrib\{#TOOLBOX_SKELETON}\sci_gateway\cpp; Components: {#COMPN_TOOLBOX_SKELETON}
 Source: contrib\{#TOOLBOX_SKELETON}\sci_gateway\fortran\builder_gateway_fortran.sce; DestDir: {app}\contrib\{#TOOLBOX_SKELETON}\sci_gateway\fortran; Components: {#COMPN_TOOLBOX_SKELETON}
 Source: contrib\{#TOOLBOX_SKELETON}\sci_gateway\fortran\sci_fsum.c; DestDir: {app}\contrib\{#TOOLBOX_SKELETON}\sci_gateway\fortran; Components: {#COMPN_TOOLBOX_SKELETON}
index af30fdb..5414ff8 100644 (file)
@@ -37,7 +37,7 @@ Source: macros\buildmacros.sce; DestDir: {app}\macros
 Source: macros\lib; DestDir: {app}\macros
 ;Source: macros\names; DestDir: {app}\macros
 Source: macros\*.sci; DestDir: {app}\macros
-;Source: macros\*.bin; DestDir: {app}\macros
+Source: macros\*.bin; DestDir: {app}\macros
 Source: sci_gateway\loader_gateway.sce; DestDir: {app}\sci_gateway
 Source: sci_gateway\c\loader.sce; DestDir: {app}\sci_gateway\c
 Source: sci_gateway\c\skeleton_c.dll; DestDir: {app}\sci_gateway\c
index b5ccbae..d4af6e8 100644 (file)
@@ -14,4 +14,7 @@ Source: libs\f2c\f2c.h; DestDir: {app}\libs\f2c; Components: {#COMPN_SCILAB}
 ;
 ; intl used by localization
 Source: libs\intl\*.h; DestDir: {app}\libs\intl; Components: {#COMPN_SCILAB}
+
+; Eigen used by localization
+Source: libs\Eigen\*.*; DestDir: {app}\libs\Eigen; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 ;
index 6a90ff8..286187b 100644 (file)
@@ -103,6 +103,20 @@ includes/api_sparse.h \
 includes/api_string.h \
 includes/api_handle.h \
 includes/api_optional.h \
-includes/api_scilab.h
+includes/api_scilab.h \
+includes/dynlib_api_scilab.h \
+includes/api_boolean.hxx \
+includes/api_common.hxx \
+includes/api_double.hxx \
+includes/api_handle.hxx \
+includes/api_int.hxx \
+includes/api_list.hxx \
+includes/api_pointer.hxx \
+includes/api_scilab.hxx \
+includes/api_sparse.hxx \
+includes/api_string.hxx \
+includes/api_variable.hxx \
+includes/overload.hxx
+
 
 include $(top_srcdir)/Makefile.incl.am
index 5fb7918..333a925 100644 (file)
@@ -640,7 +640,20 @@ includes/api_sparse.h \
 includes/api_string.h \
 includes/api_handle.h \
 includes/api_optional.h \
-includes/api_scilab.h
+includes/api_scilab.h \
+includes/dynlib_api_scilab.h \
+includes/api_boolean.hxx \
+includes/api_common.hxx \
+includes/api_double.hxx \
+includes/api_handle.hxx \
+includes/api_int.hxx \
+includes/api_list.hxx \
+includes/api_pointer.hxx \
+includes/api_scilab.hxx \
+includes/api_sparse.hxx \
+includes/api_string.hxx \
+includes/api_variable.hxx \
+includes/overload.hxx
 
 
 # Where all the Scilab stuff is installed (macros, help, ...)
index bd15e8e..31f7998 100644 (file)
@@ -22,7 +22,7 @@ Source: bin\{#API_SCILAB}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#API_SCILAB}\license.txt; DestDir: {app}\modules\{#API_SCILAB}; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#API_SCILAB}\includes\*.h; DestDir: {app}\modules\{#API_SCILAB}\includes; Components: {#COMPN_SCILAB}
+Source: modules\{#API_SCILAB}\includes\*.h*; DestDir: {app}\modules\{#API_SCILAB}\includes; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#API_SCILAB}\etc\{#API_SCILAB}.quit; DestDir: {app}\modules\{#API_SCILAB}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#API_SCILAB}\etc\{#API_SCILAB}.start; DestDir: {app}\modules\{#API_SCILAB}\etc; Components: {#COMPN_SCILAB}
index b8dc14e..bb78989 100644 (file)
@@ -30,6 +30,7 @@ Source: modules\{#ARNOLDI}\etc\{#ARNOLDI}.quit; DestDir: {app}\modules\{#ARNOLDI
 Source: modules\{#ARNOLDI}\etc\{#ARNOLDI}.start; DestDir: {app}\modules\{#ARNOLDI}\etc; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#ARNOLDI}\macros\*.sci; DestDir: {app}\modules\{#ARNOLDI}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#ARNOLDI}\macros\*.bin; DestDir: {app}\modules\{#ARNOLDI}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#ARNOLDI}\macros\buildmacros.sce; DestDir: {app}\modules\{#ARNOLDI}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#ARNOLDI}\macros\buildmacros.bat; DestDir: {app}\modules\{#ARNOLDI}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#ARNOLDI}\macros\cleanmacros.bat; DestDir: {app}\modules\{#ARNOLDI}\macros; Components: {#COMPN_SCILAB}
index e59d23c..4e51b42 100644 (file)
@@ -57,4 +57,78 @@ libsciast_la_etcdir = $(mydatadir)/etc
 libsciast_la_etc_DATA = etc/ast.quit etc/ast.start
 
 
+#### ast : include files ####
+libsciast_scilab_la_includedir=$(pkgincludedir)
+libsciast_scilab_la_include_HEADERS = \
+includes/exps/alldec.hxx \
+includes/exps/allexp.hxx \
+includes/exps/all.hxx \
+includes/exps/allvar.hxx \
+includes/exps/anydecs.hxx \
+includes/exps/arraylistexp.hxx \
+includes/exps/arraylistvar.hxx \
+includes/exps/assignexp.hxx \
+includes/exps/assignlistexp.hxx \
+includes/exps/ast.hxx \
+includes/exps/boolexp.hxx \
+includes/exps/breakexp.hxx \
+includes/exps/callexp.hxx \
+includes/exps/caseexp.hxx \
+includes/exps/cellcallexp.hxx \
+includes/exps/cellexp.hxx \
+includes/exps/colonvar.hxx \
+includes/exps/commentexp.hxx \
+includes/exps/constexp.hxx \
+includes/exps/continueexp.hxx \
+includes/exps/controlexp.hxx \
+includes/exps/dec.hxx \
+includes/exps/decls.hxx \
+includes/exps/decs.hxx \
+includes/exps/dollarvar.hxx \
+includes/exps/doubleexp.hxx \
+includes/exps/exp.hxx \
+includes/exps/fieldexp.hxx \
+includes/exps/floatexp.hxx \
+includes/exps/forexp.hxx \
+includes/exps/functiondec.hxx \
+includes/exps/ifexp.hxx \
+includes/exps/intexp.hxx \
+includes/exps/listexp.hxx \
+includes/exps/location.hxx \
+includes/exps/logicalopexp.hxx \
+includes/exps/mathexp.hxx \
+includes/exps/matrixexp.hxx \
+includes/exps/matrixlineexp.hxx \
+includes/exps/nilexp.hxx \
+includes/exps/notexp.hxx \
+includes/exps/opexp.hxx \
+includes/exps/returnexp.hxx \
+includes/exps/selectexp.hxx \
+includes/exps/seqexp.hxx \
+includes/exps/simplevar.hxx \
+includes/exps/stringexp.hxx \
+includes/exps/token.hxx \
+includes/exps/transposeexp.hxx \
+includes/exps/trycatchexp.hxx \
+includes/exps/vardec.hxx \
+includes/exps/var.hxx \
+includes/exps/whileexp.hxx \
+includes/debugvisitor.hxx \
+includes/deserializervisitor.hxx \
+includes/dummyvisitor.hxx \
+includes/dynlib_ast_tools.hxx \
+includes/execvisitor.hxx \
+includes/expHistory.hxx \
+includes/macrovarvisitor.hxx \
+includes/mutevisitor.hxx \
+includes/printvisitor.hxx \
+includes/runvisitor.hxx \
+includes/scilabexception.hxx \
+includes/serializervisitor.hxx \
+includes/shortcutvisitor.hxx \
+includes/stepvisitor.hxx \
+includes/timedvisitor.hxx \
+includes/visitor.hxx \
+includes/visitor_common.hxx
+
 include $(top_srcdir)/Makefile.incl.am
index 16cb053..584e9e1 100644 (file)
@@ -98,7 +98,8 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(top_srcdir)/Makefile.incl.am $(srcdir)/Makefile.in \
        $(srcdir)/Makefile.am $(top_srcdir)/config/mkinstalldirs \
-       $(top_srcdir)/config/depcomp $(libsciast_la_include_HEADERS)
+       $(top_srcdir)/config/depcomp $(libsciast_la_include_HEADERS) \
+       $(libsciast_scilab_la_include_HEADERS)
 @NEED_JAVA_TRUE@am__append_1 = java
 subdir = modules/ast
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -154,7 +155,8 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libsciast_la_etcdir)" \
-       "$(DESTDIR)$(libsciast_la_includedir)"
+       "$(DESTDIR)$(libsciast_la_includedir)" \
+       "$(DESTDIR)$(libsciast_scilab_la_includedir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libsciast_la_LIBADD =
 am__dirstamp = $(am__leading_dot)dirstamp
@@ -214,7 +216,8 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 DATA = $(libsciast_la_etc_DATA)
-HEADERS = $(libsciast_la_include_HEADERS)
+HEADERS = $(libsciast_la_include_HEADERS) \
+       $(libsciast_scilab_la_include_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -560,6 +563,81 @@ modulename = ast
 libsciast_la_etcdir = $(mydatadir)/etc
 libsciast_la_etc_DATA = etc/ast.quit etc/ast.start
 
+#### ast : include files ####
+libsciast_scilab_la_includedir = $(pkgincludedir)
+libsciast_scilab_la_include_HEADERS = \
+includes/exps/alldec.hxx \
+includes/exps/allexp.hxx \
+includes/exps/all.hxx \
+includes/exps/allvar.hxx \
+includes/exps/anydecs.hxx \
+includes/exps/arraylistexp.hxx \
+includes/exps/arraylistvar.hxx \
+includes/exps/assignexp.hxx \
+includes/exps/assignlistexp.hxx \
+includes/exps/ast.hxx \
+includes/exps/boolexp.hxx \
+includes/exps/breakexp.hxx \
+includes/exps/callexp.hxx \
+includes/exps/caseexp.hxx \
+includes/exps/cellcallexp.hxx \
+includes/exps/cellexp.hxx \
+includes/exps/colonvar.hxx \
+includes/exps/commentexp.hxx \
+includes/exps/constexp.hxx \
+includes/exps/continueexp.hxx \
+includes/exps/controlexp.hxx \
+includes/exps/dec.hxx \
+includes/exps/decls.hxx \
+includes/exps/decs.hxx \
+includes/exps/dollarvar.hxx \
+includes/exps/doubleexp.hxx \
+includes/exps/exp.hxx \
+includes/exps/fieldexp.hxx \
+includes/exps/floatexp.hxx \
+includes/exps/forexp.hxx \
+includes/exps/functiondec.hxx \
+includes/exps/ifexp.hxx \
+includes/exps/intexp.hxx \
+includes/exps/listexp.hxx \
+includes/exps/location.hxx \
+includes/exps/logicalopexp.hxx \
+includes/exps/mathexp.hxx \
+includes/exps/matrixexp.hxx \
+includes/exps/matrixlineexp.hxx \
+includes/exps/nilexp.hxx \
+includes/exps/notexp.hxx \
+includes/exps/opexp.hxx \
+includes/exps/returnexp.hxx \
+includes/exps/selectexp.hxx \
+includes/exps/seqexp.hxx \
+includes/exps/simplevar.hxx \
+includes/exps/stringexp.hxx \
+includes/exps/token.hxx \
+includes/exps/transposeexp.hxx \
+includes/exps/trycatchexp.hxx \
+includes/exps/vardec.hxx \
+includes/exps/var.hxx \
+includes/exps/whileexp.hxx \
+includes/debugvisitor.hxx \
+includes/deserializervisitor.hxx \
+includes/dummyvisitor.hxx \
+includes/dynlib_ast_tools.hxx \
+includes/execvisitor.hxx \
+includes/expHistory.hxx \
+includes/macrovarvisitor.hxx \
+includes/mutevisitor.hxx \
+includes/printvisitor.hxx \
+includes/runvisitor.hxx \
+includes/scilabexception.hxx \
+includes/serializervisitor.hxx \
+includes/shortcutvisitor.hxx \
+includes/stepvisitor.hxx \
+includes/timedvisitor.hxx \
+includes/visitor.hxx \
+includes/visitor_common.hxx
+
+
 # Where all the Scilab stuff is installed (macros, help, ...)
 mydatadir = $(pkgdatadir)/modules/$(modulename)
 
@@ -883,6 +961,27 @@ uninstall-libsciast_la_includeHEADERS:
        @list='$(libsciast_la_include_HEADERS)'; test -n "$(libsciast_la_includedir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(libsciast_la_includedir)'; $(am__uninstall_files_from_dir)
+install-libsciast_scilab_la_includeHEADERS: $(libsciast_scilab_la_include_HEADERS)
+       @$(NORMAL_INSTALL)
+       @list='$(libsciast_scilab_la_include_HEADERS)'; test -n "$(libsciast_scilab_la_includedir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libsciast_scilab_la_includedir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libsciast_scilab_la_includedir)" || exit 1; \
+       fi; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libsciast_scilab_la_includedir)'"; \
+         $(INSTALL_HEADER) $$files "$(DESTDIR)$(libsciast_scilab_la_includedir)" || exit $$?; \
+       done
+
+uninstall-libsciast_scilab_la_includeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(libsciast_scilab_la_include_HEADERS)'; test -n "$(libsciast_scilab_la_includedir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       dir='$(DESTDIR)$(libsciast_scilab_la_includedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(am__tagged_files)
        $(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -971,7 +1070,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local
 installdirs:
-       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciast_la_etcdir)" "$(DESTDIR)$(libsciast_la_includedir)"; do \
+       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciast_la_etcdir)" "$(DESTDIR)$(libsciast_la_includedir)" "$(DESTDIR)$(libsciast_scilab_la_includedir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-am
@@ -1030,7 +1129,8 @@ info: info-am
 info-am:
 
 install-data-am: install-data-local install-libsciast_la_etcDATA \
-       install-libsciast_la_includeHEADERS
+       install-libsciast_la_includeHEADERS \
+       install-libsciast_scilab_la_includeHEADERS
 
 install-dvi: install-dvi-am
 
@@ -1078,6 +1178,7 @@ ps-am:
 
 uninstall-am: uninstall-libsciast_la_etcDATA \
        uninstall-libsciast_la_includeHEADERS \
+       uninstall-libsciast_scilab_la_includeHEADERS \
        uninstall-pkglibLTLIBRARIES
 
 .MAKE: check-am install-am install-strip
@@ -1092,14 +1193,17 @@ uninstall-am: uninstall-libsciast_la_etcDATA \
        install-exec-am install-html install-html-am \
        install-html-local install-info install-info-am \
        install-libsciast_la_etcDATA \
-       install-libsciast_la_includeHEADERS install-man install-pdf \
-       install-pdf-am install-pkglibLTLIBRARIES install-ps \
-       install-ps-am install-strip installcheck installcheck-am \
-       installdirs maintainer-clean maintainer-clean-generic \
-       mostlyclean mostlyclean-compile mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-       uninstall-am uninstall-libsciast_la_etcDATA \
+       install-libsciast_la_includeHEADERS \
+       install-libsciast_scilab_la_includeHEADERS install-man \
+       install-pdf install-pdf-am install-pkglibLTLIBRARIES \
+       install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags tags-am uninstall uninstall-am \
+       uninstall-libsciast_la_etcDATA \
        uninstall-libsciast_la_includeHEADERS \
+       uninstall-libsciast_scilab_la_includeHEADERS \
        uninstall-pkglibLTLIBRARIES
 
 
index bd32a87..faf848b 100644 (file)
@@ -24,6 +24,9 @@ Source: bin\{#AST}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\{#AST_TOOLS}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\{#AST_TOOLS}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
+Source: modules\{#AST}\includes\*.*; DestDir: {app}\modules\{#AST}\includes; Components: {#COMPN_SCILAB}
+Source: modules\{#AST}\includes\exps\*.*; DestDir: {app}\modules\{#AST}\includes\exps; Components: {#COMPN_SCILAB}
+;
 Source: modules\{#AST}\etc\{#AST}.quit; DestDir: {app}\modules\{#AST}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#AST}\etc\{#AST}.start; DestDir: {app}\modules\{#AST}\etc; Components: {#COMPN_SCILAB}
 ;
index ea8ebbe..a4f2df2 100644 (file)
@@ -28,6 +28,7 @@ Source: modules\{#ATOMS}\images\icons\16x16\status\*.png; DestDir: {app}\modules
 ;
 Source: modules\{#ATOMS}\macros\lib; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#ATOMS}\macros\*.sci; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#ATOMS}\macros\*.bin; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#ATOMS}\macros\buildmacros.sce; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#ATOMS}\macros\buildmacros.bat; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#ATOMS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
index ff7b9eb..6455841 100644 (file)
@@ -31,6 +31,7 @@ Source: modules\{#CACSD}\etc\{#CACSD}.start; DestDir: {app}\modules\{#CACSD}\etc
 ;
 Source: modules\{#CACSD}\macros\lib; DestDir: {app}\modules\{#CACSD}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#CACSD}\macros\*.sci; DestDir: {app}\modules\{#CACSD}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#CACSD}\macros\*.bin; DestDir: {app}\modules\{#CACSD}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#CACSD}\macros\buildmacros.sce; DestDir: {app}\modules\{#CACSD}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#CACSD}\macros\buildmacros.bat; DestDir: {app}\modules\{#CACSD}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#CACSD}\macros\cleanmacros.bat; DestDir: {app}\modules\{#CACSD}\macros; Components: {#COMPN_SCILAB}
index ef273b4..449cb6e 100644 (file)
@@ -25,6 +25,7 @@ Source: modules\{#COMPATFUNCTIONS}\etc\{#COMPATFUNCTIONS}.start; DestDir: {app}\
 ;
 Source: modules\{#COMPATFUNCTIONS}\macros\lib; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#COMPATFUNCTIONS}\macros\*.sci; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#COMPATFUNCTIONS}\macros\*.bin; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#COMPATFUNCTIONS}\macros\buildmacros.sce; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#COMPATFUNCTIONS}\macros\buildmacros.bat; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#COMPATFUNCTIONS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_SCILAB}
index 8357bb8..985cfcd 100644 (file)
@@ -35,10 +35,9 @@ Source: modules\{#COMPLETION}\etc\{#COMPLETION}.quit; DestDir: {app}\modules\{#C
 Source: modules\{#COMPLETION}\etc\{#COMPLETION}.start; DestDir: {app}\modules\{#COMPLETION}\etc; Components: {#COMPN_SCILAB}
 ;
 ;
-;Source: modules\{#COMPLETION}\macros\buildmacros.sce; DestDir: {app}\modules\{#COMPLETION}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#COMPLETION}\macros\buildmacros.sce; DestDir: {app}\modules\{#COMPLETION}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#COMPLETION}\macros\buildmacros.bat; DestDir: {app}\modules\{#COMPLETION}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#COMPLETION}\macros\cleanmacros.bat; DestDir: {app}\modules\{#COMPLETION}\macros; Components: {#COMPN_SCILAB}
-;Source: modules\{#COMPLETION}\macros\*.sci; DestDir: {app}\modules\{#COMPLETION}\macros; Components: {#COMPN_SCILAB}
 ;
 ;Source: modules\{#COMPLETION}\demos\*.*; DestDir: {app}\modules\{#COMPLETION}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 ;
index 38e09b9..05a7861 100644 (file)
@@ -196,4 +196,33 @@ if GUI
 USEANT=1
 endif
 
+#### console : include files ####
+libsciconsole_la_includedir=$(pkgincludedir)
+libsciconsole_la_include_HEADERS = \
+includes/autoCompletionCli.h \
+includes/charactersManagement.h \
+includes/cliDisplayManagement.h \
+includes/cliHistory.h \
+includes/cliPrompt.h \
+includes/console_gw.hxx \
+includes/ConsolePrintf.h \
+includes/ConsoleRead.h \
+includes/dynlib_console_gw.h \
+includes/dynlib_console.h \
+includes/GetCommandLine.h \
+includes/getKey.h \
+includes/getNbrLine.h \
+includes/gotoFunctions.h \
+includes/gw_console.h \
+includes/initConsoleMode.h \
+includes/InitializeConsole.h \
+includes/initMacOSXEnv.h \
+includes/more.h \
+includes/prompt.h \
+includes/scilabRead.h \
+includes/scilines.h \
+includes/SetConsolePrompt.h \
+includes/termcapManagement.h
+
+
 include $(top_srcdir)/Makefile.incl.am
index 7efe8b5..103ccb9 100644 (file)
@@ -47,6 +47,7 @@
 ##########
 
 
+
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -120,7 +121,8 @@ host_triplet = @host@
 @GUI_TRUE@am__append_5 = libsciconsole.la
 DIST_COMMON = $(top_srcdir)/Makefile.incl.am $(srcdir)/Makefile.in \
        $(srcdir)/Makefile.am $(top_srcdir)/config/mkinstalldirs \
-       $(top_srcdir)/config/depcomp
+       $(top_srcdir)/config/depcomp \
+       $(libsciconsole_la_include_HEADERS)
 @NEED_JAVA_TRUE@am__append_6 = java
 subdir = modules/console
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -177,7 +179,8 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libsciconsole_la_etcdir)" \
        "$(DESTDIR)$(libsciconsole_la_rootdir)" \
-       "$(DESTDIR)$(libsciconsole_la_sci_gatewaydir)"
+       "$(DESTDIR)$(libsciconsole_la_sci_gatewaydir)" \
+       "$(DESTDIR)$(libsciconsole_la_includedir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libsciconsole_minimal_la_LIBADD =
 am__dirstamp = $(am__leading_dot)dirstamp
@@ -307,6 +310,7 @@ am__can_run_installinfo = \
   esac
 DATA = $(libsciconsole_la_etc_DATA) $(libsciconsole_la_root_DATA) \
        $(libsciconsole_la_sci_gateway_DATA)
+HEADERS = $(libsciconsole_la_include_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -761,6 +765,35 @@ SWIG_WRAPPERS = src/jni/GuiManagement.i \
 # If you want Makefile to call ant, add USEANT=1
 @GUI_TRUE@USEANT = 1
 
+#### console : include files ####
+libsciconsole_la_includedir = $(pkgincludedir)
+libsciconsole_la_include_HEADERS = \
+includes/autoCompletionCli.h \
+includes/charactersManagement.h \
+includes/cliDisplayManagement.h \
+includes/cliHistory.h \
+includes/cliPrompt.h \
+includes/console_gw.hxx \
+includes/ConsolePrintf.h \
+includes/ConsoleRead.h \
+includes/dynlib_console_gw.h \
+includes/dynlib_console.h \
+includes/GetCommandLine.h \
+includes/getKey.h \
+includes/getNbrLine.h \
+includes/gotoFunctions.h \
+includes/gw_console.h \
+includes/initConsoleMode.h \
+includes/InitializeConsole.h \
+includes/initMacOSXEnv.h \
+includes/more.h \
+includes/prompt.h \
+includes/scilabRead.h \
+includes/scilines.h \
+includes/SetConsolePrompt.h \
+includes/termcapManagement.h
+
+
 # Where all the Scilab stuff is installed (macros, help, ...)
 mydatadir = $(pkgdatadir)/modules/$(modulename)
 
@@ -1557,6 +1590,27 @@ uninstall-libsciconsole_la_sci_gatewayDATA:
        @list='$(libsciconsole_la_sci_gateway_DATA)'; test -n "$(libsciconsole_la_sci_gatewaydir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(libsciconsole_la_sci_gatewaydir)'; $(am__uninstall_files_from_dir)
+install-libsciconsole_la_includeHEADERS: $(libsciconsole_la_include_HEADERS)
+       @$(NORMAL_INSTALL)
+       @list='$(libsciconsole_la_include_HEADERS)'; test -n "$(libsciconsole_la_includedir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libsciconsole_la_includedir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libsciconsole_la_includedir)" || exit 1; \
+       fi; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libsciconsole_la_includedir)'"; \
+         $(INSTALL_HEADER) $$files "$(DESTDIR)$(libsciconsole_la_includedir)" || exit $$?; \
+       done
+
+uninstall-libsciconsole_la_includeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(libsciconsole_la_include_HEADERS)'; test -n "$(libsciconsole_la_includedir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       dir='$(DESTDIR)$(libsciconsole_la_includedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(am__tagged_files)
        $(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -1644,9 +1698,9 @@ check-am: all-am
        $(MAKE) $(AM_MAKEFLAGS) check-local
 check: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local
 installdirs:
-       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciconsole_la_etcdir)" "$(DESTDIR)$(libsciconsole_la_rootdir)" "$(DESTDIR)$(libsciconsole_la_sci_gatewaydir)"; do \
+       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciconsole_la_etcdir)" "$(DESTDIR)$(libsciconsole_la_rootdir)" "$(DESTDIR)$(libsciconsole_la_sci_gatewaydir)" "$(DESTDIR)$(libsciconsole_la_includedir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: $(BUILT_SOURCES)
@@ -1721,6 +1775,7 @@ info: info-am
 info-am:
 
 install-data-am: install-data-local install-libsciconsole_la_etcDATA \
+       install-libsciconsole_la_includeHEADERS \
        install-libsciconsole_la_rootDATA \
        install-libsciconsole_la_sci_gatewayDATA
 
@@ -1769,6 +1824,7 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-libsciconsole_la_etcDATA \
+       uninstall-libsciconsole_la_includeHEADERS \
        uninstall-libsciconsole_la_rootDATA \
        uninstall-libsciconsole_la_sci_gatewayDATA \
        uninstall-pkglibLTLIBRARIES
@@ -1785,6 +1841,7 @@ uninstall-am: uninstall-libsciconsole_la_etcDATA \
        install-exec-am install-html install-html-am \
        install-html-local install-info install-info-am \
        install-libsciconsole_la_etcDATA \
+       install-libsciconsole_la_includeHEADERS \
        install-libsciconsole_la_rootDATA \
        install-libsciconsole_la_sci_gatewayDATA install-man \
        install-pdf install-pdf-am install-pkglibLTLIBRARIES \
@@ -1794,6 +1851,7 @@ uninstall-am: uninstall-libsciconsole_la_etcDATA \
        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
        tags tags-am uninstall uninstall-am \
        uninstall-libsciconsole_la_etcDATA \
+       uninstall-libsciconsole_la_includeHEADERS \
        uninstall-libsciconsole_la_rootDATA \
        uninstall-libsciconsole_la_sci_gatewayDATA \
        uninstall-pkglibLTLIBRARIES
index 678dcdb..af7660c 100644 (file)
@@ -289,7 +289,9 @@ includes/getversion.h \
 includes/backtrace_print.h \
 includes/sci_mem_alloc.h \
 includes/hashtable.h \
-includes/hashtable_utility.h
+includes/hashtable_utility.h \
+includes/exit_status.hxx \
+includes/timer.hxx
 
 
 if GUI
index d0ce4ee..8fda7de 100644 (file)
@@ -965,7 +965,9 @@ includes/getversion.h \
 includes/backtrace_print.h \
 includes/sci_mem_alloc.h \
 includes/hashtable.h \
-includes/hashtable_utility.h
+includes/hashtable_utility.h \
+includes/exit_status.hxx \
+includes/timer.hxx
 
 @GUI_TRUE@USEANT = 1
 
index cfd548b..3e68fd2 100644 (file)
@@ -60,12 +60,16 @@ Source: modules\{#CORE}\includes\version.h; DestDir: {app}\modules\{#CORE}\inclu
 Source: modules\{#CORE}\includes\win_mem_alloc.h; DestDir: {app}\modules\{#CORE}\includes; Components: {#COMPN_SCILAB}
 Source: modules\{#CORE}\includes\getversion.h; DestDir: {app}\modules\{#CORE}\includes; Components: {#COMPN_SCILAB}
 Source: modules\{#CORE}\includes\backtrace_print.h; DestDir: {app}\modules\{#CORE}\includes; Components: {#COMPN_SCILAB}
+Source: modules\{#CORE}\includes\exit_status.hxx; DestDir: {app}\modules\{#CORE}\includes; Components: {#COMPN_SCILAB}
+Source: modules\{#CORE}\includes\timer.hxx; DestDir: {app}\modules\{#CORE}\includes; Components: {#COMPN_SCILAB}
+
 ;
 Source: modules\{#CORE}\macros\buildmacros.sce; DestDir: {app}\modules\{#CORE}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#CORE}\macros\buildmacros.bat; DestDir: {app}\modules\{#CORE}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#CORE}\macros\cleanmacros.bat; DestDir: {app}\modules\{#CORE}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#CORE}\macros\lib; DestDir: {app}\modules\{#CORE}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#CORE}\macros\*.sci; DestDir: {app}\modules\{#CORE}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#CORE}\macros\*.bin; DestDir: {app}\modules\{#CORE}\macros; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#CORE}\xml\*.dtd; DestDir: {app}\modules\{#CORE}\xml; Components: {#COMPN_SCILAB}
 ;
index aae8169..b48244a 100644 (file)
@@ -32,6 +32,7 @@ Source: modules\{#DATASTRUCT}\etc\{#DATASTRUCT}.start; DestDir: {app}\modules\{#
 ;
 Source: modules\{#DATASTRUCT}\macros\lib; DestDir: {app}\modules\{#DATASTRUCT}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#DATASTRUCT}\macros\*.sci; DestDir: {app}\modules\{#DATASTRUCT}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#DATASTRUCT}\macros\*.bin; DestDir: {app}\modules\{#DATASTRUCT}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#DATASTRUCT}\macros\buildmacros.sce; DestDir: {app}\modules\{#DATASTRUCT}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#DATASTRUCT}\macros\buildmacros.bat; DestDir: {app}\modules\{#DATASTRUCT}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#DATASTRUCT}\macros\cleanmacros.bat; DestDir: {app}\modules\{#DATASTRUCT}\macros; Components: {#COMPN_SCILAB}
index 7b61b67..9ef51d1 100644 (file)
@@ -30,6 +30,7 @@ Source: modules\{#DEMO_TOOLS}\macros\buildmacros.bat; DestDir: {app}\modules\{#D
 Source: modules\{#DEMO_TOOLS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#DEMO_TOOLS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#DEMO_TOOLS}\macros\lib; DestDir: {app}\modules\{#DEMO_TOOLS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#DEMO_TOOLS}\macros\*.sci; DestDir: {app}\modules\{#DEMO_TOOLS}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#DEMO_TOOLS}\macros\*.bin; DestDir: {app}\modules\{#DEMO_TOOLS}\macros; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#DEMO_TOOLS}\gui\*.xml; DestDir: {app}\modules\{#DEMO_TOOLS}\gui; Components: {#COMPN_SCILAB}
 ;
index eed8b64..56545c7 100644 (file)
@@ -32,8 +32,7 @@ Source: modules\{#DEVTOOLS}\macros\buildmacros.bat; DestDir: {app}\modules\{#DEV
 Source: modules\{#DEVTOOLS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#DEVTOOLS}\macros; Components: {#COMPN_DEVTOOLS}
 ;
 Source: modules\{#DEVTOOLS}\macros\assert\lib; DestDir: {app}\modules\{#DEVTOOLS}\macros\assert; Components: {#COMPN_DEVTOOLS}
-;Source: modules\{#DEVTOOLS}\macros\assert\names; DestDir: {app}\modules\{#DEVTOOLS}\macros\assert; Components: {#COMPN_DEVTOOLS}
-;Source: modules\{#DEVTOOLS}\macros\assert\*.bin; DestDir: {app}\modules\{#DEVTOOLS}\macros\assert; Components: {#COMPN_DEVTOOLS}
+Source: modules\{#DEVTOOLS}\macros\assert\*.bin; DestDir: {app}\modules\{#DEVTOOLS}\macros\assert; Components: {#COMPN_DEVTOOLS}
 Source: modules\{#DEVTOOLS}\macros\assert\*.sci; DestDir: {app}\modules\{#DEVTOOLS}\macros\assert; Components: {#COMPN_DEVTOOLS}
 Source: modules\{#DEVTOOLS}\macros\assert\buildmacros.sce; DestDir: {app}\modules\{#DEVTOOLS}\macros\assert; Components: {#COMPN_DEVTOOLS}
 Source: modules\{#DEVTOOLS}\macros\assert\buildmacros.bat; DestDir: {app}\modules\{#DEVTOOLS}\macros\assert; Components: {#COMPN_DEVTOOLS}
index 0fa6caa..87cbbdc 100644 (file)
@@ -21,6 +21,7 @@
 Source: bin\{#DIFFEQU}_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\{#DIFFEQU}_f.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\{#DIFFEQU}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\{#DIFFEQU}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#DIFFEQU}\license.txt; DestDir: {app}\modules\{#DIFFEQU}; Components: {#COMPN_SCILAB}
 ;
@@ -31,6 +32,7 @@ Source: modules\{#DIFFEQU}\etc\{#DIFFEQU}.start; DestDir: {app}\modules\{#DIFFEQ
 ;
 Source: modules\{#DIFFEQU}\macros\lib; DestDir: {app}\modules\{#DIFFEQU}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#DIFFEQU}\macros\*.sci; DestDir: {app}\modules\{#DIFFEQU}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#DIFFEQU}\macros\*.bin; DestDir: {app}\modules\{#DIFFEQU}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#DIFFEQU}\macros\buildmacros.sce; DestDir: {app}\modules\{#DIFFEQU}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#DIFFEQU}\macros\buildmacros.bat; DestDir: {app}\modules\{#DIFFEQU}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#DIFFEQU}\macros\cleanmacros.bat; DestDir: {app}\modules\{#DIFFEQU}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
index 7484ac5..a2c36d6 100644 (file)
@@ -38,6 +38,7 @@ Source: modules\{#DYNAMIC_LINK}\includes\*.h; DestDir: {app}\modules\{#DYNAMIC_L
 ;
 Source: modules\{#DYNAMIC_LINK}\macros\lib; DestDir: {app}\modules\{#DYNAMIC_LINK}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#DYNAMIC_LINK}\macros\*.sci; DestDir: {app}\modules\{#DYNAMIC_LINK}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#DYNAMIC_LINK}\macros\*.bin; DestDir: {app}\modules\{#DYNAMIC_LINK}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#DYNAMIC_LINK}\macros\buildmacros.sce; DestDir: {app}\modules\{#DYNAMIC_LINK}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#DYNAMIC_LINK}\macros\buildmacros.bat; DestDir: {app}\modules\{#DYNAMIC_LINK}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#DYNAMIC_LINK}\macros\cleanmacros.bat; DestDir: {app}\modules\{#DYNAMIC_LINK}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
index c4dd19d..a27c227 100644 (file)
@@ -74,7 +74,7 @@ function ilib_build(ilib_name, ..
 
     if getos() == "Windows" then
         if ~isdef("makename") | (makename == "") | (makename == []) then
-            // Load dynamic_link Internal lib if it"s not already loaded
+            // Load dynamic_link Internal lib if it's not already loaded
             if ~exists("dynamic_linkwindowslib") then
                 load("SCI/modules/dynamic_link/macros/windows/lib");
             end
index 09fc29a..e21ab0a 100644 (file)
@@ -93,7 +93,7 @@ function libn = ilib_compile(lib_name, ..
 
         // Binary version
         if isdir(SCI+"/../../include/scilab/") & ~ScilabTreeFound then
-            cflags="-I"+SCI+"/../../include/scilab/ -I"+SCI+"/../../include/ " + cflags
+            cflags="-I"+SCI+"/../../include/scilab/ -I"+SCI+"/../../include/  -I"+SCI+"/../../lib/Eigen/includes/ " + cflags
             fflags="-I"+SCI+"/../../include/scilab/ " + fflags
             ScilabTreeFound=%t
         end
index 2fd0832..1afac2d 100644 (file)
@@ -43,6 +43,7 @@ Source: modules\{#ELEMFUNCTIONS}\macros\buildmacros.bat; DestDir: {app}\modules\
 Source: modules\{#ELEMFUNCTIONS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#ELEMFUNCTIONS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#ELEMFUNCTIONS}\macros\lib; DestDir: {app}\modules\{#ELEMFUNCTIONS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#ELEMFUNCTIONS}\macros\*.sci; DestDir: {app}\modules\{#ELEMFUNCTIONS}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#ELEMFUNCTIONS}\macros\*.bin; DestDir: {app}\modules\{#ELEMFUNCTIONS}\macros; Components: {#COMPN_SCILAB}
 ;
 ;Source: modules\{#ELEMFUNCTIONS}\demos\*.*; DestDir: {app}\modules\{#ELEMFUNCTIONS}\demos; Flags: recursesubdirs;  Components: {#COMPN_SCILAB}
 ;
index 37a732a..856aded 100644 (file)
@@ -31,9 +31,9 @@ Source: modules\{#EXTERNAL_OBJECTS}\etc\{#EXTERNAL_OBJECTS}.start; DestDir: {app
 Source: modules\{#EXTERNAL_OBJECTS}\macros\buildmacros.sce; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#EXTERNAL_OBJECTS}\macros\buildmacros.bat; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#EXTERNAL_OBJECTS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
-;Source: modules\{#EXTERNAL_OBJECTS}\macros\*.bin; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
-;Source: modules\{#EXTERNAL_OBJECTS}\macros\*.sci; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
-;Source: modules\{#EXTERNAL_OBJECTS}\macros\lib; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#EXTERNAL_OBJECTS}\macros\*.bin; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#EXTERNAL_OBJECTS}\macros\*.sci; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#EXTERNAL_OBJECTS}\macros\lib; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
 ;Source: modules\{#EXTERNAL_OBJECTS}\macros\names; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
 ;
 ;Source: modules\{#EXTERNAL_OBJECTS}\tests\*.*; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
diff --git a/scilab/modules/external_objects/macros/!_deff_wrapper.sci b/scilab/modules/external_objects/macros/!_deff_wrapper.sci
new file mode 100644 (file)
index 0000000..d2ed2b4
--- /dev/null
@@ -0,0 +1,4 @@
+function !_deff_wrapper(name, definition, code)
+    deff(definition, code);
+    execstr(name + "=resume(" + name + ")");
+endfunction
index a73ca67..b30407c 100644 (file)
@@ -8,4 +8,4 @@ rem you should have received as part of this distribution.  The terms
 rem are also available at
 rem http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 
-@..\..\..\bin\scilex -nwni -ns -e exec('buildmacros.sce');quit;
+..\..\..\bin\scilex -nwni -ns -e exec('buildmacros.sce');quit;
index 164a3c0..6558573 100644 (file)
@@ -38,6 +38,7 @@ Source: modules\{#FILEIO}\macros\buildmacros.bat; DestDir: {app}\modules\{#FILEI
 Source: modules\{#FILEIO}\macros\cleanmacros.bat; DestDir: {app}\modules\{#FILEIO}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#FILEIO}\macros\lib; DestDir: {app}\modules\{#FILEIO}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#FILEIO}\macros\*.sci; DestDir: {app}\modules\{#FILEIO}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#FILEIO}\macros\*.bin; DestDir: {app}\modules\{#FILEIO}\macros; Components: {#COMPN_SCILAB}
 ;
 ;Source: modules\{#FILEIO}\demos\*.*; DestDir: {app}\modules\{#FILEIO}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 ;
index 30f2e71..22fd990 100644 (file)
@@ -33,6 +33,7 @@ Source: modules\{#FUNCTIONS}\etc\{#FUNCTIONS}.start; DestDir: {app}\modules\{#FU
 ;
 Source: modules\{#FUNCTIONS}\macros\lib; DestDir: {app}\modules\{#FUNCTIONS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#FUNCTIONS}\macros\*.sci; DestDir: {app}\modules\{#FUNCTIONS}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#FUNCTIONS}\macros\*.bin; DestDir: {app}\modules\{#FUNCTIONS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#FUNCTIONS}\macros\buildmacros.sce; DestDir: {app}\modules\{#FUNCTIONS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#FUNCTIONS}\macros\buildmacros.bat; DestDir: {app}\modules\{#FUNCTIONS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#FUNCTIONS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#FUNCTIONS}\macros; Components: {#COMPN_SCILAB}
index 35b9cce..36bd819 100644 (file)
@@ -23,8 +23,9 @@ Source: modules\{#GENETICALGORITHMS}\etc\{#GENETICALGORITHMS}.start; DestDir: {a
 ;
 Source: modules\{#GENETICALGORITHMS}\demos\*.*; DestDir: {app}\modules\{#GENETICALGORITHMS}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 ;
-;Source: modules\{#GENETICALGORITHMS}\macros\lib; DestDir: {app}\modules\{#GENETICALGORITHMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#GENETICALGORITHMS}\macros\lib; DestDir: {app}\modules\{#GENETICALGORITHMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#GENETICALGORITHMS}\macros\*.sci; DestDir: {app}\modules\{#GENETICALGORITHMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#GENETICALGORITHMS}\macros\*.bin; DestDir: {app}\modules\{#GENETICALGORITHMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#GENETICALGORITHMS}\macros\buildmacros.sce; DestDir: {app}\modules\{#GENETICALGORITHMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#GENETICALGORITHMS}\macros\buildmacros.bat; DestDir: {app}\modules\{#GENETICALGORITHMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#GENETICALGORITHMS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#GENETICALGORITHMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
index f045278..c750233 100644 (file)
@@ -44,8 +44,10 @@ Source: modules\{#GRAPHICS}\macros\buildmacros.bat; DestDir: {app}\modules\{#GRA
 Source: modules\{#GRAPHICS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#GRAPHICS}\macros; Components: {#COMPN_GRAPHICS}
 Source: modules\{#GRAPHICS}\macros\lib; DestDir: {app}\modules\{#GRAPHICS}\macros; Components: {#COMPN_GRAPHICS}
 Source: modules\{#GRAPHICS}\macros\*.sci; DestDir: {app}\modules\{#GRAPHICS}\macros; Components: {#COMPN_GRAPHICS}
+Source: modules\{#GRAPHICS}\macros\*.bin; DestDir: {app}\modules\{#GRAPHICS}\macros; Components: {#COMPN_GRAPHICS}
 Source: modules\{#GRAPHICS}\macros\datatips\lib; DestDir: {app}\modules\{#GRAPHICS}\macros\datatips; Components: {#COMPN_GRAPHICS}
 Source: modules\{#GRAPHICS}\macros\datatips\*.sci; DestDir: {app}\modules\{#GRAPHICS}\macros\datatips; Components: {#COMPN_GRAPHICS}
+Source: modules\{#GRAPHICS}\macros\datatips\*.bin; DestDir: {app}\modules\{#GRAPHICS}\macros\datatips; Components: {#COMPN_GRAPHICS}
 ;
 Source: modules\{#GRAPHICS}\tcl\*.*; DestDir: {app}\modules\{#GRAPHICS}\tcl; Flags: recursesubdirs; Components: {#COMPN_GRAPHICS}
 ;
index d19a26d..034b600 100644 (file)
@@ -47,6 +47,7 @@ Source: modules\{#GUI}\images\preferences\*.png; DestDir: {app}\modules\{#GUI}\i
 ;
 Source: modules\{#GUI}\macros\lib; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: modules\{#GUI}\macros\*.sci; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GUI}\macros\*.bin; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: modules\{#GUI}\macros\buildmacros.sce; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: modules\{#GUI}\macros\buildmacros.bat; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: modules\{#GUI}\macros\cleanmacros.bat; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
index 74e4f13..e260293 100644 (file)
@@ -78,6 +78,7 @@ Source: modules\{#HELPTOOLS}\macros\buildmacros.bat; DestDir: {app}\modules\{#HE
 Source: modules\{#HELPTOOLS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: modules\{#HELPTOOLS}\macros\lib; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: modules\{#HELPTOOLS}\macros\*.sci; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HELPTOOLS}\macros\*.bin; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
 Source: modules\{#HELPTOOLS}\examples\*.*; DestDir: {app}\modules\{#HELPTOOLS}\examples; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
index fb7d417..42fadcc 100644 (file)
@@ -37,7 +37,7 @@ Source: modules\{#HISTORY_MANAGER}\etc\{#HISTORY_MANAGER}.start; DestDir: {app}\
 Source: modules\{#HISTORY_MANAGER}\etc\*.xml; DestDir: {app}\modules\{#HISTORY_MANAGER}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#HISTORY_MANAGER}\etc\*.xsl; DestDir: {app}\modules\{#HISTORY_MANAGER}\etc; Components: {#COMPN_SCILAB}
 ;
-;Source: modules\{#HISTORY_MANAGER}\macros\buildmacros.sce; DestDir: {app}\modules\{#HISTORY_MANAGER}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#HISTORY_MANAGER}\macros\buildmacros.sce; DestDir: {app}\modules\{#HISTORY_MANAGER}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#HISTORY_MANAGER}\macros\buildmacros.bat; DestDir: {app}\modules\{#HISTORY_MANAGER}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#HISTORY_MANAGER}\macros\cleanmacros.bat; DestDir: {app}\modules\{#HISTORY_MANAGER}\macros; Components: {#COMPN_SCILAB}
 ;Source: modules\{#HISTORY_MANAGER}\macros\*.sci; DestDir: {app}\modules\{#HISTORY_MANAGER}\macros; Components: {#COMPN_SCILAB}
index a182a56..6d43636 100644 (file)
@@ -37,6 +37,7 @@ Source: modules\{#INTEGER}\macros\buildmacros.bat; DestDir: {app}\modules\{#INTE
 Source: modules\{#INTEGER}\macros\cleanmacros.bat; DestDir: {app}\modules\{#INTEGER}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#INTEGER}\macros\lib; DestDir: {app}\modules\{#INTEGER}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#INTEGER}\macros\*.sci; DestDir: {app}\modules\{#INTEGER}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#INTEGER}\macros\*.bin; DestDir: {app}\modules\{#INTEGER}\macros; Components: {#COMPN_SCILAB}
 ;
 ;Source: modules\{#INTEGER}\demos\*.*; DestDir: {app}\modules\{#INTEGER}\demos; Flags: recursesubdirs;  Components: {#COMPN_SCILAB}
 ;
index eb8b1fc..2b4b509 100644 (file)
@@ -31,6 +31,7 @@ Source: modules\{#INTERPOLATION}\etc\{#INTERPOLATION}.start; DestDir: {app}\modu
 ;
 Source: modules\{#INTERPOLATION}\macros\lib; DestDir: {app}\modules\{#INTERPOLATION}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#INTERPOLATION}\macros\*.sci; DestDir: {app}\modules\{#INTERPOLATION}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#INTERPOLATION}\macros\*.bin; DestDir: {app}\modules\{#INTERPOLATION}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#INTERPOLATION}\macros\buildmacros.sce; DestDir: {app}\modules\{#INTERPOLATION}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#INTERPOLATION}\macros\buildmacros.bat; DestDir: {app}\modules\{#INTERPOLATION}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#INTERPOLATION}\macros\cleanmacros.bat; DestDir: {app}\modules\{#INTERPOLATION}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
index b539005..34647c2 100644 (file)
@@ -36,6 +36,7 @@ Source: modules\{#IO}\macros\buildmacros.bat; DestDir: {app}\modules\{#IO}\macro
 Source: modules\{#IO}\macros\cleanmacros.bat; DestDir: {app}\modules\{#IO}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#IO}\macros\lib; DestDir: {app}\modules\{#IO}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#IO}\macros\*.sci; DestDir: {app}\modules\{#IO}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#IO}\macros\*.bin; DestDir: {app}\modules\{#IO}\macros; Components: {#COMPN_SCILAB}
 ;
 ;Source: modules\{#IO}\demos\*.*; DestDir: {app}\modules\{#IO}\demos; Flags: recursesubdirs;  Components: {#COMPN_SCILAB}
 ;
index 9be97a2..58f8741 100644 (file)
@@ -985,10 +985,10 @@ maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-@JAVASCI_FALSE@distclean-local:
-@JAVASCI_FALSE@install-data-local:
 @JAVASCI_FALSE@install-html-local:
 @JAVASCI_FALSE@clean-local:
+@JAVASCI_FALSE@install-data-local:
+@JAVASCI_FALSE@distclean-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \
index 287772b..2a5dab1 100644 (file)
@@ -53,6 +53,7 @@ Source: modules\{#JVM}\macros\buildmacros.bat; DestDir: {app}\modules\{#JVM}\mac
 Source: modules\{#JVM}\macros\cleanmacros.bat; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_JVM_MODULE}
 Source: modules\{#JVM}\macros\lib; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_JVM_MODULE}
 Source: modules\{#JVM}\macros\*.sci; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_JVM_MODULE}
+Source: modules\{#JVM}\macros\*.bin; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_JVM_MODULE}
 ;
 Source: modules\{#JVM}\tests\*.*; DestDir: {app}\modules\{#JVM}\tests; Flags: recursesubdirs; Components: {#COMPN_JVM_MODULE} and {#COMPN_TESTS}
 ;
index 51b6614..16e16dd 100644 (file)
@@ -34,6 +34,7 @@ Source: modules\{#LINEAR_ALGEBRA}\macros\buildmacros.bat; DestDir: {app}\modules
 Source: modules\{#LINEAR_ALGEBRA}\macros\cleanmacros.bat; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#LINEAR_ALGEBRA}\macros\lib; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#LINEAR_ALGEBRA}\macros\*.sci; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#LINEAR_ALGEBRA}\macros\*.bin; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\macros; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#LINEAR_ALGEBRA}\examples\*.*; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\examples; Flags: recursesubdirs;  Components: {#COMPN_SCILAB}
 ;
index ef1c097..54f767a 100644 (file)
@@ -25,6 +25,7 @@ Source: modules\{#M2SCI}\etc\{#M2SCI}.start; DestDir: {app}\modules\{#M2SCI}\etc
 ;
 Source: modules\{#M2SCI}\macros\lib; DestDir: {app}\modules\{#M2SCI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#M2SCI}\macros\*.sci; DestDir: {app}\modules\{#M2SCI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#M2SCI}\macros\*.bin; DestDir: {app}\modules\{#M2SCI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#M2SCI}\macros\buildmacros.sce; DestDir: {app}\modules\{#M2SCI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#M2SCI}\macros\buildmacros.bat; DestDir: {app}\modules\{#M2SCI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#M2SCI}\macros\cleanmacros.bat; DestDir: {app}\modules\{#M2SCI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
index 6266b02..1ad9528 100644 (file)
@@ -29,6 +29,7 @@ Source: modules\{#MATIO}\etc\{#MATIO}.start; DestDir: {app}\modules\{#MATIO}\etc
 ;
 Source: modules\{#MATIO}\macros\lib; DestDir: {app}\modules\{#MATIO}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#MATIO}\macros\*.sci; DestDir: {app}\modules\{#MATIO}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#MATIO}\macros\*.bin; DestDir: {app}\modules\{#MATIO}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#MATIO}\macros\buildmacros.sce; DestDir: {app}\modules\{#MATIO}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#MATIO}\macros\buildmacros.bat; DestDir: {app}\modules\{#MATIO}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#MATIO}\macros\cleanmacros.bat; DestDir: {app}\modules\{#MATIO}\macros; Components: {#COMPN_SCILAB}
index 9a295ad..253c84f 100644 (file)
@@ -26,6 +26,7 @@ Source: modules\{#MODULES_MANAGER}\etc\{#MODULES_MANAGER}.start; DestDir: {app}\
 ;
 Source: modules\{#MODULES_MANAGER}\macros\lib; DestDir: {app}\modules\{#MODULES_MANAGER}\macros; Components: {#COMPN_MODULES_MANAGER}
 Source: modules\{#MODULES_MANAGER}\macros\*.sci; DestDir: {app}\modules\{#MODULES_MANAGER}\macros; Components: {#COMPN_MODULES_MANAGER}
+Source: modules\{#MODULES_MANAGER}\macros\*.bin; DestDir: {app}\modules\{#MODULES_MANAGER}\macros; Components: {#COMPN_MODULES_MANAGER}
 Source: modules\{#MODULES_MANAGER}\macros\buildmacros.sce; DestDir: {app}\modules\{#MODULES_MANAGER}\macros; Components: {#COMPN_MODULES_MANAGER}
 Source: modules\{#MODULES_MANAGER}\macros\buildmacros.bat; DestDir: {app}\modules\{#MODULES_MANAGER}\macros; Components: {#COMPN_MODULES_MANAGER}
 Source: modules\{#MODULES_MANAGER}\macros\cleanmacros.bat; DestDir: {app}\modules\{#MODULES_MANAGER}\macros; Components: {#COMPN_MODULES_MANAGER}
index 5d8dc02..1f9a9d4 100644 (file)
@@ -64,4 +64,11 @@ modulename=operations
 libsciboolean_la_etcdir = $(mydatadir)/etc
 libsciboolean_la_etc_DATA = etc/operations.quit etc/operations.start
 
+#### api_scilab : include files ####
+libscioperations_la_includedir=$(pkgincludedir)
+libscioperations_la_include_HEADERS = \
+    includes/doublecomplex.h \
+    includes/dynlib_operations.hxx
+
+
 include $(top_srcdir)/Makefile.incl.am
index 01da720..e98aabd 100644 (file)
@@ -36,6 +36,7 @@
 ##########
 
 
+
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -102,7 +103,8 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(top_srcdir)/Makefile.incl.am $(srcdir)/Makefile.in \
        $(srcdir)/Makefile.am $(top_srcdir)/config/mkinstalldirs \
-       $(top_srcdir)/config/depcomp
+       $(top_srcdir)/config/depcomp \
+       $(libscioperations_la_include_HEADERS)
 @NEED_JAVA_TRUE@am__append_1 = java
 subdir = modules/operations
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -157,7 +159,8 @@ am__uninstall_files_from_dir = { \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(pkglibdir)" \
-       "$(DESTDIR)$(libsciboolean_la_etcdir)"
+       "$(DESTDIR)$(libsciboolean_la_etcdir)" \
+       "$(DESTDIR)$(libscioperations_la_includedir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libscioperations_la_DEPENDENCIES =
 am__dirstamp = $(am__leading_dot)dirstamp
@@ -255,6 +258,7 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 DATA = $(libsciboolean_la_etc_DATA)
+HEADERS = $(libscioperations_la_include_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -615,6 +619,13 @@ modulename = operations
 libsciboolean_la_etcdir = $(mydatadir)/etc
 libsciboolean_la_etc_DATA = etc/operations.quit etc/operations.start
 
+#### api_scilab : include files ####
+libscioperations_la_includedir = $(pkgincludedir)
+libscioperations_la_include_HEADERS = \
+    includes/doublecomplex.h \
+    includes/dynlib_operations.hxx
+
+
 # Where all the Scilab stuff is installed (macros, help, ...)
 mydatadir = $(pkgdatadir)/modules/$(modulename)
 
@@ -1100,6 +1111,27 @@ uninstall-libsciboolean_la_etcDATA:
        @list='$(libsciboolean_la_etc_DATA)'; test -n "$(libsciboolean_la_etcdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(libsciboolean_la_etcdir)'; $(am__uninstall_files_from_dir)
+install-libscioperations_la_includeHEADERS: $(libscioperations_la_include_HEADERS)
+       @$(NORMAL_INSTALL)
+       @list='$(libscioperations_la_include_HEADERS)'; test -n "$(libscioperations_la_includedir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libscioperations_la_includedir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libscioperations_la_includedir)" || exit 1; \
+       fi; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libscioperations_la_includedir)'"; \
+         $(INSTALL_HEADER) $$files "$(DESTDIR)$(libscioperations_la_includedir)" || exit $$?; \
+       done
+
+uninstall-libscioperations_la_includeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(libscioperations_la_include_HEADERS)'; test -n "$(libscioperations_la_includedir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       dir='$(DESTDIR)$(libscioperations_la_includedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(am__tagged_files)
        $(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -1186,9 +1218,9 @@ distdir: $(DISTFILES)
 check-am: all-am
        $(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local
 installdirs:
-       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciboolean_la_etcdir)"; do \
+       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciboolean_la_etcdir)" "$(DESTDIR)$(libscioperations_la_includedir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-am
@@ -1248,7 +1280,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-data-local install-libsciboolean_la_etcDATA
+install-data-am: install-data-local install-libsciboolean_la_etcDATA \
+       install-libscioperations_la_includeHEADERS
 
 install-dvi: install-dvi-am
 
@@ -1295,6 +1328,7 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-libsciboolean_la_etcDATA \
+       uninstall-libscioperations_la_includeHEADERS \
        uninstall-pkglibLTLIBRARIES
 
 .MAKE: check-am install-am install-strip
@@ -1308,13 +1342,16 @@ uninstall-am: uninstall-libsciboolean_la_etcDATA \
        install-data-local install-dvi install-dvi-am install-exec \
        install-exec-am install-html install-html-am \
        install-html-local install-info install-info-am \
-       install-libsciboolean_la_etcDATA install-man install-pdf \
-       install-pdf-am install-pkglibLTLIBRARIES install-ps \
-       install-ps-am install-strip installcheck installcheck-am \
-       installdirs maintainer-clean maintainer-clean-generic \
-       mostlyclean mostlyclean-compile mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-       uninstall-am uninstall-libsciboolean_la_etcDATA \
+       install-libsciboolean_la_etcDATA \
+       install-libscioperations_la_includeHEADERS install-man \
+       install-pdf install-pdf-am install-pkglibLTLIBRARIES \
+       install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags tags-am uninstall uninstall-am \
+       uninstall-libsciboolean_la_etcDATA \
+       uninstall-libscioperations_la_includeHEADERS \
        uninstall-pkglibLTLIBRARIES
 
 
diff --git a/scilab/modules/operations/macros/cleanmacros.bat b/scilab/modules/operations/macros/cleanmacros.bat
new file mode 100644 (file)
index 0000000..5079dfd
--- /dev/null
@@ -0,0 +1,3 @@
+@del *.bin 2>NUL
+@del lib 2>NUL
+@del names 2>NUL
\ No newline at end of file
index e11eda8..df7c349 100644 (file)
@@ -1,7 +1,6 @@
 ;
 ; Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-; Copyright (C) INRIA - Allan CORNET
-; Copyright (C) DIGITEO - 2012 - Cedric Delamarre
+; Copyright (C) 2014 - Scilab Enterprises
 ;
 ; This file must be used under the terms of the CeCILL.
 ; This source file is licensed as described in the file COPYING, which
 ; Inno Setup Script (5.3 and more) for Scilab (UNICODE version required)
 ;
 ;--------------------------------------------------------------------------------------------------------------
-; oerations module
+; operations module
 ;--------------------------------------------------------------------------------------------------------------
 ;
 #define OPERATIONS "operations"
 ;
 Source: bin\{#OPERATIONS}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-;Source: bin\{#OPERATIONS}_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-;Source: bin\{#OPERATIONS}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\{#OPERATIONS}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+;
+Source: modules\{#OPERATIONS}\includes\doublecomplex.h; DestDir: {app}\modules\{#OPERATIONS}\includes; Components: {#COMPN_SCILAB}
+Source: modules\{#OPERATIONS}\includes\dynlib_operations.hxx; DestDir: {app}\modules\{#OPERATIONS}\includes; Components: {#COMPN_SCILAB}
 ;
 ;Source: modules\{#OPERATIONS}\license.txt; DestDir: {app}\modules\{#OPERATIONS}; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#OPERATIONS}\etc\{#OPERATIONS}.quit; DestDir: {app}\modules\{#OPERATIONS}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#OPERATIONS}\etc\{#OPERATIONS}.start; DestDir: {app}\modules\{#OPERATIONS}\etc; Components: {#COMPN_SCILAB}
 ;
-;Source: modules\{#OPERATIONS}\includes\*.h; DestDir: {app}\modules\{#OPERATIONS}\includes; Components: {#COMPN_SCILAB}
-;
 Source: modules\{#OPERATIONS}\macros\lib; DestDir: {app}\modules\{#OPERATIONS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#OPERATIONS}\macros\*.sci; DestDir: {app}\modules\{#OPERATIONS}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#OPERATIONS}\macros\*.bin; DestDir: {app}\modules\{#OPERATIONS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#OPERATIONS}\macros\buildmacros.sce; DestDir: {app}\modules\{#OPERATIONS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#OPERATIONS}\macros\buildmacros.bat; DestDir: {app}\modules\{#OPERATIONS}\macros; Components: {#COMPN_SCILAB}
-;Source: modules\{#OPERATIONS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#OPERATIONS}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#OPERATIONS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#OPERATIONS}\macros; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#OPERATIONS}\tests\*.*; DestDir: {app}\modules\{#OPERATIONS}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
 ;
index c8827b9..0cb59fd 100644 (file)
@@ -35,6 +35,7 @@ Source: modules\{#OPTIMIZATION}\macros\buildmacros.bat; DestDir: {app}\modules\{
 Source: modules\{#OPTIMIZATION}\macros\cleanmacros.bat; DestDir: {app}\modules\{#OPTIMIZATION}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#OPTIMIZATION}\macros\lib; DestDir: {app}\modules\{#OPTIMIZATION}\macros;Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#OPTIMIZATION}\macros\*.sci; DestDir: {app}\modules\{#OPTIMIZATION}\macros;Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#OPTIMIZATION}\macros\*.bin; DestDir: {app}\modules\{#OPTIMIZATION}\macros;Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#OPTIMIZATION}\demos\*.*; DestDir: {app}\modules\{#OPTIMIZATION}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 ;
index f46dc6e..1628900 100644 (file)
@@ -125,7 +125,9 @@ libscioutput_stream_la_includedir=$(pkgincludedir)
 libscioutput_stream_la_include_HEADERS = includes/do_error_number.h \
 includes/sciprint.h \
 includes/cerro.h \
-includes/Scierror.h
+includes/Scierror.h \
+includes/dynlib_output_stream.h \
+includes/scilabWrite.hxx
 
 include $(top_srcdir)/Makefile.incl.am
 
index 4dfeb0e..ffe23f6 100644 (file)
@@ -712,7 +712,9 @@ libscioutput_stream_la_includedir = $(pkgincludedir)
 libscioutput_stream_la_include_HEADERS = includes/do_error_number.h \
 includes/sciprint.h \
 includes/cerro.h \
-includes/Scierror.h
+includes/Scierror.h \
+includes/dynlib_output_stream.h \
+includes/scilabWrite.hxx
 
 
 # Where all the Scilab stuff is installed (macros, help, ...)
index 2f9c2cb..996bf9c 100644 (file)
@@ -32,6 +32,7 @@ Source: modules\{#OUTPUT_STREAM}\includes\sciprint.h; DestDir: {app}\modules\{#O
 Source: modules\{#OUTPUT_STREAM}\includes\do_error_number.h; DestDir: {app}\modules\{#OUTPUT_STREAM}\includes; Components: {#COMPN_SCILAB}
 Source: modules\{#OUTPUT_STREAM}\includes\cerro.h; DestDir: {app}\modules\{#OUTPUT_STREAM}\includes; Components: {#COMPN_SCILAB}
 Source: modules\{#OUTPUT_STREAM}\includes\dynlib_output_stream.h; DestDir: {app}\modules\{#OUTPUT_STREAM}\includes; Components: {#COMPN_SCILAB}
+Source: modules\{#OUTPUT_STREAM}\includes\scilabWrite.hxx; DestDir: {app}\modules\{#OUTPUT_STREAM}\includes; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#OUTPUT_STREAM}\sci_gateway\{#OUTPUT_STREAM}_gateway.xml; DestDir: {app}\modules\{#OUTPUT_STREAM}\sci_gateway; Components: {#COMPN_SCILAB}
 ;
@@ -41,7 +42,7 @@ Source: modules\{#OUTPUT_STREAM}\etc\{#OUTPUT_STREAM}.start; DestDir: {app}\modu
 Source: modules\{#OUTPUT_STREAM}\macros\buildmacros.sce; DestDir: {app}\modules\{#OUTPUT_STREAM}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#OUTPUT_STREAM}\macros\buildmacros.bat; DestDir: {app}\modules\{#OUTPUT_STREAM}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#OUTPUT_STREAM}\macros\cleanmacros.bat; DestDir: {app}\modules\{#OUTPUT_STREAM}\macros; Components: {#COMPN_SCILAB}
-;Source: modules\{#OUTPUT_STREAM}\macros\*.bin; DestDir: {app}\modules\{#OUTPUT_STREAM}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#OUTPUT_STREAM}\macros\*.bin; DestDir: {app}\modules\{#OUTPUT_STREAM}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#OUTPUT_STREAM}\macros\*.sci; DestDir: {app}\modules\{#OUTPUT_STREAM}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#OUTPUT_STREAM}\macros\lib; DestDir: {app}\modules\{#OUTPUT_STREAM}\macros; Components: {#COMPN_SCILAB}
 ;Source: modules\{#OUTPUT_STREAM}\macros\names; DestDir: {app}\modules\{#OUTPUT_STREAM}\macros; Components: {#COMPN_SCILAB}
index 696b27f..b86cd0f 100644 (file)
@@ -30,6 +30,7 @@ Source: modules\{#OVERLOADING}\macros\buildmacros.bat; DestDir: {app}\modules\{#
 Source: modules\{#OVERLOADING}\macros\cleanmacros.bat; DestDir: {app}\modules\{#OVERLOADING}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#OVERLOADING}\macros\lib; DestDir: {app}\modules\{#OVERLOADING}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#OVERLOADING}\macros\*.sci; DestDir: {app}\modules\{#OVERLOADING}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#OVERLOADING}\macros\*.bin; DestDir: {app}\modules\{#OVERLOADING}\macros; Components: {#COMPN_SCILAB}
 ;
 ;Source: modules\{#OVERLOADING}\demos\*.*; DestDir: {app}\modules\{#OVERLOADING}\demos; Flags: recursesubdirs;  Components: {#COMPN_SCILAB}
 ;
index b7d46ef..c956228 100644 (file)
@@ -27,8 +27,9 @@ Source: modules\{#PARAMETERS}\license.txt; DestDir: {app}\modules\{#PARAMETERS};
 Source: modules\{#PARAMETERS}\etc\{#PARAMETERS}.quit; DestDir: {app}\modules\{#PARAMETERS}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#PARAMETERS}\etc\{#PARAMETERS}.start; DestDir: {app}\modules\{#PARAMETERS}\etc; Components: {#COMPN_SCILAB}
 ;
-;Source: modules\{#PARAMETERS}\macros\lib; DestDir: {app}\modules\{#PARAMETERS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#PARAMETERS}\macros\lib; DestDir: {app}\modules\{#PARAMETERS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#PARAMETERS}\macros\*.sci; DestDir: {app}\modules\{#PARAMETERS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#PARAMETERS}\macros\*.bin; DestDir: {app}\modules\{#PARAMETERS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#PARAMETERS}\macros\buildmacros.sce; DestDir: {app}\modules\{#PARAMETERS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#PARAMETERS}\macros\buildmacros.bat; DestDir: {app}\modules\{#PARAMETERS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#PARAMETERS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#PARAMETERS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
index ddc67c4..ea35f4d 100644 (file)
@@ -67,4 +67,12 @@ libsciparse_la_CPPFLAGS = \
        -I$(top_builddir)/modules/system_env/includes \
        $(AM_CPPFLAGS)
 
+#### parse : include files ####
+libsciparse_la_includedir=$(pkgincludedir)
+libsciparse_la_include_HEADERS = includes/isatty.hxx \
+includes/parse.hxx \
+includes/parser.hxx \
+includes/parser_private.hxx \
+includes/parsescilab.hxx
+
 include $(top_srcdir)/Makefile.incl.am
index 7375459..1317e32 100644 (file)
@@ -30,6 +30,7 @@
 ### Target, variable, suffixes which are supposed to be useful in every makefile.am
 ##########
 
+
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -96,7 +97,7 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(top_srcdir)/Makefile.incl.am $(srcdir)/Makefile.in \
        $(srcdir)/Makefile.am $(top_srcdir)/config/mkinstalldirs \
-       $(top_srcdir)/config/depcomp
+       $(top_srcdir)/config/depcomp $(libsciparse_la_include_HEADERS)
 @NEED_JAVA_TRUE@am__append_1 = java
 subdir = modules/parse
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -150,7 +151,8 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(pkglibdir)"
+am__installdirs = "$(DESTDIR)$(pkglibdir)" \
+       "$(DESTDIR)$(libsciparse_la_includedir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libsciparse_la_LIBADD =
 am__dirstamp = $(am__leading_dot)dirstamp
@@ -206,6 +208,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+HEADERS = $(libsciparse_la_include_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -548,6 +551,15 @@ libsciparse_la_CPPFLAGS = \
        $(AM_CPPFLAGS)
 
 
+#### parse : include files ####
+libsciparse_la_includedir = $(pkgincludedir)
+libsciparse_la_include_HEADERS = includes/isatty.hxx \
+includes/parse.hxx \
+includes/parser.hxx \
+includes/parser_private.hxx \
+includes/parsescilab.hxx
+
+
 # Where all the Scilab stuff is installed (macros, help, ...)
 mydatadir = $(pkgdatadir)/modules/$(modulename)
 
@@ -780,6 +792,27 @@ mostlyclean-libtool:
 clean-libtool:
        -rm -rf .libs _libs
        -rm -rf src/cpp/.libs src/cpp/_libs
+install-libsciparse_la_includeHEADERS: $(libsciparse_la_include_HEADERS)
+       @$(NORMAL_INSTALL)
+       @list='$(libsciparse_la_include_HEADERS)'; test -n "$(libsciparse_la_includedir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libsciparse_la_includedir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libsciparse_la_includedir)" || exit 1; \
+       fi; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libsciparse_la_includedir)'"; \
+         $(INSTALL_HEADER) $$files "$(DESTDIR)$(libsciparse_la_includedir)" || exit $$?; \
+       done
+
+uninstall-libsciparse_la_includeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(libsciparse_la_include_HEADERS)'; test -n "$(libsciparse_la_includedir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       dir='$(DESTDIR)$(libsciparse_la_includedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(am__tagged_files)
        $(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -867,9 +900,9 @@ check-am: all-am
        $(MAKE) $(AM_MAKEFLAGS) check-local
 check: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LTLIBRARIES) all-local
+all-am: Makefile $(LTLIBRARIES) $(HEADERS) all-local
 installdirs:
-       for dir in "$(DESTDIR)$(pkglibdir)"; do \
+       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciparse_la_includedir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: $(BUILT_SOURCES)
@@ -929,7 +962,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-data-local \
+       install-libsciparse_la_includeHEADERS
 
 install-dvi: install-dvi-am
 
@@ -975,7 +1009,8 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-pkglibLTLIBRARIES
+uninstall-am: uninstall-libsciparse_la_includeHEADERS \
+       uninstall-pkglibLTLIBRARIES
 
 .MAKE: all check check-am install install-am install-strip
 
@@ -987,13 +1022,14 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
        info info-am install install-am install-data install-data-am \
        install-data-local install-dvi install-dvi-am install-exec \
        install-exec-am install-html install-html-am \
-       install-html-local install-info install-info-am install-man \
-       install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-       install-ps install-ps-am install-strip installcheck \
-       installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-compile \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       tags tags-am uninstall uninstall-am \
+       install-html-local install-info install-info-am \
+       install-libsciparse_la_includeHEADERS install-man install-pdf \
+       install-pdf-am install-pkglibLTLIBRARIES install-ps \
+       install-ps-am install-strip installcheck installcheck-am \
+       installdirs maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-compile mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+       uninstall-am uninstall-libsciparse_la_includeHEADERS \
        uninstall-pkglibLTLIBRARIES
 
 
index db1fb53..8479b33 100644 (file)
@@ -20,6 +20,8 @@
 Source: bin\{#PARSE}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\{#PARSE}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
+Source: modules\{#PARSE}\includes\*.*; DestDir: {app}\modules\{#PARSE}\includes; Components: {#COMPN_SCILAB}
+;
 Source: modules\{#PARSE}\etc\{#PARSE}.quit; DestDir: {app}\modules\{#PARSE}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#PARSE}\etc\{#PARSE}.start; DestDir: {app}\modules\{#PARSE}\etc; Components: {#COMPN_SCILAB}
 ;
index 1169e1b..a42cc39 100644 (file)
@@ -33,6 +33,7 @@ Source: modules\{#POLYNOMIALS}\macros\buildmacros.bat; DestDir: {app}\modules\{#
 Source: modules\{#POLYNOMIALS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#POLYNOMIALS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#POLYNOMIALS}\macros\lib; DestDir: {app}\modules\{#POLYNOMIALS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#POLYNOMIALS}\macros\*.sci; DestDir: {app}\modules\{#POLYNOMIALS}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#POLYNOMIALS}\macros\*.bin; DestDir: {app}\modules\{#POLYNOMIALS}\macros; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#POLYNOMIALS}\demos\*.*; DestDir: {app}\modules\{#POLYNOMIALS}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 ;
index cbe70bd..b827f14 100644 (file)
@@ -40,6 +40,7 @@ Source: modules\{#PREFERENCES}\macros\buildmacros.bat; DestDir: {app}\modules\{#
 Source: modules\{#PREFERENCES}\macros\cleanmacros.bat; DestDir: {app}\modules\{#PREFERENCES}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#PREFERENCES}\macros\lib; DestDir: {app}\modules\{#PREFERENCES}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#PREFERENCES}\macros\*.sci; DestDir: {app}\modules\{#PREFERENCES}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#PREFERENCES}\macros\*.bin; DestDir: {app}\modules\{#PREFERENCES}\macros; Components: {#COMPN_SCILAB}
 ;
 ;Source: modules\{#PREFERENCES}\examples\*.*; DestDir: {app}\modules\{#PREFERENCES}\examples; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 ;
index cb9b762..d8cce0e 100644 (file)
@@ -32,6 +32,7 @@ Source: modules\{#RANDLIB}\etc\{#RANDLIB}.start; DestDir: {app}\modules\{#RANDLI
 ;
 Source: modules\{#RANDLIB}\macros\lib; DestDir: {app}\modules\{#RANDLIB}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#RANDLIB}\macros\*.sci; DestDir: {app}\modules\{#RANDLIB}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#RANDLIB}\macros\*.bin; DestDir: {app}\modules\{#RANDLIB}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#RANDLIB}\macros\buildmacros.sce; DestDir: {app}\modules\{#RANDLIB}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#RANDLIB}\macros\buildmacros.bat; DestDir: {app}\modules\{#RANDLIB}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#RANDLIB}\macros\cleanmacros.bat; DestDir: {app}\modules\{#RANDLIB}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
index ab6e8b7..67dc4c2 100644 (file)
@@ -50,8 +50,9 @@ Source: modules\{#SCICOS}\includes\dynlib_scicos.h; DestDir: {app}\modules\{#SCI
 Source: modules\{#SCICOS}\includes\import.h; DestDir: {app}\modules\{#SCICOS}\includes; Components: {#COMPN_XCOS}
 ;
 Source: modules\{#SCICOS}\macros\buildmacros.sce; DestDir: {app}\modules\{#SCICOS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS}
-;Source: modules\{#SCICOS}\macros\lib; DestDir: {app}\modules\{#SCICOS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS}
 Source: modules\{#SCICOS}\macros\*.sci; DestDir: {app}\modules\{#SCICOS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS}
+;Source: modules\{#SCICOS}\macros\*.bin; DestDir: {app}\modules\{#SCICOS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS}
+;Source: modules\{#SCICOS}\macros\lib; DestDir: {app}\modules\{#SCICOS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS}
 Source: modules\{#SCICOS}\macros\*.sce; DestDir: {app}\modules\{#SCICOS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS}
 Source: modules\{#SCICOS}\macros\*.cosf; DestDir: {app}\modules\{#SCICOS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS}
 ;
index f965557..d8ac513 100644 (file)
@@ -43,6 +43,7 @@ Source: bin\xml2modelica.exe; DestDir: {app}\bin; Components: {#COMPN_XCOS}
 ;
 ;Source: modules\{#SCICOS_BLOCKS}\macros\lib; DestDir: {app}\modules\{#SCICOS_BLOCKS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS}
 Source: modules\{#SCICOS_BLOCKS}\macros\*.sci; DestDir: {app}\modules\{#SCICOS_BLOCKS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS}
+;Source: modules\{#SCICOS_BLOCKS}\macros\*.bin; DestDir: {app}\modules\{#SCICOS_BLOCKS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS}
 Source: modules\{#SCICOS_BLOCKS}\macros\*.sce; DestDir: {app}\modules\{#SCICOS_BLOCKS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS}
 Source: modules\{#SCICOS_BLOCKS}\macros\*.mo; DestDir: {app}\modules\{#SCICOS_BLOCKS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS}
 ;
index 73b54fe..abfcba0 100644 (file)
@@ -32,6 +32,7 @@ Source: modules\{#SCINOTES}\etc\*.xsl; DestDir: {app}\modules\{#SCINOTES}\etc; C
 ;
 Source: modules\{#SCINOTES}\macros\lib; DestDir: {app}\modules\{#SCINOTES}\macros; Components: {#COMPN_SCINOTES}
 Source: modules\{#SCINOTES}\macros\*.sci; DestDir: {app}\modules\{#SCINOTES}\macros; Components: {#COMPN_SCINOTES}
+Source: modules\{#SCINOTES}\macros\*.bin; DestDir: {app}\modules\{#SCINOTES}\macros; Components: {#COMPN_SCINOTES}
 Source: modules\{#SCINOTES}\macros\buildmacros.sce; DestDir: {app}\modules\{#SCINOTES}\macros; Components: {#COMPN_SCINOTES}
 Source: modules\{#SCINOTES}\macros\buildmacros.bat; DestDir: {app}\modules\{#SCINOTES}\macros; Components: {#COMPN_SCINOTES}
 Source: modules\{#SCINOTES}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SCINOTES}\macros; Components: {#COMPN_SCINOTES}
index f2cf27c..da9481b 100644 (file)
@@ -31,6 +31,7 @@ Source: modules\{#SIGPROC}\etc\{#SIGPROC}.start; DestDir: {app}\modules\{#SIGPRO
 ;
 Source: modules\{#SIGPROC}\macros\lib; DestDir: {app}\modules\{#SIGPROC}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#SIGPROC}\macros\*.sci; DestDir: {app}\modules\{#SIGPROC}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#SIGPROC}\macros\*.bin; DestDir: {app}\modules\{#SIGPROC}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#SIGPROC}\macros\buildmacros.sce; DestDir: {app}\modules\{#SIGPROC}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#SIGPROC}\macros\buildmacros.bat; DestDir: {app}\modules\{#SIGPROC}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#SIGPROC}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SIGPROC}\macros; Components: {#COMPN_SCILAB}
index e1fc04f..3b9a265 100644 (file)
@@ -25,8 +25,9 @@ Source: modules\{#SIMANNEALING}\etc\{#SIMANNEALING}.start; DestDir: {app}\module
 ;
 Source: modules\{#SIMANNEALING}\demos\*.*; DestDir: {app}\modules\{#SIMANNEALING}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 ;
-;Source: modules\{#SIMANNEALING}\macros\lib; DestDir: {app}\modules\{#SIMANNEALING}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#SIMANNEALING}\macros\lib; DestDir: {app}\modules\{#SIMANNEALING}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#SIMANNEALING}\macros\*.sci; DestDir: {app}\modules\{#SIMANNEALING}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#SIMANNEALING}\macros\*.bin; DestDir: {app}\modules\{#SIMANNEALING}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#SIMANNEALING}\macros\buildmacros.sce; DestDir: {app}\modules\{#SIMANNEALING}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#SIMANNEALING}\macros\buildmacros.bat; DestDir: {app}\modules\{#SIMANNEALING}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#SIMANNEALING}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SIMANNEALING}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
index f80af0b..69e488e 100644 (file)
@@ -31,6 +31,7 @@ Source: modules\{#SOUND}\macros\buildmacros.sce; DestDir: {app}\modules\{#SOUND}
 Source: modules\{#SOUND}\macros\buildmacros.bat; DestDir: {app}\modules\{#SOUND}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#SOUND}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SOUND}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#SOUND}\macros\*.sci; DestDir: {app}\modules\{#SOUND}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#SOUND}\macros\*.bin; DestDir: {app}\modules\{#SOUND}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#SOUND}\macros\lib; DestDir: {app}\modules\{#SOUND}\macros; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#SOUND}\demos\*.*; DestDir: {app}\modules\{#SOUND}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
index 02dfebb..6fcb908 100644 (file)
@@ -32,9 +32,10 @@ Source: modules\{#SPARSE}\etc\{#SPARSE}.start; DestDir: {app}\modules\{#SPARSE}\
 Source: modules\{#SPARSE}\macros\buildmacros.sce; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#SPARSE}\macros\buildmacros.bat; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#SPARSE}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SCILAB}
-;Source: modules\{#SPARSE}\macros\lib; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#SPARSE}\macros\lib; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#SPARSE}\macros\*.sci; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SCILAB}
-;
+Source: modules\{#SPARSE}\macros\*.bin; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SCILAB};
+
 Source: modules\{#SPARSE}\tests\*.*; DestDir: {app}\modules\{#SPARSE}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
 ;
 ;--------------------------------------------------------------------------------------------------------------
index ea6f798..c09e298 100644 (file)
@@ -32,6 +32,7 @@ Source: modules\{#SPFUNCTIONS}\etc\{#SPFUNCTIONS}.start; DestDir: {app}\modules\
 ;
 Source: modules\{#SPFUNCTIONS}\macros\lib; DestDir: {app}\modules\{#SPFUNCTIONS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#SPFUNCTIONS}\macros\*.sci; DestDir: {app}\modules\{#SPFUNCTIONS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#SPFUNCTIONS}\macros\*.bin; DestDir: {app}\modules\{#SPFUNCTIONS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#SPFUNCTIONS}\macros\buildmacros.sce; DestDir: {app}\modules\{#SPFUNCTIONS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#SPFUNCTIONS}\macros\buildmacros.bat; DestDir: {app}\modules\{#SPFUNCTIONS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#SPFUNCTIONS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SPFUNCTIONS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
index eb950cb..5b4a8dd 100644 (file)
@@ -33,6 +33,7 @@ Source: modules\{#SPREADSHEET}\macros\buildmacros.sce; DestDir: {app}\modules\{#
 Source: modules\{#SPREADSHEET}\macros\buildmacros.bat; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#SPREADSHEET}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#SPREADSHEET}\macros\*.sci; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#SPREADSHEET}\macros\*.bin; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#SPREADSHEET}\macros\lib; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#SPREADSHEET}\demos\*.*; DestDir: {app}\modules\{#SPREADSHEET}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
index 12c62f7..16d4632 100644 (file)
@@ -31,6 +31,7 @@ Source: modules\{#STATISTICS}\etc\{#STATISTICS}.start; DestDir: {app}\modules\{#
 ;
 Source: modules\{#STATISTICS}\macros\lib; DestDir: {app}\modules\{#STATISTICS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#STATISTICS}\macros\*.sci; DestDir: {app}\modules\{#STATISTICS}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#STATISTICS}\macros\*.bin; DestDir: {app}\modules\{#STATISTICS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#STATISTICS}\macros\buildmacros.sce; DestDir: {app}\modules\{#STATISTICS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#STATISTICS}\macros\buildmacros.bat; DestDir: {app}\modules\{#STATISTICS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#STATISTICS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#STATISTICS}\macros; Components: {#COMPN_SCILAB}
index 215c43b..4ce47a2 100644 (file)
@@ -135,5 +135,33 @@ libscistring_la_etc_DATA = etc/string.quit etc/string.start
 libscistring_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscistring_la_sci_gateway_DATA = sci_gateway/string_gateway.xml
 
+#### string : include files ####
+libscistring_la_includedir=$(pkgincludedir)
+libscistring_la_include_HEADERS = \
+includes/complex_array.h \
+includes/convstr.h \
+includes/cvstr.h \
+includes/dynlib_string_gw.h \
+includes/dynlib_string.h \
+includes/getfastcode.h \
+includes/men_Sutils.h \
+includes/os_strdup.h \
+includes/os_stricmp.h \
+includes/os_swprintf.h \
+includes/os_wcsdup.h \
+includes/os_wcsicmp.h \
+includes/os_wcstok.h \
+includes/pcre_private.h \
+includes/scistrtostr.h \
+includes/stricmp.h \
+includes/StringConvert.h \
+includes/string_gw.hxx \
+includes/stringToComplex.h \
+includes/stringToDouble.h \
+includes/stristr.h \
+includes/strsubst.h
+
+
+
 include $(top_srcdir)/Makefile.incl.am
 
index a438947..c213f5d 100644 (file)
@@ -36,6 +36,7 @@
 ##########
 
 
+
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -102,7 +103,8 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(top_srcdir)/Makefile.incl.am $(srcdir)/Makefile.in \
        $(srcdir)/Makefile.am $(top_srcdir)/config/mkinstalldirs \
-       $(top_srcdir)/config/depcomp
+       $(top_srcdir)/config/depcomp \
+       $(libscistring_la_include_HEADERS)
 @NEED_JAVA_TRUE@am__append_1 = java
 subdir = modules/string
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -159,7 +161,8 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libscistring_la_etcdir)" \
        "$(DESTDIR)$(libscistring_la_rootdir)" \
-       "$(DESTDIR)$(libscistring_la_sci_gatewaydir)"
+       "$(DESTDIR)$(libscistring_la_sci_gatewaydir)" \
+       "$(DESTDIR)$(libscistring_la_includedir)"
 LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 libscistring_algo_la_LIBADD =
 am__dirstamp = $(am__leading_dot)dirstamp
@@ -300,6 +303,7 @@ am__can_run_installinfo = \
   esac
 DATA = $(libscistring_la_etc_DATA) $(libscistring_la_root_DATA) \
        $(libscistring_la_sci_gateway_DATA)
+HEADERS = $(libscistring_la_include_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -727,6 +731,33 @@ libscistring_la_etc_DATA = etc/string.quit etc/string.start
 libscistring_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 libscistring_la_sci_gateway_DATA = sci_gateway/string_gateway.xml
 
+#### string : include files ####
+libscistring_la_includedir = $(pkgincludedir)
+libscistring_la_include_HEADERS = \
+includes/complex_array.h \
+includes/convstr.h \
+includes/cvstr.h \
+includes/dynlib_string_gw.h \
+includes/dynlib_string.h \
+includes/getfastcode.h \
+includes/men_Sutils.h \
+includes/os_strdup.h \
+includes/os_stricmp.h \
+includes/os_swprintf.h \
+includes/os_wcsdup.h \
+includes/os_wcsicmp.h \
+includes/os_wcstok.h \
+includes/pcre_private.h \
+includes/scistrtostr.h \
+includes/stricmp.h \
+includes/StringConvert.h \
+includes/string_gw.hxx \
+includes/stringToComplex.h \
+includes/stringToDouble.h \
+includes/stristr.h \
+includes/strsubst.h
+
+
 # Where all the Scilab stuff is installed (macros, help, ...)
 mydatadir = $(pkgdatadir)/modules/$(modulename)
 
@@ -1626,6 +1657,27 @@ uninstall-libscistring_la_sci_gatewayDATA:
        @list='$(libscistring_la_sci_gateway_DATA)'; test -n "$(libscistring_la_sci_gatewaydir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(libscistring_la_sci_gatewaydir)'; $(am__uninstall_files_from_dir)
+install-libscistring_la_includeHEADERS: $(libscistring_la_include_HEADERS)
+       @$(NORMAL_INSTALL)
+       @list='$(libscistring_la_include_HEADERS)'; test -n "$(libscistring_la_includedir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libscistring_la_includedir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libscistring_la_includedir)" || exit 1; \
+       fi; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libscistring_la_includedir)'"; \
+         $(INSTALL_HEADER) $$files "$(DESTDIR)$(libscistring_la_includedir)" || exit $$?; \
+       done
+
+uninstall-libscistring_la_includeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(libscistring_la_include_HEADERS)'; test -n "$(libscistring_la_includedir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       dir='$(DESTDIR)$(libscistring_la_includedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(am__tagged_files)
        $(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -1712,9 +1764,9 @@ distdir: $(DISTFILES)
 check-am: all-am
        $(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local
 installdirs:
-       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libscistring_la_etcdir)" "$(DESTDIR)$(libscistring_la_rootdir)" "$(DESTDIR)$(libscistring_la_sci_gatewaydir)"; do \
+       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libscistring_la_etcdir)" "$(DESTDIR)$(libscistring_la_rootdir)" "$(DESTDIR)$(libscistring_la_sci_gatewaydir)" "$(DESTDIR)$(libscistring_la_includedir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-am
@@ -1777,6 +1829,7 @@ info: info-am
 info-am:
 
 install-data-am: install-data-local install-libscistring_la_etcDATA \
+       install-libscistring_la_includeHEADERS \
        install-libscistring_la_rootDATA \
        install-libscistring_la_sci_gatewayDATA
 
@@ -1825,6 +1878,7 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-libscistring_la_etcDATA \
+       uninstall-libscistring_la_includeHEADERS \
        uninstall-libscistring_la_rootDATA \
        uninstall-libscistring_la_sci_gatewayDATA \
        uninstall-pkglibLTLIBRARIES
@@ -1841,6 +1895,7 @@ uninstall-am: uninstall-libscistring_la_etcDATA \
        install-dvi-am install-exec install-exec-am install-html \
        install-html-am install-html-local install-info \
        install-info-am install-libscistring_la_etcDATA \
+       install-libscistring_la_includeHEADERS \
        install-libscistring_la_rootDATA \
        install-libscistring_la_sci_gatewayDATA install-man \
        install-pdf install-pdf-am install-pkglibLTLIBRARIES \
@@ -1850,6 +1905,7 @@ uninstall-am: uninstall-libscistring_la_etcDATA \
        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
        tags tags-am uninstall uninstall-am \
        uninstall-libscistring_la_etcDATA \
+       uninstall-libscistring_la_includeHEADERS \
        uninstall-libscistring_la_rootDATA \
        uninstall-libscistring_la_sci_gatewayDATA \
        uninstall-pkglibLTLIBRARIES
index c807ab2..1f5ecdb 100644 (file)
@@ -36,6 +36,7 @@ Source: modules\{#STRING}\macros\buildmacros.bat; DestDir: {app}\modules\{#STRIN
 Source: modules\{#STRING}\macros\cleanmacros.bat; DestDir: {app}\modules\{#STRING}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#STRING}\macros\lib; DestDir: {app}\modules\{#STRING}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#STRING}\macros\*.sci; DestDir: {app}\modules\{#STRING}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#STRING}\macros\*.bin; DestDir: {app}\modules\{#STRING}\macros; Components: {#COMPN_SCILAB}
 ;
 ;Source: modules\{#STRING}\demos\*.*; DestDir: {app}\modules\{#STRING}\demos; Flags: recursesubdirs;  Components: {#COMPN_SCILAB}
 ;
index 26ea704..1d63549 100644 (file)
@@ -13,7 +13,6 @@
 SYMBOL_CXX_SOURCES = \
 src/cpp/symbol.cpp \
 src/cpp/context.cpp
-    
 
 pkglib_LTLIBRARIES             = libscisymbol.la
 
@@ -35,9 +34,15 @@ libscisymbol_la_CPPFLAGS = \
 
 libscisymbol_la_LIBADD =
 
-libscisymbol_la_includedir=$(pkgincludedir)/Symbol
-
-libscisymbol_la_include_HEADERS = includes/symbol.hxx
+#### symbol : include files ####
+libscisymbol_la_includedir=$(pkgincludedir)
+libscisymbol_la_include_HEADERS = \
+    includes/context.hxx \
+    includes/export_symbol.h \
+    includes/libraries.hxx \
+    includes/scope.hxx \
+    includes/symbol.hxx \
+    includes/variables.hxx
 
 # For the code check (splint)
 INCLUDE_FLAGS = $(libscisymbol_la_CPPFLAGS)
index be5e8f2..611d8fd 100644 (file)
@@ -530,8 +530,17 @@ libscisymbol_la_CPPFLAGS = \
        $(AM_CPPFLAGS)
 
 libscisymbol_la_LIBADD = 
-libscisymbol_la_includedir = $(pkgincludedir)/Symbol
-libscisymbol_la_include_HEADERS = includes/symbol.hxx
+
+#### symbol : include files ####
+libscisymbol_la_includedir = $(pkgincludedir)
+libscisymbol_la_include_HEADERS = \
+    includes/context.hxx \
+    includes/export_symbol.h \
+    includes/libraries.hxx \
+    includes/scope.hxx \
+    includes/symbol.hxx \
+    includes/variables.hxx
+
 
 # For the code check (splint)
 INCLUDE_FLAGS = $(libscisymbol_la_CPPFLAGS)
diff --git a/scilab/modules/symbol/symbol.iss b/scilab/modules/symbol/symbol.iss
new file mode 100644 (file)
index 0000000..65046df
--- /dev/null
@@ -0,0 +1,25 @@
+;
+; Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+; Copyright (C) 2014 - Scilab Enterprises
+;
+; This file must be used under the terms of the CeCILL.
+; This source file is licensed as described in the file COPYING, which
+; 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
+;
+;--------------------------------------------------------------------------------------------------------------
+; Inno Setup Script (5.3 and more) for Scilab (UNICODE version required)
+;
+;--------------------------------------------------------------------------------------------------------------
+; symbol module
+;--------------------------------------------------------------------------------------------------------------
+;
+#define SYMBOL "symbol"
+;
+Source: bin\{#SYMBOL}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\{#SYMBOL}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+;
+Source: modules\{#SYMBOL}\includes\*.*; DestDir: {app}\modules\{#SYMBOL}\includes; Components: {#COMPN_SCILAB}
+;
+;--------------------------------------------------------------------------------------------------------------
index 2b23216..c8264a3 100644 (file)
@@ -52,7 +52,21 @@ libscisystem_env_la_CPPFLAGS = \
        $(AM_CPPFLAGS)
 
 
-libscisystem_env_la_includedir=$(pkgincludedir)/system_env
-
-libscisystem_env_la_include_HEADERS = includes/setenvvar.hxx \
+#### system_env : include files ####
+libscisystem_env_la_includedir=$(pkgincludedir)
+libscisystem_env_la_include_HEADERS = includes/configvariable.hxx \
+includes/dynlib_system_env.h \
+includes/home.h \
+includes/promptmode.h \
+includes/sci_home.h \
+includes/sci_mode.h \
+includes/sci_simpMode.h \
+includes/setenvvar.hxx \
+includes/context_get.h \
+includes/formatmode.h \
+includes/lasterror.h \
+includes/reference_modules.h \
+includes/sci_ieee.h \
+includes/sci_path.h \
+includes/sci_tmpdir.h \
 includes/warningmode.h
index d592de0..05ce1ab 100644 (file)
@@ -544,8 +544,24 @@ libscisystem_env_la_CPPFLAGS = \
        -I $(top_srcdir)/modules/localization/includes/ \
        $(AM_CPPFLAGS)
 
-libscisystem_env_la_includedir = $(pkgincludedir)/system_env
-libscisystem_env_la_include_HEADERS = includes/setenvvar.hxx \
+
+#### system_env : include files ####
+libscisystem_env_la_includedir = $(pkgincludedir)
+libscisystem_env_la_include_HEADERS = includes/configvariable.hxx \
+includes/dynlib_system_env.h \
+includes/home.h \
+includes/promptmode.h \
+includes/sci_home.h \
+includes/sci_mode.h \
+includes/sci_simpMode.h \
+includes/setenvvar.hxx \
+includes/context_get.h \
+includes/formatmode.h \
+includes/lasterror.h \
+includes/reference_modules.h \
+includes/sci_ieee.h \
+includes/sci_path.h \
+includes/sci_tmpdir.h \
 includes/warningmode.h
 
 all: all-am
index d1bcb31..405fa05 100644 (file)
@@ -20,5 +20,5 @@
 Source: bin\{#SYSTEM_ENV}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\{#SYSTEM_ENV}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#SYSTEM_ENV}\includes\warningmode.h; DestDir: {app}\modules\{#SYSTEM_ENV}\includes; Components: {#COMPN_SCILAB}
+Source: modules\{#SYSTEM_ENV}\includes\*.*; DestDir: {app}\modules\{#SYSTEM_ENV}\includes; Components: {#COMPN_SCILAB}
 ;--------------------------------------------------------------------------------------------------------------
index a42ab76..fa92a5f 100644 (file)
@@ -31,6 +31,7 @@ Source: modules\{#TCLSCI}\demos\*.*; DestDir: {app}\modules\{#TCLSCI}\demos; Fla
 ;
 Source: modules\{#TCLSCI}\macros\lib; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#TCLSCI}\macros\*.sci; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#TCLSCI}\macros\*.bin; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#TCLSCI}\macros\buildmacros.sce; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#TCLSCI}\macros\buildmacros.bat; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#TCLSCI}\macros\cleanmacros.bat; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_SCILAB}
index 68ccfc2..2582615 100644 (file)
@@ -47,6 +47,7 @@ libscithreads_la_rootdir = $(mydatadir)
 #### threads : include files ####
 libscithreads_la_includedir=$(pkgincludedir)
 libscithreads_la_include_HEADERS = \
-includes/Thread_Wrapper.h
+includes/Thread_Wrapper.h \
+includes/dynlib_threads.h
 
 include $(top_srcdir)/Makefile.incl.am
index d47d95e..2ef0036 100644 (file)
@@ -559,7 +559,8 @@ libscithreads_la_rootdir = $(mydatadir)
 #### threads : include files ####
 libscithreads_la_includedir = $(pkgincludedir)
 libscithreads_la_include_HEADERS = \
-includes/Thread_Wrapper.h
+includes/Thread_Wrapper.h \
+includes/dynlib_threads.h
 
 
 # Where all the Scilab stuff is installed (macros, help, ...)
index 8094558..5e57475 100644 (file)
@@ -37,7 +37,7 @@ Source: modules\{#TIME}\etc\{#TIME}.start; DestDir: {app}\modules\{#TIME}\etc; C
 Source: modules\{#TIME}\macros\buildmacros.sce; DestDir: {app}\modules\{#TIME}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#TIME}\macros\buildmacros.bat; DestDir: {app}\modules\{#TIME}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#TIME}\macros\cleanmacros.bat; DestDir: {app}\modules\{#TIME}\macros; Components: {#COMPN_SCILAB}
-;Source: modules\{#TIME}\macros\*.bin; DestDir: {app}\modules\{#TIME}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#TIME}\macros\*.bin; DestDir: {app}\modules\{#TIME}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#TIME}\macros\*.sci; DestDir: {app}\modules\{#TIME}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#TIME}\macros\lib; DestDir: {app}\modules\{#TIME}\macros; Components: {#COMPN_SCILAB}
 ;Source: modules\{#TIME}\macros\names; DestDir: {app}\modules\{#TIME}\macros; Components: {#COMPN_SCILAB}
index c2f554f..a699153 100644 (file)
@@ -26,6 +26,60 @@ libscitypes_la_etc_DATA = etc/types.quit \
 
 include $(top_srcdir)/Makefile.incl.am
 
+#### types : include files ####
+libscitypes_la_includedir=$(pkgincludedir)
+libscitypes_la_include_HEADERS = \
+includes/alltypes.hxx \
+includes/arrayof.hxx \
+includes/bool.hxx \
+includes/callable.hxx \
+includes/cell.hxx \
+includes/c_gateway_prototype.h \
+includes/colon.hxx \
+includes/container.hxx \
+includes/cpp_gateway_prototype.hxx \
+includes/dollar.hxx \
+includes/double.hxx \
+includes/dynlib_types_gw.h \
+includes/dynlib_types.h \
+includes/file.hxx \
+includes/float.hxx \
+includes/function.hxx \
+includes/gatewaystruct.hxx \
+includes/GetScilabVariable.h \
+includes/graphichandle.hxx \
+includes/implicitlist.hxx \
+includes/inspector.hxx \
+includes/internal.hxx \
+includes/int.hxx \
+includes/library.hxx \
+includes/listdelete.hxx \
+includes/list.hxx \
+includes/listinsert.hxx \
+includes/listoperation.hxx \
+includes/listundefined.hxx \
+includes/macrofile.hxx \
+includes/macro.hxx \
+includes/matrixiterator.hxx \
+includes/mlist.hxx \
+includes/pointer.hxx \
+includes/polynom.hxx \
+includes/ScilabToJava.hxx \
+includes/singlepoly.hxx \
+includes/singlestruct.hxx \
+includes/sparse.hxx \
+includes/sparseOp.hxx \
+includes/string.hxx \
+includes/struct.hxx \
+includes/threadId.hxx \
+includes/tlist.hxx \
+includes/tostring_common.hxx \
+includes/types_gw.hxx \
+includes/types.hxx \
+includes/types_tools.hxx \
+includes/user.hxx \
+includes/void.hxx \
+includes/typesdecl.hxx
 
 TYPES_JAVA_C_SOURCES = src/jni/getScilabVariable_wrap.c
 
index 42f72c5..56cb49d 100644 (file)
@@ -43,6 +43,7 @@
 ##########
 
 
+
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -109,7 +110,7 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(top_srcdir)/Makefile.incl.am $(srcdir)/Makefile.in \
        $(srcdir)/Makefile.am $(top_srcdir)/config/mkinstalldirs \
-       $(top_srcdir)/config/depcomp
+       $(top_srcdir)/config/depcomp $(libscitypes_la_include_HEADERS)
 @NEED_JAVA_TRUE@am__append_1 = java
 @ENABLE_DEBUG_TRUE@am__append_2 = src/cpp/inspector.cpp
 @GIWS_TRUE@am__append_3 = giws
@@ -181,7 +182,8 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libscitypes_la_etcdir)" \
        "$(DESTDIR)$(libscitypes_la_rootdir)" \
-       "$(DESTDIR)$(libscitypes_la_sci_gatewaydir)"
+       "$(DESTDIR)$(libscitypes_la_sci_gatewaydir)" \
+       "$(DESTDIR)$(libscitypes_la_includedir)"
 LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 libscitypes_algo_la_LIBADD =
 am__libscitypes_algo_la_SOURCES_DIST = src/cpp/types.cpp \
@@ -357,6 +359,7 @@ am__can_run_installinfo = \
   esac
 DATA = $(libscitypes_la_etc_DATA) $(libscitypes_la_root_DATA) \
        $(libscitypes_la_sci_gateway_DATA)
+HEADERS = $(libscitypes_la_include_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -768,6 +771,62 @@ JARMASK = *.jar
 HELP_CHAPTERDIR = help/
 HELP_CHAPTERFILE = addchapter.sce
 HELP_CHAPTERLANG = en_US fr_FR pt_BR
+
+#### types : include files ####
+libscitypes_la_includedir = $(pkgincludedir)
+libscitypes_la_include_HEADERS = \
+includes/alltypes.hxx \
+includes/arrayof.hxx \
+includes/bool.hxx \
+includes/callable.hxx \
+includes/cell.hxx \
+includes/c_gateway_prototype.h \
+includes/colon.hxx \
+includes/container.hxx \
+includes/cpp_gateway_prototype.hxx \
+includes/dollar.hxx \
+includes/double.hxx \
+includes/dynlib_types_gw.h \
+includes/dynlib_types.h \
+includes/file.hxx \
+includes/float.hxx \
+includes/function.hxx \
+includes/gatewaystruct.hxx \
+includes/GetScilabVariable.h \
+includes/graphichandle.hxx \
+includes/implicitlist.hxx \
+includes/inspector.hxx \
+includes/internal.hxx \
+includes/int.hxx \
+includes/library.hxx \
+includes/listdelete.hxx \
+includes/list.hxx \
+includes/listinsert.hxx \
+includes/listoperation.hxx \
+includes/listundefined.hxx \
+includes/macrofile.hxx \
+includes/macro.hxx \
+includes/matrixiterator.hxx \
+includes/mlist.hxx \
+includes/pointer.hxx \
+includes/polynom.hxx \
+includes/ScilabToJava.hxx \
+includes/singlepoly.hxx \
+includes/singlestruct.hxx \
+includes/sparse.hxx \
+includes/sparseOp.hxx \
+includes/string.hxx \
+includes/struct.hxx \
+includes/threadId.hxx \
+includes/tlist.hxx \
+includes/tostring_common.hxx \
+includes/types_gw.hxx \
+includes/types.hxx \
+includes/types_tools.hxx \
+includes/user.hxx \
+includes/void.hxx \
+includes/typesdecl.hxx
+
 TYPES_JAVA_C_SOURCES = src/jni/getScilabVariable_wrap.c
 TYPES_CPP_SOURCES = src/cpp/types.cpp src/cpp/string.cpp \
        src/cpp/double.cpp src/cpp/bool.cpp src/cpp/float.cpp \
@@ -1733,6 +1792,27 @@ uninstall-libscitypes_la_sci_gatewayDATA:
        @list='$(libscitypes_la_sci_gateway_DATA)'; test -n "$(libscitypes_la_sci_gatewaydir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(libscitypes_la_sci_gatewaydir)'; $(am__uninstall_files_from_dir)
+install-libscitypes_la_includeHEADERS: $(libscitypes_la_include_HEADERS)
+       @$(NORMAL_INSTALL)
+       @list='$(libscitypes_la_include_HEADERS)'; test -n "$(libscitypes_la_includedir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libscitypes_la_includedir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libscitypes_la_includedir)" || exit 1; \
+       fi; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libscitypes_la_includedir)'"; \
+         $(INSTALL_HEADER) $$files "$(DESTDIR)$(libscitypes_la_includedir)" || exit $$?; \
+       done
+
+uninstall-libscitypes_la_includeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(libscitypes_la_include_HEADERS)'; test -n "$(libscitypes_la_includedir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       dir='$(DESTDIR)$(libscitypes_la_includedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(am__tagged_files)
        $(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -1914,9 +1994,9 @@ check-am: all-am
        $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
 check: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local
 installdirs:
-       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libscitypes_la_etcdir)" "$(DESTDIR)$(libscitypes_la_rootdir)" "$(DESTDIR)$(libscitypes_la_sci_gatewaydir)"; do \
+       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libscitypes_la_etcdir)" "$(DESTDIR)$(libscitypes_la_rootdir)" "$(DESTDIR)$(libscitypes_la_sci_gatewaydir)" "$(DESTDIR)$(libscitypes_la_includedir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: $(BUILT_SOURCES)
@@ -1981,6 +2061,7 @@ info: info-am
 info-am:
 
 install-data-am: install-data-local install-libscitypes_la_etcDATA \
+       install-libscitypes_la_includeHEADERS \
        install-libscitypes_la_rootDATA \
        install-libscitypes_la_sci_gatewayDATA
 
@@ -2029,6 +2110,7 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-libscitypes_la_etcDATA \
+       uninstall-libscitypes_la_includeHEADERS \
        uninstall-libscitypes_la_rootDATA \
        uninstall-libscitypes_la_sci_gatewayDATA \
        uninstall-pkglibLTLIBRARIES
@@ -2045,7 +2127,9 @@ uninstall-am: uninstall-libscitypes_la_etcDATA \
        install-data-local install-dvi install-dvi-am install-exec \
        install-exec-am install-html install-html-am \
        install-html-local install-info install-info-am \
-       install-libscitypes_la_etcDATA install-libscitypes_la_rootDATA \
+       install-libscitypes_la_etcDATA \
+       install-libscitypes_la_includeHEADERS \
+       install-libscitypes_la_rootDATA \
        install-libscitypes_la_sci_gatewayDATA install-man install-pdf \
        install-pdf-am install-pkglibLTLIBRARIES install-ps \
        install-ps-am install-strip installcheck installcheck-am \
@@ -2053,6 +2137,7 @@ uninstall-am: uninstall-libscitypes_la_etcDATA \
        mostlyclean mostlyclean-compile mostlyclean-generic \
        mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
        uninstall-am uninstall-libscitypes_la_etcDATA \
+       uninstall-libscitypes_la_includeHEADERS \
        uninstall-libscitypes_la_rootDATA \
        uninstall-libscitypes_la_sci_gatewayDATA \
        uninstall-pkglibLTLIBRARIES
index da6f8f4..7f4b312 100644 (file)
 ;--------------------------------------------------------------------------------------------------------------
 ;
 #define TYPES "types"
+#define TYPESMACRO "typesmacro"
 ;
 Source: bin\{#TYPES}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\{#TYPES}_gw.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\{#TYPES}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\{#TYPES}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\{#TYPESMACRO}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+;
+Source: modules\{#TYPES}\includes\*.*; DestDir: {app}\modules\{#TYPES}\includes; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#TYPES}\jar\org.scilab.modules.{#TYPES}.jar;DestDir: {app}\modules\{#TYPES}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
index fc409fd..43d7825 100644 (file)
@@ -35,6 +35,7 @@ Source: modules\{#UMFPACK}\macros\buildmacros.bat; DestDir: {app}\modules\{#UMFP
 Source: modules\{#UMFPACK}\macros\cleanmacros.bat; DestDir: {app}\modules\{#UMFPACK}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#UMFPACK}\macros\lib; DestDir: {app}\modules\{#UMFPACK}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#UMFPACK}\macros\*.sci; DestDir: {app}\modules\{#UMFPACK}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#UMFPACK}\macros\*.bin; DestDir: {app}\modules\{#UMFPACK}\macros; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#UMFPACK}\examples\*.*; DestDir: {app}\modules\{#UMFPACK}\examples; Flags: recursesubdirs;  Components: {#COMPN_SCILAB}
 ;
index 303cc56..f0339b4 100644 (file)
@@ -37,6 +37,7 @@ Source: modules\{#WINDOWS_TOOLS}\macros\buildmacros.sce; DestDir: {app}\modules\
 Source: modules\{#WINDOWS_TOOLS}\macros\buildmacros.bat; DestDir: {app}\modules\{#WINDOWS_TOOLS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#WINDOWS_TOOLS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#WINDOWS_TOOLS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#WINDOWS_TOOLS}\macros\*.sci; DestDir: {app}\modules\{#WINDOWS_TOOLS}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#WINDOWS_TOOLS}\macros\*.bin; DestDir: {app}\modules\{#WINDOWS_TOOLS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#WINDOWS_TOOLS}\macros\lib; DestDir: {app}\modules\{#WINDOWS_TOOLS}\macros; Components: {#COMPN_SCILAB}
 ;
 ;Source: modules\{#WINDOWS_TOOLS}\demos\*.*; DestDir: {app}\modules\{#WINDOWS_TOOLS}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
index 5e5e9ba..587cf9d 100644 (file)
@@ -44,6 +44,7 @@ Source: modules\{#XCOS}\macros\buildmacros.bat; DestDir: {app}\modules\{#XCOS}\m
 Source: modules\{#XCOS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#XCOS}\macros; Components: {#COMPN_XCOS}
 ;Source: modules\{#XCOS}\macros\lib; DestDir: {app}\modules\{#XCOS}\macros; Components: {#COMPN_XCOS}
 Source: modules\{#XCOS}\macros\*.sci; DestDir: {app}\modules\{#XCOS}\macros; Components: {#COMPN_XCOS}
+;Source: modules\{#XCOS}\macros\*.bin; DestDir: {app}\modules\{#XCOS}\macros; Components: {#COMPN_XCOS}
 ;
 Source: modules\{#XCOS}\examples\*.*; DestDir: {app}\modules\{#XCOS}\examples; Flags: recursesubdirs; Components: {#COMPN_XCOS}
 ;
index 867b473..bbf2cfb 100644 (file)
 #include BinariesSourcePath + "\modules\functions_manager\functions_manager.iss"
 #include BinariesSourcePath + "\modules\parse\parse.iss"
 #include BinariesSourcePath + "\modules\system_env\system_env.iss"
+#include BinariesSourcePath + "\modules\symbol\symbol.iss"
 ;-------------------------------------------------------------------------------