scilab_bin_CFLAGS = -I$(top_srcdir)/modules/io/includes
# --no-undefined --relax
- # libshell is mandatory here since main_linux.c depends on it.
# Localization dep already exists because of the `exportLocaleToSystem' symbol
# (causing issues on some platform)
-COMMON_LIBS = $(top_builddir)/modules/core/libscicore.la \
-$(top_builddir)/modules/completion/libscicompletion.la \
-$(top_builddir)/modules/localization/libscilocalization.la \
-$(top_builddir)/modules/io/libsciio.la \
-$(LTLIBINTL)
+COMMON_LIBS = \
+ $(top_builddir)/modules/threads/libscithreads.la \
- $(top_builddir)/modules/shell/libscishell.la \
+ $(top_builddir)/modules/core/libscicore.la \
+ $(top_builddir)/modules/completion/libscicompletion.la \
+ $(top_builddir)/modules/localization/libscilocalization.la \
+ $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
+ $(top_builddir)/modules/io/libsciio.la \
+ $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+ $(LTLIBINTL)
SCILAB_LIB=$(top_builddir)/modules/libscilab.la
SCILAB_CLI_LIB=$(top_builddir)/modules/libscilab-cli.la
- COMMON_CPPFLAGS = -I$(top_srcdir)/modules/shell/includes/ \
- -I$(top_srcdir)/modules/console/includes/ \
-
-scilab_bin_SOURCES = $(top_srcdir)/modules/console/src/c/others/mainscic.c
++COMMON_CPPFLAGS = -I$(top_srcdir)/modules/console/includes/ \
+ -I$(top_srcdir)/modules/output_stream/includes/ \
+ -I$(top_srcdir)/modules/parse/includes/ \
+ -I$(top_srcdir)/modules/abstractSyntaxTree/includes/ \
+ -I$(top_srcdir)/modules/symbol/includes/ \
+ -I$(top_srcdir)/modules/functions_manager/includes/ \
+ -I$(top_srcdir)/modules/types/includes/ \
+ -I$(top_srcdir)/modules/system_env/includes/ \
+ -I$(top_srcdir)/modules/operations/includes/ \
+ -I$(top_srcdir)/modules/elementary_functions/includes/ \
+ -I$(top_srcdir)/modules/fileio/includes/ \
+ -I$(top_srcdir)/modules/string/includes/ \
+ -I$(top_srcdir)/modules/history_manager/includes/ \
+ -I$(top_srcdir)/modules/threads/includes/ \
+ -I$(top_srcdir)/modules/api_scilab/includes/
+
+scilab_bin_SOURCES = $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
+ $(top_srcdir)/modules/core/src/cpp/tasks.cpp
+if IS_MACOSX
+scilab_bin_SOURCES += $(top_srcdir)/modules/core/src/c/initMacOSXEnv.c
+endif
scilab_bin_LDADD = $(COMMON_LIBS) $(SCILAB_LIB)
+scilab_bin_CPPFLAGS = $(COMMON_CPPFLAGS)
+
# Match scilab -nwni (ie command line without graphics)
-scilab_cli_bin_SOURCES = $(top_srcdir)/modules/console/src/c/others/mainscic.c
++
+scilab_cli_bin_SOURCES = $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
+ $(top_srcdir)/modules/core/src/cpp/tasks.cpp
scilab_cli_bin_CFLAGS = -DWITHOUT_GUI -I$(top_srcdir)/modules/io/includes
scilab_cli_bin_LDADD = $(COMMON_LIBS) $(SCILAB_CLI_LIB)
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(call_scilab_readwritestring_CFLAGS) $(CFLAGS) \
$(call_scilab_readwritestring_LDFLAGS) $(LDFLAGS) -o $@
-am_scilab_bin_OBJECTS = scilab_bin-mainscic.$(OBJEXT)
+am__scilab_bin_SOURCES_DIST = \
+ $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
+ $(top_srcdir)/modules/core/src/cpp/tasks.cpp \
+ $(top_srcdir)/modules/core/src/c/initMacOSXEnv.c
+@IS_MACOSX_TRUE@am__objects_1 = scilab_bin-initMacOSXEnv.$(OBJEXT)
+am_scilab_bin_OBJECTS = scilab_bin-scilab.$(OBJEXT) \
+ scilab_bin-tasks.$(OBJEXT) $(am__objects_1)
scilab_bin_OBJECTS = $(am_scilab_bin_OBJECTS)
am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = $(top_builddir)/modules/core/libscicore.la \
+am__DEPENDENCIES_2 = $(top_builddir)/modules/threads/libscithreads.la \
- $(top_builddir)/modules/shell/libscishell.la \
+ $(top_builddir)/modules/core/libscicore.la \
$(top_builddir)/modules/completion/libscicompletion.la \
$(top_builddir)/modules/localization/libscilocalization.la \
- $(top_builddir)/modules/io/libsciio.la $(am__DEPENDENCIES_1)
+ $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
+ $(top_builddir)/modules/io/libsciio.la \
+ $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+ $(am__DEPENDENCIES_1)
scilab_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) $(SCILAB_LIB)
-scilab_bin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(scilab_bin_CFLAGS) \
- $(CFLAGS) $(scilab_bin_LDFLAGS) $(LDFLAGS) -o $@
-am_scilab_cli_bin_OBJECTS = scilab_cli_bin-mainscic.$(OBJEXT)
+scilab_bin_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(scilab_bin_LDFLAGS) $(LDFLAGS) -o $@
+am_scilab_cli_bin_OBJECTS = scilab_cli_bin-scilab.$(OBJEXT) \
+ scilab_cli_bin-tasks.$(OBJEXT)
scilab_cli_bin_OBJECTS = $(am_scilab_cli_bin_OBJECTS)
scilab_cli_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) $(SCILAB_CLI_LIB)
-scilab_cli_bin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(scilab_cli_bin_CFLAGS) \
- $(CFLAGS) $(scilab_cli_bin_LDFLAGS) $(LDFLAGS) -o $@
+scilab_cli_bin_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(scilab_cli_bin_LDFLAGS) $(LDFLAGS) -o $@
am__scilab_static_bin_SOURCES_DIST = \
- $(top_srcdir)/modules/console/src/c/others/mainscic.c
-am__objects_1 = scilab_static_bin-mainscic.$(OBJEXT)
-@ENABLE_STATIC_TRUE@am_scilab_static_bin_OBJECTS = $(am__objects_1)
+ $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
+ $(top_srcdir)/modules/core/src/cpp/tasks.cpp \
+ $(top_srcdir)/modules/core/src/c/initMacOSXEnv.c
+@IS_MACOSX_TRUE@am__objects_2 = \
+@IS_MACOSX_TRUE@ scilab_static_bin-initMacOSXEnv.$(OBJEXT)
+am__objects_3 = scilab.$(OBJEXT) tasks.$(OBJEXT) $(am__objects_2)
+@ENABLE_STATIC_TRUE@am_scilab_static_bin_OBJECTS = $(am__objects_3)
scilab_static_bin_OBJECTS = $(am_scilab_static_bin_OBJECTS)
@ENABLE_STATIC_TRUE@scilab_static_bin_DEPENDENCIES = \
@ENABLE_STATIC_TRUE@ $(top_builddir)/modules/libscilab.la
scilab_bin_CFLAGS = -I$(top_srcdir)/modules/io/includes
# --no-undefined --relax
- # libshell is mandatory here since main_linux.c depends on it.
# Localization dep already exists because of the `exportLocaleToSystem' symbol
# (causing issues on some platform)
-COMMON_LIBS = $(top_builddir)/modules/core/libscicore.la \
-$(top_builddir)/modules/completion/libscicompletion.la \
-$(top_builddir)/modules/localization/libscilocalization.la \
-$(top_builddir)/modules/io/libsciio.la \
-$(LTLIBINTL)
+COMMON_LIBS = \
+ $(top_builddir)/modules/threads/libscithreads.la \
- $(top_builddir)/modules/shell/libscishell.la \
+ $(top_builddir)/modules/core/libscicore.la \
+ $(top_builddir)/modules/completion/libscicompletion.la \
+ $(top_builddir)/modules/localization/libscilocalization.la \
+ $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
+ $(top_builddir)/modules/io/libsciio.la \
+ $(top_builddir)/modules/output_stream/libscioutput_stream.la \
+ $(LTLIBINTL)
SCILAB_LIB = $(top_builddir)/modules/libscilab.la
SCILAB_CLI_LIB = $(top_builddir)/modules/libscilab-cli.la
- COMMON_CPPFLAGS = -I$(top_srcdir)/modules/shell/includes/ \
- -I$(top_srcdir)/modules/console/includes/ \
-scilab_bin_SOURCES = $(top_srcdir)/modules/console/src/c/others/mainscic.c
++COMMON_CPPFLAGS = -I$(top_srcdir)/modules/console/includes/ \
+ -I$(top_srcdir)/modules/output_stream/includes/ \
+ -I$(top_srcdir)/modules/parse/includes/ \
+ -I$(top_srcdir)/modules/abstractSyntaxTree/includes/ \
+ -I$(top_srcdir)/modules/symbol/includes/ \
+ -I$(top_srcdir)/modules/functions_manager/includes/ \
+ -I$(top_srcdir)/modules/types/includes/ \
+ -I$(top_srcdir)/modules/system_env/includes/ \
+ -I$(top_srcdir)/modules/operations/includes/ \
+ -I$(top_srcdir)/modules/elementary_functions/includes/ \
+ -I$(top_srcdir)/modules/fileio/includes/ \
+ -I$(top_srcdir)/modules/string/includes/ \
+ -I$(top_srcdir)/modules/history_manager/includes/ \
+ -I$(top_srcdir)/modules/threads/includes/ \
+ -I$(top_srcdir)/modules/api_scilab/includes/
+
+scilab_bin_SOURCES = $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
+ $(top_srcdir)/modules/core/src/cpp/tasks.cpp $(am__append_3)
scilab_bin_LDADD = $(COMMON_LIBS) $(SCILAB_LIB)
+scilab_bin_CPPFLAGS = $(COMMON_CPPFLAGS)
# Match scilab -nwni (ie command line without graphics)
-scilab_cli_bin_SOURCES = $(top_srcdir)/modules/console/src/c/others/mainscic.c
+scilab_cli_bin_SOURCES = $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
+ $(top_srcdir)/modules/core/src/cpp/tasks.cpp
+
scilab_cli_bin_CFLAGS = -DWITHOUT_GUI -I$(top_srcdir)/modules/io/includes
scilab_cli_bin_LDADD = $(COMMON_LIBS) $(SCILAB_CLI_LIB)
+scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(COMMON_CPPFLAGS)
@ENABLE_STATIC_TRUE@scilab_static_bin_LDFLAGS = -static -static-libgcc --start-group
@ENABLE_STATIC_TRUE@scilab_static_bin_CFLAGS = -Wl,--start-group `$(CXX) -print-file-name=libstdc++.a`
@ENABLE_STATIC_TRUE@scilab_static_bin_LDADD = $(top_builddir)/modules/libscilab.la
echo " define the variable SCILAB_VALGRIND_OPT to add custom arguments to"
echo " callgrind (and override the existing callgrind arguments)."
echo " -electric-fence : Start Scilab with the Electric Fence (Unix/linux only)."
+ echo " -disable-exception-catching : Disable Scilab exception catching system."
echo " "
+ echo "Developer Trace arguments:"
+ echo " --parse-file File : Only parse File argument without execution and exit."
+ echo " --parse-trace : Display bison state machine evolution."
+ echo " --AST-trace : Display ASCII-art AST to be human readable."
+ echo " --pretty-print : Display pretty-printed code, standard Scilab syntax."
+ echo " "
+ echo "Developer Timer arguments:"
+ echo " --AST-timed : Time each AST node."
+ echo " --timed : Time global execution."
+ echo " "
+ echo "Developer Debug arguments:"
+ echo " --no-exec : Only do Lexing/parsing do not execute instructions."
+ echo " --context-dump : Display context status."
+ echo " "
fi
echo " All these arguments can be retrieved by the Scilab function sciargs."
echo " "
CXXFLAGS="$CXXFLAGS -Werror=implicit-function-declaration -O0"
fi
- ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/threads/Makefile modules/abstractSyntaxTree/Makefile modules/parse/Makefile modules/symbol/Makefile modules/functions_manager/Makefile modules/system_env/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/operations/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
-ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
++ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/threads/Makefile modules/abstractSyntaxTree/Makefile modules/parse/Makefile modules/symbol/Makefile modules/functions_manager/Makefile modules/system_env/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/operations/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
# Detection of the module for the future version of Scilab 6
<Project>{620d8fa7-3704-438e-bb1e-391c84401a2e}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\modules\polynomials\src\fortran\polynomials_f2c.vcxproj">
- <Project>{3a72c3ed-98f7-49c7-b59c-2c6c47ff9390}</Project>
+ <ProjectReference Include="..\..\modules\randlib\src\c\randlib.vcxproj">
+ <Project>{34f8e361-d2d9-43b0-93d2-f6cf5faf6ceb}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
- <ProjectReference Include="..\..\modules\shell\src\c\shell.vcxproj">
- <Project>{805aa73f-ef7b-4177-bf46-200b72d8f83a}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
+ <ProjectReference Include="..\..\modules\signal_processing\src\c\signal_processing.vcxproj">
+ <Project>{a3ad381e-c0dd-45bb-acb2-c0a0db33a606}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\modules\sound\sound.vcxproj">
+ <Project>{03773159-155a-48e0-9b26-119d0bf35b2b}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\modules\sparse\src\c\sparse.vcxproj">
distdir
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = output_stream arnoldi elementary_functions string \
- api_scilab dynamic_link fileio history_manager spreadsheet \
- tclsci localization commons jvm action_binding renderer \
- completion console graphic_export gui graphics optimization \
- symbolic randlib statistics special_functions interpolation \
+DIST_SUBDIRS = threads operations output_stream arnoldi \
+ elementary_functions matio functions_manager string api_scilab \
+ dynamic_link fileio history_manager spreadsheet tclsci \
- localization commons jvm action_binding renderer shell \
- completion console graphic_export gui graphics optimization \
- symbolic randlib statistics special_functions interpolation \
++ localization commons jvm action_binding renderer completion \
++ console graphic_export gui graphics optimization symbolic \
++ randlib statistics special_functions interpolation \
linear_algebra integer data_structures mexlib \
differential_equations cacsd polynomials boolean double pvm io \
intersci signal_processing core call_scilab sound time sparse \
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = output_stream arnoldi elementary_functions string api_scilab \
+yacc_present = @yacc_present@
+SUBDIRS = threads operations output_stream arnoldi \
+ elementary_functions matio functions_manager string api_scilab \
dynamic_link fileio history_manager spreadsheet tclsci \
- localization commons jvm action_binding renderer shell \
- completion console graphic_export gui graphics optimization \
- symbolic randlib statistics special_functions interpolation \
+ localization commons jvm action_binding renderer completion \
+ console graphic_export gui graphics optimization symbolic \
+ randlib statistics special_functions interpolation \
linear_algebra integer data_structures mexlib \
differential_equations cacsd polynomials boolean double pvm io \
intersci signal_processing core call_scilab interpolation \
# List of the c files
- libsciconsole_disable_la_SOURCES = src/noconsole/noconsole.c
- libsciconsole_disable_la_CFLAGS = -I$(srcdir)/includes/
+ libsciconsole_disable_la_SOURCES = src/noconsole/noconsole.c \
+ sci_gateway/c/gw_console.c \
+ sci_gateway/c/sci_clc.c \
+ sci_gateway/c/sci_tohome.c \
+ sci_gateway/c/sci_lines.c \
+ sci_gateway/c/sci_prompt.c \
+ sci_gateway/c/sci_iswaitingforinput.c \
+ src/c/clc.c \
+ src/c/tohome.c \
+ src/c/more.c \
+ src/c/scilines.c \
+ src/c/GetCommandLine.c \
+ src/c/others/zzledt.c \
+ src/c/others/gotoxy_nw.c \
+ src/c/others/clrscr_nw.c \
+ src/c/prompt.c \
+ src/c/promptecho.c
+
+ if IS_MACOSX
+ libsciconsole_disable_la_SOURCES += src/c/others/initMacOSXEnv.c
+ endif
+
+
+ libsciconsole_disable_la_CFLAGS = -I$(srcdir)/includes/ \
+ -I$(srcdir)/src/c/ \
+ -I$(top_srcdir)/libs/MALLOC/includes/ \
+ -I$(top_srcdir)/modules/fileio/includes \
+ -I$(top_srcdir)/modules/output_stream/includes \
+ -I$(top_srcdir)/modules/history_manager/includes/ \
+ -I$(top_srcdir)/modules/output_stream/includes \
+ -I$(top_srcdir)/modules/core/includes \
+ -I$(top_srcdir)/modules/completion/includes \
+ -I$(top_srcdir)/modules/localization/includes \
+ -I$(top_srcdir)/modules/action_binding/includes/ \
+ -I$(top_srcdir)/modules/fileio/src/c/ \
+ -I$(top_srcdir)/modules/api_scilab/includes \
+ -I$(top_srcdir)/modules/fileio/includes \
++ -I$(top_srcdir)/modules/operations/includes \
++ -I$(top_srcdir)/modules/system_env/includes \
++ -I$(top_srcdir)/modules/threads/includes \
++ -I$(top_srcdir)/modules/string/includes \
+ -I$(top_srcdir)/modules/ui_data/includes/
# Includes need for the compilation
-libsciconsole_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) -I$(top_srcdir)/modules/api_scilab/includes -I$(srcdir)/includes/ -I$(srcdir)/src/cpp/ -I$(srcdir)/src/c/ -I$(srcdir)/src/jni/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/jvm/includes/ -I$(top_srcdir)/modules/action_binding/includes
+libsciconsole_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
+ -I$(top_srcdir)/modules/api_scilab/includes \
+ -I$(srcdir)/includes/ \
+ -I$(srcdir)/src/cpp/ \
+ -I$(srcdir)/src/c/ \
+ -I$(srcdir)/src/jni/ \
+ -I$(top_srcdir)/libs/MALLOC/includes/ \
+ -I$(top_srcdir)/modules/jvm/includes/ \
+ -I$(top_srcdir)/modules/action_binding/includes \
++ -I$(top_srcdir)/modules/history_manager/includes/ \
++ -I$(top_srcdir)/modules/operations/includes \
++ -I$(top_srcdir)/modules/system_env/includes \
++ -I$(top_srcdir)/modules/ui_data/includes/ \
++ -I$(top_srcdir)/modules/threads/includes \
++ -I$(top_srcdir)/modules/completion/includes \
+ -I$(top_srcdir)/modules/string/includes
# Includes need for the compilation
- libsciconsole_la_CFLAGS= $(JAVA_JNI_INCLUDE) \
+ libsciconsole_la_CFLAGS= $(JAVA_JNI_INCLUDE) \
-I$(srcdir)/includes/ \
-I$(srcdir)/src/c/ \
-I$(top_srcdir)/libs/MALLOC/includes/ \
+ -I$(top_srcdir)/modules/output_stream/includes \
+ -I$(top_srcdir)/modules/system_env/includes \
-I$(top_srcdir)/modules/fileio/includes \
+ -I$(top_srcdir)/modules/string/includes
+ -I$(top_srcdir)/modules/output_stream/includes \
+ -I$(top_srcdir)/modules/history_manager/includes/ \
+ -I$(top_srcdir)/modules/output_stream/includes \
+ -I$(top_srcdir)/modules/core/includes \
+ -I$(top_srcdir)/modules/completion/includes \
+ -I$(top_srcdir)/modules/localization/includes \
+ -I$(top_srcdir)/modules/action_binding/includes/ \
+ -I$(top_srcdir)/modules/fileio/src/c/ \
+ -I$(top_srcdir)/modules/api_scilab/includes \
+ -I$(top_srcdir)/modules/fileio/includes \
+ -I$(top_srcdir)/modules/ui_data/includes/
+ if IS_MACOSX
+ libsciconsole_la_CFLAGS += -msse2
+ endif
+
+
# Name of the library
pkglib_LTLIBRARIES = libsciconsole-disable.la
## Libraries necessary
## Change to include other Scilab modules/lib
- libsciconsole_la_LIBADD = $(top_builddir)/modules/shell/libscishell.la \
- $(top_builddir)/modules/fileio/libscifileio.la \
- $(top_builddir)/libs/MALLOC/libscimalloc.la
+ libsciconsole_la_LIBADD = $(top_builddir)/modules/fileio/libscifileio.la \
+ $(top_builddir)/libs/MALLOC/libscimalloc.la
++
# java code is needed $(top_builddir)/modules/jvm/libscijvm.la
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
- @GIWS_TRUE@am__append_1 = giws
- @SWIG_TRUE@am__append_2 = swig
- @GUI_TRUE@am__append_3 = libsciconsole.la
+ @IS_MACOSX_TRUE@am__append_1 = src/c/others/initMacOSXEnv.c
+ @GIWS_TRUE@am__append_2 = giws
+ @SWIG_TRUE@am__append_3 = swig
+ @IS_MACOSX_TRUE@am__append_4 = src/c/others/initMacOSXEnv.c
+ @IS_MACOSX_TRUE@am__append_5 = -msse2
-@GUI_TRUE@am__append_6 = libsciconsole.la
++@GUI_TRUE@am__append_6 = libsciconsole.la
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.incl.am
- @NEED_JAVA_TRUE@am__append_4 = java
+ @NEED_JAVA_TRUE@am__append_7 = java
subdir = modules/console
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
CONSOLE_C_JNI_SOURCES = src/jni/GuiManagement_wrap.c \
src/jni/DropFiles_wrap.c
- CONSOLE_C_SOURCES = src/c/InitializeConsole.c \
- src/c/GuiManagement.c \
- src/c/dropFiles.c
+ CONSOLE_C_SOURCES = src/c/InitializeConsole.c src/c/GuiManagement.c \
+ src/c/dropFiles.c src/c/clc.c src/c/tohome.c src/c/more.c \
+ src/c/scilines.c src/c/GetCommandLine.c src/c/others/zzledt.c \
+ src/c/others/gotoxy_nw.c src/c/others/clrscr_nw.c \
+ src/c/prompt.c src/c/promptecho.c $(am__append_1)
+
+ # List of the gateway c files
+ CONSOLE_GATEWAY_C_SOURCES = sci_gateway/c/gw_console.c \
+ sci_gateway/c/sci_clc.c \
+ sci_gateway/c/sci_tohome.c \
+ sci_gateway/c/sci_lines.c \
+ sci_gateway/c/sci_prompt.c \
+ sci_gateway/c/sci_iswaitingforinput.c
GIWS_WRAPPERS = src/jni/CallScilabBridge.giws.xml
- BUILT_SOURCES = $(am__append_1) $(am__append_2)
+ BUILT_SOURCES = $(am__append_2) $(am__append_3)
# List of the c files
- libsciconsole_disable_la_SOURCES = src/noconsole/noconsole.c
- libsciconsole_disable_la_CFLAGS = -I$(srcdir)/includes/
+ libsciconsole_disable_la_SOURCES = src/noconsole/noconsole.c \
+ sci_gateway/c/gw_console.c sci_gateway/c/sci_clc.c \
+ sci_gateway/c/sci_tohome.c sci_gateway/c/sci_lines.c \
+ sci_gateway/c/sci_prompt.c \
+ sci_gateway/c/sci_iswaitingforinput.c src/c/clc.c \
+ src/c/tohome.c src/c/more.c src/c/scilines.c \
+ src/c/GetCommandLine.c src/c/others/zzledt.c \
+ src/c/others/gotoxy_nw.c src/c/others/clrscr_nw.c \
+ src/c/prompt.c src/c/promptecho.c $(am__append_4)
+ libsciconsole_disable_la_CFLAGS = -I$(srcdir)/includes/ \
+ -I$(srcdir)/src/c/ \
+ -I$(top_srcdir)/libs/MALLOC/includes/ \
+ -I$(top_srcdir)/modules/fileio/includes \
+ -I$(top_srcdir)/modules/output_stream/includes \
+ -I$(top_srcdir)/modules/history_manager/includes/ \
+ -I$(top_srcdir)/modules/output_stream/includes \
+ -I$(top_srcdir)/modules/core/includes \
+ -I$(top_srcdir)/modules/completion/includes \
+ -I$(top_srcdir)/modules/localization/includes \
+ -I$(top_srcdir)/modules/action_binding/includes/ \
+ -I$(top_srcdir)/modules/fileio/src/c/ \
+ -I$(top_srcdir)/modules/api_scilab/includes \
+ -I$(top_srcdir)/modules/fileio/includes \
++ -I$(top_srcdir)/modules/operations/includes \
++ -I$(top_srcdir)/modules/system_env/includes \
++ -I$(top_srcdir)/modules/threads/includes \
++ -I$(top_srcdir)/modules/string/includes \
+ -I$(top_srcdir)/modules/ui_data/includes/
+
# Includes need for the compilation
-libsciconsole_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) -I$(top_srcdir)/modules/api_scilab/includes -I$(srcdir)/includes/ -I$(srcdir)/src/cpp/ -I$(srcdir)/src/c/ -I$(srcdir)/src/jni/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/jvm/includes/ -I$(top_srcdir)/modules/action_binding/includes
+libsciconsole_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
+ -I$(top_srcdir)/modules/api_scilab/includes \
+ -I$(srcdir)/includes/ \
+ -I$(srcdir)/src/cpp/ \
+ -I$(srcdir)/src/c/ \
+ -I$(srcdir)/src/jni/ \
+ -I$(top_srcdir)/libs/MALLOC/includes/ \
+ -I$(top_srcdir)/modules/jvm/includes/ \
+ -I$(top_srcdir)/modules/action_binding/includes \
++ -I$(top_srcdir)/modules/history_manager/includes/ \
++ -I$(top_srcdir)/modules/operations/includes \
++ -I$(top_srcdir)/modules/system_env/includes \
++ -I$(top_srcdir)/modules/ui_data/includes/ \
++ -I$(top_srcdir)/modules/threads/includes \
++ -I$(top_srcdir)/modules/completion/includes \
+ -I$(top_srcdir)/modules/string/includes
+
# Includes need for the compilation
- libsciconsole_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
- -I$(srcdir)/includes/ \
- -I$(srcdir)/src/c/ \
- -I$(top_srcdir)/libs/MALLOC/includes/ \
- -I$(top_srcdir)/modules/output_stream/includes \
- -I$(top_srcdir)/modules/system_env/includes \
- -I$(top_srcdir)/modules/fileio/includes \
- -I$(top_srcdir)/modules/string/includes
-
+ libsciconsole_la_CFLAGS = $(JAVA_JNI_INCLUDE) -I$(srcdir)/includes/ \
+ -I$(srcdir)/src/c/ -I$(top_srcdir)/libs/MALLOC/includes/ \
- -I$(top_srcdir)/modules/fileio/includes \
- -I$(top_srcdir)/modules/output_stream/includes \
- -I$(top_srcdir)/modules/history_manager/includes/ \
+ -I$(top_srcdir)/modules/output_stream/includes \
- -I$(top_srcdir)/modules/core/includes \
- -I$(top_srcdir)/modules/completion/includes \
- -I$(top_srcdir)/modules/localization/includes \
- -I$(top_srcdir)/modules/action_binding/includes/ \
- -I$(top_srcdir)/modules/fileio/src/c/ \
- -I$(top_srcdir)/modules/api_scilab/includes \
++ -I$(top_srcdir)/modules/system_env/includes \
+ -I$(top_srcdir)/modules/fileio/includes \
- -I$(top_srcdir)/modules/ui_data/includes/ $(am__append_5)
++ -I$(top_srcdir)/modules/string/includes $(am__append_5)
# Name of the library
- pkglib_LTLIBRARIES = libsciconsole-disable.la $(am__append_3)
+ pkglib_LTLIBRARIES = libsciconsole-disable.la $(am__append_6)
libsciconsole_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
# All the sources needed by libsciconsole.la
# For the code check (splint)
CHECK_SRC = $(CONSOLE_C_JNI_SOURCES) $(CONSOLE_C_SOURCES)
INCLUDE_FLAGS = $(libsciconsole_la_CFLAGS)
- libsciconsole_la_LIBADD = $(top_builddir)/modules/shell/libscishell.la \
- $(top_builddir)/modules/fileio/libscifileio.la \
- $(top_builddir)/libs/MALLOC/libscimalloc.la
+ libsciconsole_la_LIBADD = $(top_builddir)/modules/fileio/libscifileio.la \
+ $(top_builddir)/libs/MALLOC/libscimalloc.la
+
+
# java code is needed $(top_builddir)/modules/jvm/libscijvm.la
#### SWIG Declaration ####
uninstall-libsciconsole_la_rootDATA \
uninstall-pkglibLTLIBRARIES
++ -I$(top_srcdir)/modules/output_stream/includes \
++ -I$(top_srcdir)/modules/history_manager/includes/ \
++ -I$(top_srcdir)/modules/output_stream/includes \
++ -I$(top_srcdir)/modules/core/includes \
++ -I$(top_srcdir)/modules/completion/includes \
++ -I$(top_srcdir)/modules/localization/includes \
++ -I$(top_srcdir)/modules/action_binding/includes/ \
++ -I$(top_srcdir)/modules/fileio/src/c/ \
++ -I$(top_srcdir)/modules/api_scilab/includes \
++ -I$(top_srcdir)/modules/fileio/includes \
++ -I$(top_srcdir)/modules/ui_data/includes/
# This target enables tests for Scilab
check-local: $(top_builddir)/scilab-bin test
--- /dev/null
+ /*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007 - INRIA - Allan CORNET
+ * Copyright (C) 2011 - DIGITEO - Allan CORNET
+ *
+ * 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
+ *
+ */
+ /*--------------------------------------------------------------------------*/
+ #ifndef __GW_CONSOLE_H__
+ #define __GW_CONSOLE_H__
+ /*--------------------------------------------------------------------------*/
+ #include "dynlib_console.h"
+ #include "api_scilab.h"
+ /*--------------------------------------------------------------------------*/
+ CONSOLE_IMPEXP int gw_console(void);
+ /*--------------------------------------------------------------------------*/
+ /* Declaration of all the profile function declared and */
+ /* used in sci_gateway */
+ CONSOLE_IMPEXP int sci_clc(char *fname,unsigned long fname_len);
+ CONSOLE_IMPEXP int sci_tohome(char *fname,unsigned long fname_len);
-CONSOLE_IMPEXP int sci_lines(char *fname,unsigned long fname_len);
++CONSOLE_IMPEXP int sci_lines(char *fname, int *_piKey);
+ CONSOLE_IMPEXP int sci_prompt(char *fname,unsigned long fname_len);
+ CONSOLE_IMPEXP int sci_iswaitingforinput(char *fname,unsigned long fname_len);
+ /*--------------------------------------------------------------------------*/
+ #endif /* __GW_CONSOLE_H__ */
+
+
--- /dev/null
+ /*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007 - INRIA - Allan CORNET
+ *
+ * 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
+ *
+ */
+ /*--------------------------------------------------------------------------*/
+ #include <string.h>
+ #include "gw_console.h"
+ #include "stack-c.h"
+ #include "callFunctionFromGateway.h"
+ /*--------------------------------------------------------------------------*/
+ static gw_generic_table Tab[]=
+ {
+ {sci_clc,"clc"},
+ {sci_tohome,"tohome"},
-{sci_lines,"lines"},
++//{sci_lines,"lines"},
+ {sci_prompt,"prompt"},
+ {sci_iswaitingforinput,"iswaitingforinput"}
+ };
+ /*--------------------------------------------------------------------------*/
+ int gw_console(void)
+ {
+ Rhs = Max(0, Rhs);
+ callFunctionFromGateway(Tab,SIZE_CURRENT_GENERIC_TABLE(Tab));
+ return 0;
+ }
+ /*--------------------------------------------------------------------------*/
--- /dev/null
+ /*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007 - INRIA - Vincent COUVERT
+ *
+ * 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
+ *
+ */
+ /*--------------------------------------------------------------------------*/
+ /* desc: interface for iswaitingforinput primitive */
+ /*--------------------------------------------------------------------------*/
+ #include "gw_console.h"
+ #include "stack-c.h"
+ #include "ConsoleIsWaitingForInput.h"
-#include "scilabmode.h"
++#include "sci_mode.h"
+ #include "Scierror.h"
+ #include "localization.h"
+ #include "sciprint.h"
+ /*--------------------------------------------------------------------------*/
+ int sci_iswaitingforinput(char *fname,unsigned long fname_len)
+ {
+ BOOL res = FALSE;
+ int un = 1, outIndex = 0;
+
+ Rhs = Max(Rhs,0);
+ CheckRhs(0,1);
+ CheckLhs(0,1);
+
+ if (getScilabMode() == SCILAB_STD)
+ {
+ res = ConsoleIsWaitingForInput();
+ }
+ else
+ {
+ sciprint(_("%s: Not implemented in this mode.\n"),fname);
+ }
+
+ CreateVar(Rhs+1,MATRIX_OF_BOOLEAN_DATATYPE,&un,&un,&outIndex);
+ *istk(outIndex) = res;
+
+ LhsVar(1) = Rhs+1;
+ C2F(putlhsvar)();
+ return 0;
+ }
+ /*--------------------------------------------------------------------------*/
--- /dev/null
+ /*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007 - INRIA - Allan CORNET
+ * Copyright (C) 2011 - DIGITEO - Allan CORNET
+ *
+ * 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
+ *
+ */
+ /*--------------------------------------------------------------------------*/
+ #include "stack-c.h"
+ #include "api_scilab.h"
+ #include "scilines.h"
+ #include "Scierror.h"
+ #include "localization.h"
+ #include "MALLOC.h"
+ #include "gw_console.h"
+ #include "ScilabLinesUpdate.h"
-#include "scilabmode.h"
++#include "sci_mode.h"
+ /*--------------------------------------------------------------------------*/
-static int sci_lines_no_rhs(char *fname);
-static int sci_lines_one_rhs(char *fname);
-static int sci_lines_two_rhs(char *fname);
++static int sci_lines_no_rhs(char *fname, int *_piKey);
++static int sci_lines_one_rhs(char *fname, int *_piKey);
++static int sci_lines_two_rhs(char *fname, int *_piKey);
+ /*--------------------------------------------------------------------------*/
-int sci_lines(char *fname,unsigned long fname_len)
++int sci_lines(char *fname, int *_piKey)
+ {
+ CheckRhs(0,2);
+ CheckLhs(1,1);
+
+ switch(Rhs)
+ {
+ case 0:
- sci_lines_no_rhs(fname);
++ sci_lines_no_rhs(fname, _piKey);
+ break;
+ case 1:
- sci_lines_one_rhs(fname);
++ sci_lines_one_rhs(fname, _piKey);
+ break;
+ case 2:
- sci_lines_two_rhs(fname);
++ sci_lines_two_rhs(fname, _piKey);
+ break;
+ }
+ return 0;
+ }
+ /*--------------------------------------------------------------------------*/
-static int sci_lines_no_rhs(char *fname)
++static int sci_lines_no_rhs(char *fname, int *_piKey)
+ {
+ /* ncl = lines() */
+ /* with ncl a 1x2 vector [nc , nl] */
+ /* for compatibility BUT order should be [nl, nc] */
+ /* input/output not coherents */
+ SciErr sciErr;
+ double returnedDouble[2];
+ int n1 = 0,m1 = 0;
+
+ returnedDouble[0] = (double)getColumnsSize();
+ returnedDouble[1] = (double)getLinesSize();
+
+ n1 = 1; m1 = 2;
- sciErr = createMatrixOfDouble(pvApiCtx, Rhs + 1, n1, m1, returnedDouble);
++ sciErr = createMatrixOfDouble(_piKey, Rhs + 1, n1, m1, returnedDouble);
+
+ if (sciErr.iErr)
+ {
+ printError(&sciErr, 0);
+ return 0;
+ }
+
+ LhsVar(1) = Rhs + 1;
+ PutLhsVar();
+
+ return 0;
+ }
+ /*--------------------------------------------------------------------------*/
-static int sci_lines_one_rhs(char *fname)
++static int sci_lines_one_rhs(char *fname, int *_piKey)
+ {
+ /* lines(nb_lines) */
+ /* nb_lines == -1 auto */
+ /* nb_lines == 0 no stop on display */
+ /* nb_lines > 0 set value */
+ SciErr sciErr;
+ int *piAddressVarOne = NULL;
+ int iParam1 = 0;
+
- sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddressVarOne);
++ sciErr = getVarAddressFromPosition(_piKey, 1, &piAddressVarOne);
+ if(sciErr.iErr)
+ {
+ printError(&sciErr, 0);
+ return 0;
+ }
+
+ /* compatibility with previous version manages int32 and double */
- if (!(isDoubleType(pvApiCtx, piAddressVarOne) || isIntegerType(pvApiCtx, piAddressVarOne)))
++ if (!(isDoubleType(_piKey, piAddressVarOne) || isIntegerType(_piKey, piAddressVarOne)))
+ {
+ Scierror(999,_("%s: Wrong type for input argument #%d: A scalar expected.\n"),fname, 1);
+ return 0;
+ }
+
- if (!isScalar(pvApiCtx, piAddressVarOne))
++ if (!isScalar(_piKey, piAddressVarOne))
+ {
+ Scierror(999,_("%s: Wrong size for input argument #%d: A scalar expected.\n"),fname, 1);
+ return 0;
+ }
+
- if (isIntegerType(pvApiCtx, piAddressVarOne))
++ if (isIntegerType(_piKey, piAddressVarOne))
+ {
- if (getScalarInteger32(pvApiCtx, piAddressVarOne, &iParam1) != 0)
++ if (getScalarInteger32(_piKey, piAddressVarOne, &iParam1) != 0)
+ {
+ Scierror(999,_("%s: Wrong type for input argument #%d: A scalar expected.\n"),fname, 1);
+ return 0;
+ }
+ }
+ else // double
+ {
+ double dParam1 = 0.;
- if (getScalarDouble(pvApiCtx,piAddressVarOne, &dParam1) == 0)
++ if (getScalarDouble(_piKey,piAddressVarOne, &dParam1) == 0)
+ {
+ iParam1 = (int)dParam1;
+ }
+ }
+
+ if (iParam1 == -1)
+ {
+ scilinesdefault();
+ if (getScilabMode() == SCILAB_STD)
+ {
+ ScilabLinesUpdate();
+ }
+ }
+ else
+ {
+ if (iParam1 < 0)
+ {
+ Scierror(999,_("%s: Wrong value for input argument #%d: A scalar (>= 0) expected.\n"),fname, 1);
+ return 0;
+ }
+ else
+ {
+ setLinesSize(iParam1);
+ }
+ }
+
+ LhsVar(1) = 0;
+ PutLhsVar();
+ return 0;
+ }
+ /*--------------------------------------------------------------------------*/
-static int sci_lines_two_rhs(char *fname)
++static int sci_lines_two_rhs(char *fname, int *_piKey)
+ {
+ /* lines (nl, nc) */
+ SciErr sciErr;
+ int *piAddressVarOne = NULL;
+ int *piAddressVarTwo = NULL;
+
+ int iParam1 = 0;
+ int iParam2 = 0;
+
- sciErr = getVarAddressFromPosition(pvApiCtx, 2, &piAddressVarTwo);
++ sciErr = getVarAddressFromPosition(_piKey, 2, &piAddressVarTwo);
+ if(sciErr.iErr)
+ {
+ printError(&sciErr, 0);
+ return 0;
+ }
+
- sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddressVarOne);
++ sciErr = getVarAddressFromPosition(_piKey, 1, &piAddressVarOne);
+ if(sciErr.iErr)
+ {
+ printError(&sciErr, 0);
+ return 0;
+ }
+
+ /* compatibility with previous version manages int32 and double */
- if (!(isDoubleType(pvApiCtx, piAddressVarOne) || isIntegerType(pvApiCtx, piAddressVarOne)))
++ if (!(isDoubleType(_piKey, piAddressVarOne) || isIntegerType(_piKey, piAddressVarOne)))
+ {
+ Scierror(999,_("%s: Wrong type for input argument #%d: A scalar expected.\n"),fname, 1);
+ return 0;
+ }
+
- if (!(isDoubleType(pvApiCtx, piAddressVarTwo) || isIntegerType(pvApiCtx, piAddressVarTwo)))
++ if (!(isDoubleType(_piKey, piAddressVarTwo) || isIntegerType(_piKey, piAddressVarTwo)))
+ {
+ Scierror(999,_("%s: Wrong type for input argument #%d: A scalar expected.\n"),fname, 2);
+ return 0;
+ }
+
- if (!isScalar(pvApiCtx, piAddressVarOne))
++ if (!isScalar(_piKey, piAddressVarOne))
+ {
+ Scierror(999,_("%s: Wrong size for input argument #%d: A scalar expected.\n"),fname, 1);
+ return 0;
+ }
+
- if (!isScalar(pvApiCtx, piAddressVarTwo))
++ if (!isScalar(_piKey, piAddressVarTwo))
+ {
+ Scierror(999,_("%s: Wrong size for input argument #%d: A scalar expected.\n"),fname, 2);
+ return 0;
+ }
+
- if (isIntegerType(pvApiCtx, piAddressVarOne))
++ if (isIntegerType(_piKey, piAddressVarOne))
+ {
- if (getScalarInteger32(pvApiCtx, piAddressVarOne, &iParam1) != 0)
++ if (getScalarInteger32(_piKey, piAddressVarOne, &iParam1) != 0)
+ {
+ Scierror(999,_("%s: Wrong type for input argument #%d: A scalar expected.\n"),fname, 1);
+ return 0;
+ }
+ }
+ else // double
+ {
+ double dParam1 = 0.;
- if (getScalarDouble(pvApiCtx,piAddressVarOne, &dParam1) == 0)
++ if (getScalarDouble(_piKey,piAddressVarOne, &dParam1) == 0)
+ {
+ iParam1 = (int)dParam1;
+ }
+ }
+
- if (isIntegerType(pvApiCtx, piAddressVarTwo))
++ if (isIntegerType(_piKey, piAddressVarTwo))
+ {
- if (getScalarInteger32(pvApiCtx, piAddressVarTwo, &iParam2) != 0)
++ if (getScalarInteger32(_piKey, piAddressVarTwo, &iParam2) != 0)
+ {
+ Scierror(999,_("%s: Wrong type for input argument #%d: A scalar expected.\n"),fname, 2);
+ return 0;
+ }
+ }
+ else // double
+ {
+ double dParam2 = 0.;
- if (getScalarDouble(pvApiCtx,piAddressVarTwo, &dParam2) == 0)
++ if (getScalarDouble(_piKey,piAddressVarTwo, &dParam2) == 0)
+ {
+ iParam2 = (int)dParam2;
+ }
+ }
+
+
+ if (iParam1 == -1)
+ {
+ scilinesdefault();
+ if (getScilabMode() == SCILAB_STD)
+ {
+ ScilabLinesUpdate();
+ }
+ }
+ else
+ {
+ if (iParam1 < 0)
+ {
+ Scierror(999,_("%s: Wrong value for input argument #%d: A scalar (>= 0) expected.\n"),fname, 1);
+ return 0;
+ }
+ else
+ {
+ setLinesSize(iParam1);
+ }
+ }
+
+ if (iParam2 > 0)
+ {
+ setColumnsSize(iParam2);
+ }
+ else
+ {
+ Scierror(999,_("%s: Wrong value for input argument #%d: A scalar (>= 0) expected.\n"),fname, 2);
+ return 0;
+ }
+
+ LhsVar(1) = 0;
+ PutLhsVar();
+ return 0;
+ }
+ /*--------------------------------------------------------------------------*/
*/
/*--------------------------------------------------------------------------*/
+ #include <stdio.h>
#include "InitializeConsole.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
#include "ScilabLinesUpdate.h"
+ #include "scilines.h"
/*--------------------------------------------------------------------------*/
BOOL InitializeConsole(void)
{
EXPORTS
+; core
;
-LaunchScilab
-pLaunchScilabLock
+with_module
+StoreCommand
- ;
+ ;
-getScilabMode
-ismenu
+ callFunctionFromGateway
+ com_
-getWarningMode
+ putlhsvar_
+ intersci_
-stack_
-getrhsvar_
-gettype_
++stack_
+ vstk_
++getrhsvar_
+ checklhs_
+ checkrhs_
-createvar_
-createvarfromptr_
-vartype_
+ recu_
-sigbas_
-StoreCommand
-freeArrayOfString
+ iop_
-with_module
-getSCIHOME
++createvar_
++freeArrayOfString
++sigbas_
++gettype_
++vartype_
++LaunchScilab
++ismenu
++pLaunchScilabLock
--- /dev/null
+ /*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007 - INRIA - Allan CORNET
+ *
+ * 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
+ *
+ */
+
+ #ifndef __TERMREADANDPROCESS_H__
+ #define __TERMREADANDPROCESS_H__
+
++#include "dynlib_console.h"
+ /**
+ * read line from commandline
+ */
+
-char * TermReadAndProcess(void);
++CONSOLE_IMPEXP char * TermReadAndProcess(void);
+
+ #endif /* __TERMREADANDPROCESS_H__ */
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../fileio/includes;../../../localization/includes;../../../windows_tools/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../output_stream/includes;../../../completion/includes;../../../history_manager/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;../../../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../fileio/includes;../../../localization/includes;../../../windows_tools/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../output_stream/includes;../../../completion/includes;../../../history_manager/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;../../../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../fileio/includes;../../../localization/includes;../../../windows_tools/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../output_stream/includes;../../../completion/includes;../../../history_manager/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;../../../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../fileio/includes;../../../localization/includes;../../../windows_tools/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../output_stream/includes;../../../completion/includes;../../../history_manager/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;../../../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\..\shell\src\c\shell.vcxproj">
- <Project>{805aa73f-ef7b-4177-bf46-200b72d8f83a}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj">
+ <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
</ProjectReference>
+ <ProjectReference Include="..\..\..\system_env\system_env.vcxproj">
+ <Project>{7ca60aef-9afa-4d06-af28-613c0aa27640}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
++ </ProjectReference>
++ <ProjectReference Include="..\..\..\threads\threads.vcxproj">
++ <Project>{50a1ffc8-adc2-4d9e-a2d0-5dcd63188ae9}</Project>
++ </ProjectReference>
+ <ProjectReference Include="..\..\..\ui_data\src\c\ui_data.vcxproj">
+ <Project>{142d643b-a9ec-49db-9d48-a925a20f63b1}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\windows_tools\src\c\scilab_windows\scilab_windows.vcxproj">
<Project>{8028f371-6a94-4a26-8804-6e7f05f1d1aa}</Project>
<ClCompile Include="..\cpp\SetConsolePrompt.cpp">
<Filter>Source Files</Filter>
</ClCompile>
++ <ClCompile Include="..\..\sci_gateway\c\gw_console.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\sci_gateway\c\sci_clc.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\sci_gateway\c\sci_iswaitingforinput.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\sci_gateway\c\sci_lines.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\sci_gateway\c\sci_prompt.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
++ <ClCompile Include="..\..\sci_gateway\c\sci_tohome.c">
++ <Filter>Source Files</Filter>
++ </ClCompile>
+ <ClCompile Include="clc.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="GetCommandLine.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="more.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="prompt.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="promptecho.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="scilines.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="tohome.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
- <ClCompile Include="windows\clrscr_nw.c">
++ <ClCompile Include="windows\clrscrPart_nw.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
- <ClCompile Include="windows\clrscrPart_nw.c">
++ <ClCompile Include="windows\clrscr_nw.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="windows\TermCommand.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="windows\TermCompletion.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="windows\TermConsole.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="windows\TermLine.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="windows\TermPosition.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="windows\TermPrintf.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="windows\TermReadAndProcess.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
- <ClCompile Include="..\..\sci_gateway\c\gw_console.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\sci_gateway\c\sci_clc.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\sci_gateway\c\sci_iswaitingforinput.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\sci_gateway\c\sci_lines.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\sci_gateway\c\sci_prompt.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\sci_gateway\c\sci_tohome.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <None Include="..\..\locales\en_US\console.pot">
- <Filter>localization</Filter>
- </None>
- <None Include="..\jni\DropFiles.i">
- <Filter>Swig Files</Filter>
- </None>
- <None Include="..\jni\GuiManagement.i">
- <Filter>Swig Files</Filter>
- </None>
- <None Include="libjvm_Import.def">
- <Filter>Libraries Dependencies\Imports</Filter>
- </None>
- <None Include="LibScilab_Import.def">
- <Filter>Libraries Dependencies\Imports</Filter>
- </None>
- <None Include="..\..\console.iss" />
- <None Include="..\..\console.xml" />
- <None Include="..\..\Makefile.am" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="console.rc">
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\includes\ClearConsole.h">
++ <ClInclude Include="..\cpp\ClearConsole.hxx">
+ <Filter>Header Files</Filter>
+ </ClInclude>
- <ClInclude Include="..\cpp\ClearConsole.hxx">
++ <ClInclude Include="..\cpp\ClearConsolePart.hxx">
+ <Filter>Header Files</Filter>
+ </ClInclude>
- <ClInclude Include="..\..\includes\ClearConsolePart.h">
++ <ClInclude Include="..\cpp\ConsoleIsWaitingForInput.hxx">
+ <Filter>Header Files</Filter>
+ </ClInclude>
- <ClInclude Include="..\cpp\ClearConsolePart.hxx">
++ <ClInclude Include="..\cpp\ConsolePrintf.hxx">
+ <Filter>Header Files</Filter>
+ </ClInclude>
- <ClInclude Include="..\..\includes\ConsoleIsWaitingForInput.h">
++ <ClInclude Include="..\cpp\ConsoleRead.hxx">
+ <Filter>Header Files</Filter>
+ </ClInclude>
- <ClInclude Include="..\cpp\ConsoleIsWaitingForInput.hxx">
++ <ClInclude Include="..\cpp\GetCharWithoutOutput.hxx">
+ <Filter>Header Files</Filter>
+ </ClInclude>
- <ClInclude Include="..\..\includes\ConsolePrintf.h">
++ <ClInclude Include="..\cpp\PromptToHome.hxx">
+ <Filter>Header Files</Filter>
+ </ClInclude>
- <ClInclude Include="..\cpp\ConsolePrintf.hxx">
++ <ClInclude Include="..\cpp\ScilabLinesUpdate.hxx">
+ <Filter>Header Files</Filter>
+ </ClInclude>
- <ClInclude Include="..\..\includes\ConsoleRead.h">
++ <ClInclude Include="..\cpp\SetConsolePrompt.hxx">
+ <Filter>Header Files</Filter>
+ </ClInclude>
- <ClInclude Include="..\cpp\ConsoleRead.hxx">
+ <ClInclude Include="clc.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\includes\dynlib_console.h">
+ <ClInclude Include="ClearConsole.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\includes\GetCharWithoutOutput.h">
+ <ClInclude Include="ClearConsolePart.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\cpp\GetCharWithoutOutput.hxx">
+ <ClInclude Include="ConsoleIsWaitingForInput.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\includes\InitializeConsole.h">
+ <ClInclude Include="ConsoleRead.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\includes\PromptToHome.h">
+ <ClInclude Include="dropFiles.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\cpp\PromptToHome.hxx">
+ <ClInclude Include="GetCharWithoutOutput.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\includes\ScilabLinesUpdate.h">
+ <ClInclude Include="GuiManagement.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\cpp\ScilabLinesUpdate.hxx">
+ <ClInclude Include="promptecho.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\includes\SetConsolePrompt.h">
+ <ClInclude Include="PromptToHome.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\cpp\SetConsolePrompt.hxx">
+ <ClInclude Include="PutChar.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="ScilabLinesUpdate.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="SetConsolePrompt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="TermReadAndProcess.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="tohome.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
- <ClInclude Include="windows\clrscr_nw.h">
++ <ClInclude Include="windows\clrscrPart_nw.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
- <ClInclude Include="windows\clrscrPart_nw.h">
++ <ClInclude Include="windows\clrscr_nw.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="windows\TermCommand.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="windows\TermCompletion.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="windows\TermConsole.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="windows\TermLine.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="windows\TermPosition.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="windows\TermPrintf.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\cpp\ClearConsole.hxx">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\cpp\ClearConsolePart.hxx">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\cpp\ConsoleIsWaitingForInput.hxx">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\cpp\ConsolePrintf.hxx">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\cpp\ConsoleRead.hxx">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\cpp\GetCharWithoutOutput.hxx">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\cpp\PromptToHome.hxx">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\cpp\ScilabLinesUpdate.hxx">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\cpp\SetConsolePrompt.hxx">
- <Filter>Header Files</Filter>
- </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\jni\DropFiles.i">
+ <Filter>Swig Files</Filter>
+ </None>
+ <None Include="..\jni\GuiManagement.i">
+ <Filter>Swig Files</Filter>
+ </None>
+ <None Include="libjvm_Import.def">
+ <Filter>Libraries Dependencies\Imports</Filter>
+ </None>
+ <None Include="LibScilab_Import.def">
+ <Filter>Libraries Dependencies\Imports</Filter>
+ </None>
- <None Include="libshell_Import.def">
- <Filter>Libraries Dependencies\Imports</Filter>
- </None>
+ <None Include="..\..\console.iss" />
+ <None Include="..\..\Makefile.am" />
- <None Include="..\..\locales\console.pot">
- <Filter>localization</Filter>
- </None>
++ <None Include="..\..\locales\en_US\console.pot" />
++ <None Include="..\..\console.xml" />
</ItemGroup>
</Project>
--- /dev/null
+ /*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007 - INRIA - Allan CORNET
+ * Copyright (C) 2008 - INRIA - Bruno JOFRET
+ *
+ * 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
+ *
+ */
+ /*--------------------------------------------------------------------------*/
+ #ifdef _MSC_VER
+ #include <conio.h>
+ #endif
+ #include <stdio.h>
+ #include "more.h"
-#include "scilabmode.h"
++#include "sci_mode.h"
+ #include "localization.h"
+ #include "sciprint.h"
+ #include "GetCharWithoutOutput.h"
+ #include "ConsolePrintf.h"
+ /*--------------------------------------------------------------------------*/
+ #define MSG_MORE _("[Continue display? n (no) to stop, any other key to continue]")
+ /*--------------------------------------------------------------------------*/
+ int linesmore(void)
+ {
+ int retval = 0;
+ if (getScilabMode() != SCILAB_STD)
+ {
+ int ch = 0;
+ /* Scilab has not his own window */
+ sciprint(MSG_MORE);
+
+ #if _MSC_VER
+ ch = _getch();
+ if ( (ch != ' ') && (ch != 13) && (ch != 'y') ) retval = 1;
+ #else
+ ch = getchar();
+ if ( (ch != ' ') && (ch != '\n') && (ch != 'y') ) retval = 1;
+ #endif
+
+ sciprint("\n");
+ }
+ else
+ {
+ /* scilab has his own window */
+ int ch = 0;
+ ConsolePrintf(MSG_MORE);
+ ch = GetCharWithoutOutput();
+ if ( ch == 110 ) retval = 1;
+ }
+ return retval;
+ }
+ /*--------------------------------------------------------------------------*/
--- /dev/null
+ /*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007 - DIGITEO - Sylvestre LEDRU
+ *
+ * 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
+ *
+ */
+ #include <stdlib.h>
-#include "scilabmode.h"
++#include "sci_mode.h"
+ #include "realmain.h"
+ #include "initMacOSXEnv.h"
+
+ #if defined(__APPLE__) && !defined(WITHOUT_GUI)
+ #include <pthread.h>
+ #include <CoreFoundation/CoreFoundation.h>
+ #include <sys/stat.h>
+ #include <ApplicationServices/ApplicationServices.h>
+ #endif
+
+
+ #if defined(__APPLE__) && !defined(WITHOUT_GUI)
+
+ typedef struct {
+ int no_startup_flag_l;
+ char *initial_script;
+ InitScriptType initial_script_type;
+ int memory;
+ } thread_parm_t;
+
+ /*
+ Some parts of the next three functions have been taken from simpleJavaLauncher.
+
+
+ Copyright: © Copyright 2003 Apple Computer, Inc. All rights reserved.
+
+ Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc.
+ ("Apple") in consideration of your agreement to the following terms, and your
+ use, installation, modification or redistribution of this Apple software
+ constitutes acceptance of these terms. If you do not agree with these terms,
+ please do not use, install, modify or redistribute this Apple software.
+
+ In consideration of your agreement to abide by the following terms, and subject
+ to these terms, Apple grants you a personal, non-exclusive license, under Apple's
+ copyrights in this original Apple software (the "Apple Software"), to use,
+ reproduce, modify and redistribute the Apple Software, with or without
+ modifications, in source and/or binary forms; provided that if you redistribute
+ the Apple Software in its entirety and without modifications, you must retain
+ this notice and the following text and disclaimers in all such redistributions of
+ the Apple Software. Neither the name, trademarks, service marks or logos of
+ Apple Computer, Inc. may be used to endorse or promote products derived from the
+ Apple Software without specific prior written permission from Apple. Except as
+ expressly stated in this notice, no other rights or licenses, express or implied,
+ are granted by Apple herein, including but not limited to any patent rights that
+ may be infringed by your derivative works or by other works in which the Apple
+ Software may be incorporated.
+
+ The Apple Software is provided by Apple on an "AS IS" basis. APPLE MAKES NO
+ WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
+ WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+ COMBINATION WITH YOUR PRODUCTS.
+
+ IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION
+ OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
+ (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+ /**
+ * Set the name of the application (the mac os x way)
+ * @param name the name of the application
+ */
+ static void setAppName(const char * name) {
+ char a[32];
+ pid_t id = getpid();
+ sprintf(a,"APP_NAME_%ld",(long)id);
+ setenv(a, name, 1);
+ }
+
+ /**
+ * Actually launch Scilab under Mac OS X. Need to be in a specific thread.
+ * See http://wiki.scilab.org/Compiling_Scilab_5.x_under_MacOSX
+ * @param param The structure containing the missing argument mandatory for realmain
+ * @return the result of the operation (0 if OK ...)
+ */
+ static int launchMacOSXEnv(thread_parm_t *param){
+ thread_parm_t *p = (thread_parm_t *)param;
+ int ret=-1;
+ {
+ CFStringRef targetJVM = CFSTR("1.5");
+ CFBundleRef JavaVMBundle;
+ CFURLRef JavaVMBundleURL;
+ CFURLRef JavaVMBundlerVersionsDirURL;
+ CFURLRef TargetJavaVM;
+ UInt8 pathToTargetJVM [PATH_MAX] = "\0";
+ struct stat sbuf;
+
+ /*
+ * This piece of code is mandatory because Mac OS X implementation of Java has a bug here.
+ * Cocoa does not know how to handle the new window created this way.
+ * See: http://lists.apple.com/archives/Java-dev/2009/Jan/msg00062.html
+ * Or Mac Os X bug #6484319
+ * Thanks to Mike Swingler
+ */
+ ProcessSerialNumber psn;
+ GetCurrentProcess(&psn);
+ TransformProcessType(&psn, kProcessTransformToForegroundApplication);
+ /* End of the workaround */
+
+ // Look for the JavaVM bundle using its identifier
+ JavaVMBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.JavaVM") );
+
+ if(JavaVMBundle != NULL) {
+ // Get a path for the JavaVM bundle
+ JavaVMBundleURL = CFBundleCopyBundleURL(JavaVMBundle);
+ CFRelease(JavaVMBundle);
+
+ if(JavaVMBundleURL != NULL) {
+ // Append to the path the Versions Component
+ JavaVMBundlerVersionsDirURL = CFURLCreateCopyAppendingPathComponent(kCFAllocatorDefault,JavaVMBundleURL,CFSTR("Versions"),true);
+ CFRelease(JavaVMBundleURL);
+
+ if(JavaVMBundlerVersionsDirURL != NULL) {
+ // Append to the path the target JVM's Version
+ TargetJavaVM = CFURLCreateCopyAppendingPathComponent(kCFAllocatorDefault,JavaVMBundlerVersionsDirURL,targetJVM,true);
+ CFRelease(JavaVMBundlerVersionsDirURL);
+ if(TargetJavaVM != NULL) {
+ if(CFURLGetFileSystemRepresentation (TargetJavaVM,true,pathToTargetJVM,PATH_MAX )) {
+ // Check to see if the directory, or a sym link for the target JVM directory exists, and if so set the
+ // environment variable JAVA_JVM_VERSION to the target JVM.
+ if(stat((char*)pathToTargetJVM,&sbuf) == 0) {
+ // Ok, the directory exists, so now we need to set the environment var JAVA_JVM_VERSION to the CFSTR targetJVM
+ // We can reuse the pathToTargetJVM buffer to set the environement var.
+ if(CFStringGetCString(targetJVM,(char*)pathToTargetJVM,PATH_MAX,kCFStringEncodingUTF8)) {
+ setenv("JAVA_JVM_VERSION", (char*)pathToTargetJVM,1);
+ ret=0;
+ } else {
+ fprintf(stderr, "Could not get the path to the target JVM.\n");
+ }
+ } else {
+ fprintf(stderr, "Error checking symlink for the target jvm.\n");
+ }
+ } else {
+ fprintf(stderr, "Error getting file system representation for bundle url.\n");
+ CFRelease(TargetJavaVM);
+ }
+ } else {
+ fprintf(stderr, "Error appending version component to bundle url.\n");
+ }
+ } else {
+ fprintf(stderr, "Error appending path component to bundle url.\n");
+ }
+ } else {
+ fprintf(stderr, "Error copying bundle url.\n");
+ }
+ } else {
+ fprintf(stderr, "Error: cant find bundle: com.apple.JavaVM.\n");
+ }
+ }
+
+ if (ret==0) {
+ /* Call the actual startup script of Scilab */
+ ret = realmain(p->no_startup_flag_l, p->initial_script, p->initial_script_type, p->memory);
+ free(p);
+ exit(ret);
+ }
+ free(p);
+ return ret;
+
+ }
+
+ /* call back for dummy source used to make sure the CFRunLoop doesn't exit right away */
+ /* This callback is called when the source has fired. */
+ static void sourceCallBack ( void *info ) {}
+
+ /* Specific wrapper for mac os X which is going to call realmin in a specific thread.
+ * Takes the same args as realmain
+ */
+ int initMacOSXEnv(int no_startup_flag_l, char *initial_script, InitScriptType initial_script_type, int memory){
+
+ CFRunLoopSourceContext sourceContext;
+ /* Start the thread that runs the VM. */
+ pthread_t vmthread;
+ setAppName("Scilab");
+
+ /* Create the structure which is going to be giving to the function inside the thread */
+ thread_parm_t *param=NULL;
+ param = malloc(sizeof(thread_parm_t));
+ param->no_startup_flag_l = no_startup_flag_l;
+ param->initial_script = initial_script;
+ param->initial_script_type = initial_script_type;
+ param->memory = memory;
+
+ /* create a new pthread copying the stack size of the primordial pthread */
+ struct rlimit limit;
+ size_t stack_size = 0;
+ int rc = getrlimit(RLIMIT_STACK, &limit);
+ if (rc == 0) {
+ if (limit.rlim_cur != 0LL) {
+ stack_size = (size_t)limit.rlim_cur;
+ }
+ }
+ pthread_attr_t thread_attr;
+ pthread_attr_init(&thread_attr);
+ pthread_attr_setscope(&thread_attr, PTHREAD_SCOPE_SYSTEM);
+ pthread_attr_setdetachstate(&thread_attr, PTHREAD_CREATE_DETACHED);
+ if (stack_size > 0) {
+ pthread_attr_setstacksize(&thread_attr, stack_size);
+ }
+
+ /* Start the thread that we will start the JVM on. */
+ pthread_create(&vmthread, &thread_attr, launchMacOSXEnv, (void*)param);
+ pthread_attr_destroy(&thread_attr);
+
+ /* Create a a sourceContext to be used by our source that makes */
+ /* sure the CFRunLoop doesn't exit right away */
+ sourceContext.version = 0;
+ sourceContext.info = NULL;
+ sourceContext.retain = NULL;
+ sourceContext.release = NULL;
+ sourceContext.copyDescription = NULL;
+ sourceContext.equal = NULL;
+ sourceContext.hash = NULL;
+ sourceContext.schedule = NULL;
+ sourceContext.cancel = NULL;
+ sourceContext.perform = &sourceCallBack;
+
+ /* Create the Source from the sourceContext */
+ CFRunLoopSourceRef sourceRef = CFRunLoopSourceCreate (NULL, 0, &sourceContext);
+
+ /* Use the constant kCFRunLoopCommonModes to add the source to the set of objects */
+ /* monitored by all the common modes */
+ CFRunLoopAddSource (CFRunLoopGetCurrent(),sourceRef,kCFRunLoopCommonModes);
+
+ /* Park this thread in the runloop */
+ CFRunLoopRun();
+
+ return 0;
+ }
+ #endif
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories>../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../history_manager/includes;../../../ui_data/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../operations/includes;../../../history_manager/includes;../../../ui_data/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../c;../../../system_env/includes;../../../threads/includes;../../../string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories>../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../history_manager/includes;../../../ui_data/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../operations/includes;../../../history_manager/includes;../../../ui_data/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../c;../../../system_env/includes;../../../threads/includes;../../../string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories>../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../history_manager/includes;../../../ui_data/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../operations/includes;../../../history_manager/includes;../../../ui_data/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../c;../../../system_env/includes;../../../threads/includes;../../../string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories>../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../history_manager/includes;../../../ui_data/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../operations/includes;../../../history_manager/includes;../../../ui_data/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../c;../../../system_env/includes;../../../threads/includes;../../../string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
+ <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj">
+ <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
+ </ProjectReference>
++ <ProjectReference Include="..\..\..\system_env\system_env.vcxproj">
++ <Project>{7ca60aef-9afa-4d06-af28-613c0aa27640}</Project>
++ </ProjectReference>
++ <ProjectReference Include="..\..\..\threads\threads.vcxproj">
++ <Project>{50a1ffc8-adc2-4d9e-a2d0-5dcd63188ae9}</Project>
++ </ProjectReference>
+ <ProjectReference Include="..\..\..\ui_data\src\c\ui_data.vcxproj">
+ <Project>{142d643b-a9ec-49db-9d48-a925a20f63b1}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\windows_tools\src\c\scilab_windows\scilab_windows.vcxproj">
+ <Project>{8028f371-6a94-4a26-8804-6e7f05f1d1aa}</Project>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
-I$(top_srcdir)/modules/dynamic_link/includes \
-I$(top_srcdir)/modules/pvm/includes \
-I$(top_srcdir)/modules/elementary_functions/includes \
- -I$(top_srcdir)/modules/string/includes \
- -I$(top_srcdir)/modules/fileio/includes \
- -I$(top_srcdir)/modules/shell/includes \
+ -I$(top_srcdir)/modules/string/includes \
+ -I$(top_srcdir)/modules/fileio/includes \
+ -I$(top_srcdir)/modules/operations/includes \
+ -I$(top_srcdir)/modules/console/includes \
+ -I$(top_srcdir)/modules/threads/includes \
$(XML_FLAGS)
-libscicore_la_CPPFLAGS = -I$(srcdir)/includes/ \
+libscicore_la_CPPFLAGS = \
+ -I$(srcdir)/includes/ \
-I$(srcdir)/src/c/ \
-I$(srcdir)/src/cpp/ \
+ -I$(top_srcdir)/modules/api_scilab/includes \
+ -I$(top_srcdir)/modules/symbol/includes/ \
+ -I$(top_srcdir)/modules/operations/includes/ \
+ -I$(top_srcdir)/modules/functions_manager/includes/ \
+ -I$(top_srcdir)/modules/elementary_functions/includes/ \
+ -I$(top_srcdir)/modules/abstractSyntaxTree/includes/ \
+ -I$(top_srcdir)/modules/parse/includes \
+ -I$(top_srcdir)/modules/types/includes/ \
+ -I$(top_srcdir)/modules/output_stream/includes/ \
-I$(top_srcdir)/modules/dynamic_link/includes \
- -I$(top_srcdir)/libs/MALLOC/includes/
+ -I$(top_srcdir)/modules/system_env/includes \
+ -I$(top_srcdir)/modules/string/includes/ \
+ -I$(top_srcdir)/libs/MALLOC/includes/ \
+ -I$(top_srcdir)/modules/threads/includes \
+ -I$(top_srcdir)/modules/fileio/includes
# Used by sci_getdebuginfo:
if TCLTK
-I$(top_srcdir)/modules/elementary_functions/includes \
-I$(top_srcdir)/modules/string/includes \
-I$(top_srcdir)/modules/fileio/includes \
- -I$(top_srcdir)/modules/shell/includes \
- -I$(top_srcdir)/modules/console/includes $(XML_FLAGS) \
+ -I$(top_srcdir)/modules/operations/includes \
++ -I$(top_srcdir)/modules/console/includes \
+ -I$(top_srcdir)/modules/threads/includes $(XML_FLAGS) \
$(am__append_3)
-libscicore_la_CPPFLAGS = -I$(srcdir)/includes/ \
+libscicore_la_CPPFLAGS = \
+ -I$(srcdir)/includes/ \
-I$(srcdir)/src/c/ \
-I$(srcdir)/src/cpp/ \
+ -I$(top_srcdir)/modules/api_scilab/includes \
+ -I$(top_srcdir)/modules/symbol/includes/ \
+ -I$(top_srcdir)/modules/operations/includes/ \
+ -I$(top_srcdir)/modules/functions_manager/includes/ \
+ -I$(top_srcdir)/modules/elementary_functions/includes/ \
+ -I$(top_srcdir)/modules/abstractSyntaxTree/includes/ \
+ -I$(top_srcdir)/modules/parse/includes \
+ -I$(top_srcdir)/modules/types/includes/ \
+ -I$(top_srcdir)/modules/output_stream/includes/ \
-I$(top_srcdir)/modules/dynamic_link/includes \
- -I$(top_srcdir)/libs/MALLOC/includes/
+ -I$(top_srcdir)/modules/system_env/includes \
+ -I$(top_srcdir)/modules/string/includes/ \
+ -I$(top_srcdir)/libs/MALLOC/includes/ \
+ -I$(top_srcdir)/modules/threads/includes \
+ -I$(top_srcdir)/modules/fileio/includes
pkglib_LTLIBRARIES = libscicore.la
noinst_LTLIBRARIES = libscicore-algo.la
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{14373D41-991A-412E-8EA7-A832D98047B8}</ProjectGuid>
+ <RootNamespace>core</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">YaSp</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">YaSp</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">YaSp</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">YaSp</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>includes;..\parse\includes;..\abstractSyntaxTree\includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;..\system_env\includes;..\elementary_functions\includes;../operations/includes;../localization/includes;..\windows_tools\includes;$(SolutionDir)libs\MALLOC\includes;../shell/includes;$(SolutionDir)libs\intl;../console/includes;../history_manager/includes;../fileio/includes;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>includes;..\parse\includes;..\abstractSyntaxTree\includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../console/includes;..\system_env\includes;..\elementary_functions\includes;../operations/includes;../localization/includes;..\windows_tools\includes;$(SolutionDir)libs\MALLOC\includes;../shell/includes;$(SolutionDir)libs\intl;../history_manager/includes;../fileio/includes;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;__CORE_YASP__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(SolutionDir)bin\Yasp.exe</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>includes;..\parse\includes;..\abstractSyntaxTree\includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;..\system_env\includes;..\elementary_functions\includes;../operations/includes;../localization/includes;..\windows_tools\includes;$(SolutionDir)libs\MALLOC\includes;../shell/includes;$(SolutionDir)libs\intl;../console/includes;../history_manager/includes;../fileio/includes;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>includes;..\parse\includes;..\abstractSyntaxTree\includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../console/includes;..\system_env\includes;..\elementary_functions\includes;../operations/includes;../localization/includes;..\windows_tools\includes;$(SolutionDir)libs\MALLOC\includes;../shell/includes;$(SolutionDir)libs\intl;../history_manager/includes;../fileio/includes;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;__CORE_YASP__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(SolutionDir)bin\Yasp.exe</OutputFile>
+ <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
- <AdditionalIncludeDirectories>includes;..\parse\includes;..\abstractSyntaxTree\includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;..\system_env\includes;..\elementary_functions\includes;../operations/includes;../localization/includes;..\windows_tools\includes;$(SolutionDir)libs\MALLOC\includes;../shell/includes;$(SolutionDir)libs\intl;../console/includes;../history_manager/includes;../fileio/includes;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>includes;..\parse\includes;..\abstractSyntaxTree\includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../console/includes;..\system_env\includes;..\elementary_functions\includes;../operations/includes;../localization/includes;..\windows_tools\includes;$(SolutionDir)libs\MALLOC\includes;../shell/includes;$(SolutionDir)libs\intl;../history_manager/includes;../fileio/includes;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;__CORE_YASP__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(SolutionDir)bin\Yasp.exe</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
- <AdditionalIncludeDirectories>includes;..\parse\includes;..\abstractSyntaxTree\includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;..\system_env\includes;..\elementary_functions\includes;../operations/includes;../localization/includes;..\windows_tools\includes;$(SolutionDir)libs\MALLOC\includes;../shell/includes;$(SolutionDir)libs\intl;../console/includes;../history_manager/includes;../fileio/includes;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>includes;..\parse\includes;..\abstractSyntaxTree\includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../console/includes;..\system_env\includes;..\elementary_functions\includes;../operations/includes;../localization/includes;..\windows_tools\includes;$(SolutionDir)libs\MALLOC\includes;../shell/includes;$(SolutionDir)libs\intl;../history_manager/includes;../fileio/includes;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;__CORE_YASP__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(SolutionDir)bin\Yasp.exe</OutputFile>
+ <IgnoreSpecificDefaultLibraries>libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="src\cpp\scilab.cpp" />
+ <ClCompile Include="src\cpp\tasks.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <Library Include="..\..\bin\blasplus.lib" />
+ <Library Include="..\..\bin\lapack.lib" />
+ <Library Include="..\..\bin\libintl.lib" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\libs\LibScilab\LibScilab.vcxproj">
+ <Project>{64bc155e-292f-484f-9404-76ee6ae67a43}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\libs\MALLOC\MALLOC.vcxproj">
+ <Project>{6a84ad8c-ba18-4a3f-9c72-ec3df0939e9e}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\tools\Dumpexts\Dumpexts.vcxproj">
+ <Project>{3170e4c2-1173-4264-a222-7ee8ccb3ddf7}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\abstractSyntaxTree\abstractSyntaxTree-tools\abstractSyntaxTree-tools.vcxproj">
+ <Project>{1f4a0344-99ed-461b-bd53-1593788fb34d}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\abstractSyntaxTree\abstractSyntaxTree.vcxproj">
+ <Project>{0d3fa25b-8116-44ec-a45e-260789daa3d9}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\api_scilab\api_scilab.vcxproj">
+ <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\console\src\c\console.vcxproj">
+ <Project>{445d3b85-c9b1-498b-9c88-0a3c2390b1cc}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\elementary_functions\src\cpp\elem_func\elem_func.vcxproj">
+ <Project>{e1284d3e-4b3f-446b-b541-f661a8a166a7}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\fileio\fileio.vcxproj">
+ <Project>{4fc72d4a-80ee-4b1a-8724-0201c1a35621}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\functions\sci_gateway\cpp\functions_gw.vcxproj">
+ <Project>{67ff36d3-ec5a-4f0d-bf3b-a84a66d77294}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\functions_manager\functions_manager.vcxproj">
+ <Project>{8eac9381-c059-43ea-b5d7-fd5d6997b0bd}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\graphics\graphics.vcxproj">
+ <Project>{8ccdd3c2-b025-4a12-a986-1aa28d7c0c33}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\gui\src\c\gui.vcxproj">
+ <Project>{45ca5b12-7601-4968-ae16-16069fd1a152}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\history_browser\src\c\history_browser.vcxproj">
+ <Project>{ab1eeb8f-86f7-45b7-8cec-b18c8e97eeff}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\history_manager\src\c\history_manager.vcxproj">
+ <Project>{1b98dc87-44f5-48ae-b5d0-29dd8ad86f5e}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\jvm\libjvm.vcxproj">
+ <Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\localization\src\localization.vcxproj">
+ <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\operations\operations.vcxproj">
+ <Project>{1bb396f7-ce61-4cfc-9c22-266b2cfb2e74}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\output_stream\src\c\output_stream.vcxproj">
+ <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\parse\parse.vcxproj">
+ <Project>{74d43792-dbfc-47f0-adbc-4d7a20cdada2}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
- <ProjectReference Include="..\shell\src\c\shell.vcxproj">
- <Project>{805aa73f-ef7b-4177-bf46-200b72d8f83a}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
+ <ProjectReference Include="..\string\src\c\string.vcxproj">
+ <Project>{8d45767a-9b03-4905-97f6-d2f3f79141ea}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\symbol\symbol.vcxproj">
+ <Project>{2c60033b-0dbd-4ca4-80d3-176c9be9ce2f}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\system_env\system_env.vcxproj">
+ <Project>{7ca60aef-9afa-4d06-af28-613c0aa27640}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\tclsci\tclsci.vcxproj">
+ <Project>{c456d5b8-8a32-496a-a2ee-164b0d734126}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\types\types.vcxproj">
+ <Project>{64e090da-dcb5-4f4d-93d7-e88ddec9c2ef}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\types\typesmacro\typesmacro.vcxproj">
+ <Project>{9252a034-7f22-4cb1-a634-4577da69f2d0}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\windows_tools\src\c\scilab_windows\scilab_windows.vcxproj">
+ <Project>{8028f371-6a94-4a26-8804-6e7f05f1d1aa}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\windows_tools\src\c\windows_tools.vcxproj">
+ <Project>{9594ac02-20ee-4fbf-95b4-bfa5865ed7ca}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="src\cpp\core_gw.vcxproj">
+ <Project>{3e933eb6-d427-4828-9b30-b6b9987491f6}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="src\c\core.vcxproj">
+ <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
{
InitializeJVM();
InitializeGUI();
-
+
/* create needed data structure if not already created */
loadGraphicModule() ;
- }
++ }
- /* Standard mode -> init Java Console */
- if ( getScilabMode() == SCILAB_STD )
- {
- /* Initialize console: lines... */
- InitializeConsole();
- }
+ /* Initialize console: lines... */
+ InitializeConsole();
+ if ( getScilabMode() != SCILAB_NWNI )
+ {
loadBackGroundClassPath();
}
return 0;
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes;../../../io/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../console/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes;../../../io/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes;../../../io/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../console/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes;../../../io/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes;../../../io/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../console/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes;../../../io/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes;../../../io/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <AdditionalIncludeDirectories>.;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../console/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes;../../../io/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
--- /dev/null
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2006-2008 - DIGITEO - Bruno JOFRET
+ *
+ * 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
+ *
+ */
+
+#pragma comment(lib,"../../bin/libintl.lib")
+
+#include <cstdio>
+#include <iostream>
+#include <string.h>
+
+extern "C"
+{
+#ifndef _MSC_VER
+#include <unistd.h>
+#endif
+
+
+
+//#include "SetScilabEnvironment.h"
+#include "prompt.h"
+#include "InitializeLocalization.h"
+#include "MALLOC.h"
+#include "sci_path.h"
+#include "inisci-c.h"
+#include "sci_mode.h"
+#ifdef _MSC_VER
+#include "../src/c/scilab_windows/getScilabDirectory.h"
+#endif
+#include "ConsoleRead.h"
+#include "../../../console/includes/InitializeConsole.h"
+#include "../../../jvm/includes/InitializeJVM.h"
+#include "InitializeCore.h"
- #include "../../../shell/includes/InitializeShell.h"
+#include "../../../console/includes/InitializeConsole.h"
+#include "../../../tclsci/includes/InitializeTclTk.h"
+#include "../../../localization/includes/InitializeLocalization.h"
+#include "../../../graphics/includes/graphicModuleLoad.h"
+#include "../../../jvm/includes/InitializeJVM.h"
+#ifdef _MSC_VER
+#include "../../../windows_tools/includes/InitializeWindows_tools.h"
+#endif
+#include "../../../gui/includes/InitializeGUI.h"
+#include "../../../string/includes/InitializeString.h"
+#include "../../../jvm/includes/loadBackGroundClassPath.h"
+
+#include "HistoryManager.h"
+#include "InitializeHistoryManager.h"
+#include "TerminateHistoryManager.h"
+#include "getCommentDateSession.h"
+#include "os_swprintf.h"
+#include "os_strdup.h"
+#include "localization.h"
+#include "diary.h"
+#include "PATH_MAX.h"
+#include "sci_tmpdir.h"
+#include "deleteafile.h"
+#include "setgetlanguage.h"
+
+#include "elem_common.h"
+
+#ifdef __APPLE__
+#include "initMacOSXEnv.h"
+#endif
+/*
+** HACK HACK HACK
+*/
+ extern char *TermReadAndProcess(void);
+}
+
+#include "yaspio.hxx"
+#include "tasks.hxx"
+#include "exit_status.hxx"
+#include "parser.hxx"
+#include "context.hxx"
+#include "configvariable.hxx"
+#include "context.hxx"
+#include "setenvvar.hxx"
+#include "funcmanager.hxx"
+#include "configvariable.hxx"
+#include "filemanager.hxx"
+#include "scilabexception.hxx"
+
+#include "runner.hxx"
+
+#include "banner.hxx"
+
+#include "string.hxx"
+#include "polynom.hxx"
+
+#define INTERACTIVE -1
+
+const wchar_t* prog_name;
+const wchar_t* file_name;
+
+bool parseTrace = false;
+bool printAst = false;
+bool execAst = true;
+bool dumpAst = false;
+bool dumpStack = false;
+bool timed = false;
+bool ASTtimed = false;
+bool consoleMode = false;
+bool noJvm = false;
+bool noStart = false;
+bool noBanner = false;
+bool execCommand = false;
+bool execFile = false;
+bool parseFile = false;
+
+using symbol::Context;
+using std::string;
+
+void Add_i(void);
+void Add_pi(void);
+void Add_eps(void);
+void Add_s(void);
+void Add_z(void);
+void Add_true(void);
+void Add_false(void);
+void Add_Nan(void);
+void Add_Inf(void);
+void Add_WITH_DEMOS(void); //temporary variable
+void Add_All_Variables(void);
+
+void Add_Double_Constant(wstring _szName, double _dblReal, double _dblImg, bool _bComplex);
+void Add_Poly_Constant(wstring _szName, wstring _szPolyVar, int _iRank, Double *_pdblReal);
+void Add_Boolean_Constant(wstring _szName, bool _bBool);
+void Add_String_Constant(wstring _szName, const char* _pstString);
+
+int InitializeEnvironnement(void);
+bool execScilabStart(void);
+
+int StartScilabEngine(int argc, char*argv[], int iFileIndex, int iLangIndex);
+static Parser::ControlStatus processCommand(char* _pstCommand);
+
+/*
+** Usage
+**
+** Display usage : options available in YaSp
+*/
+static void usage (void)
+{
+ std::cerr << "Usage: "<< prog_name << " <options>" << std::endl;
+ std::cerr << " -f file : Batch mode on the given file." << std::endl;
+ std::cerr << " -l lang : Change the language of scilab ( default : en_US )." << std::endl;
+ std::cerr << " -nw : Enable console mode." << std::endl;
+ std::cerr << " -nwni : Enable terminal mode." << std::endl;
+ std::cerr << " -ns : Don't execute etc/scilab.start." << std::endl;
+ std::cerr << " --help : Display this help." << std::endl;
+ std::cerr << "Developer Trace arguments:" << std::endl;
+ std::cerr << " --parse-trace : Display bison state machine evolution." << std::endl;
+ std::cerr << " --AST-trace : Display ASCII-art AST to be human readable." << std::endl;
+ std::cerr << " --pretty-print : Display pretty-printed code, standard Scilab syntax." << std::endl;
+ std::cerr << " " << std::endl;
+ std::cerr << "Developer Timer arguments:" << std::endl;
+ std::cerr << " --AST-timed : Time each AST node." << std::endl;
+ std::cerr << " --timed : Time global execution." << std::endl;
+ std::cerr << " " << std::endl;
+ std::cerr << "Developer Debug arguments:" << std::endl;
+ std::cerr << " --no-exec : Only do Lexing/parsing do not execute instructions." << std::endl;
+ std::cerr << " --context-dump : Display context status." << std::endl;
+}
+
+
+/*
+** Get Options
+**
+**
+*/
+static int get_option (const int argc, char *argv[], int *_piFileIndex, int *_piLangIndex)
+{
+ int i = 0;
+
+#ifdef DEBUG
+ std::cerr << "-*- Getting Options -*-"<< std::endl;
+#endif
+
+ for (i = 1; i < argc; ++i) {
+ if (!strcmp("--parse-trace", argv[i])) {
+ parseTrace = true;
+ }
+ else if (!strcmp("--pretty-print", argv[i])) {
+ printAst = true;
+ }
+ else if (!strcmp("--help", argv[i])) {
+ usage ();
+ exit (WELL_DONE);
+ }
+ else if (!strcmp("--AST-trace", argv[i])) {
+ dumpAst = true;
+ }
+ else if (!strcmp("--no-exec", argv[i])) {
+ execAst = false;
+ }
+ else if (!strcmp("--context-dump", argv[i])) {
+ dumpStack = true;
+ }
+ else if (!strcmp("--timed", argv[i])) {
+ timed = true;
+ }
+ else if (!strcmp("--AST-timed", argv[i])) {
+ std::cout << "Timed execution" << std::endl;
+ ASTtimed = true;
+ }
+ else if (!strcmp("--parse-file", argv[i])) {
+ i++;
+ parseFile = true;
+ *_piFileIndex = i;
+ }
+ else if (!strcmp("-f", argv[i])) {
+ i++;
+ execFile = true;
+ *_piFileIndex = i;
+ }
+ else if (!strcmp("-e", argv[i])) {
+ i++;
+ execCommand = true;
+ *_piFileIndex = i;
+ }
+ else if (!strcmp("-l", argv[i])) {
+ i++;
+ *_piLangIndex = i;
+ }
+ else if (!strcmp("-nw", argv[i])) {
+ consoleMode = true;
+ setScilabMode(SCILAB_NW);
+ }
+ else if (!strcmp("-nwni", argv[i])) {
+ consoleMode = true;
+ noJvm = true;
+ setScilabMode(SCILAB_NWNI);
+ }
+ else if (!strcmp("-ns", argv[i])) {
+ noStart = true;
+ }
+ else if (!strcmp("-nb", argv[i])) {
+ noBanner = true;
+ }
+ }
+
+#ifdef DEBUG
+ std::cerr << "File : " << argv[ *_piFileIndex] << std::endl;
+#endif
+
+ ConfigVariable::setCommandLineArgs(argc, argv);
+ return 0;
+}
+
+/*
+** HACK HACK HACK
+*/
+
+extern "C"
+{
+#include <stdio.h>
+
+#ifndef _MSC_VER
+#include <unistd.h>
+#endif
+ extern char *TermReadAndProcess(void);
+ extern void ConsolePrintf(char*);
+}
+
+/*
+** -*- stateView
+** Used to show parser state.
+** Find if we are stuck within some control structure.
+*/
+
+static void stateShow(Parser::ControlStatus status)
+{
+ switch (status)
+ {
+ case Parser::WithinFor : SetTemporaryPrompt("-for ->"); break;
+ case Parser::WithinWhile : SetTemporaryPrompt("-while ->"); break;
+ case Parser::WithinIf : SetTemporaryPrompt("-if ->"); break;
+ case Parser::WithinElse : SetTemporaryPrompt("-else ->"); break;
+ case Parser::WithinElseIf : SetTemporaryPrompt("-elseif ->"); break;
+ case Parser::WithinTry : SetTemporaryPrompt("-try ->"); break;
+ case Parser::WithinCatch : SetTemporaryPrompt("-catch ->"); break;
+ case Parser::WithinFunction : SetTemporaryPrompt("-function ->"); break;
+ case Parser::WithinSelect : SetTemporaryPrompt("-select ->"); break;
+ case Parser::WithinCase : SetTemporaryPrompt("-case ->"); break;
+ case Parser::WithinSwitch : SetTemporaryPrompt("-switch ->"); break;
+ case Parser::WithinOtherwise : SetTemporaryPrompt("-otherwise ->"); break;
+ case Parser::WithinMatrix : SetTemporaryPrompt("- [ ->"); break;
+ case Parser::WithinCell : SetTemporaryPrompt("- { ->"); break;
+ case Parser::WithinBlockComment : SetTemporaryPrompt("- /* ->"); break;
+ case Parser::WithinDots : SetTemporaryPrompt("- ... ->"); break;
+ case Parser::AllControlClosed : break;
+ }
+}
+
+/*
+** -*- Interactive Main -*-
+*/
+static int interactiveMain (void)
+{
+ int pause = 0;
+ char *command = NULL;
+ Parser::ControlStatus controlStatus = Parser::AllControlClosed;
+
+ if(noBanner == false)
+ {
+ //banner();
+ }
+
+ InitializeHistoryManager();
+
+ //before calling reader, try to call %onprompt function
+ callOnPrompt();
+
+ while (!ConfigVariable::getForceQuit())
+ {
+ // Show Parser Sate before prompt
+ stateShow(controlStatus);
+
+ pause = ConfigVariable::getPauseLevel();
+
+ //set prompt value
+ C2F(setprlev)(&pause);
+
+ if (controlStatus == Parser::AllControlClosed)
+ {
+ if(command)
+ {
+ FREE(command);
+ command = NULL;
+ }
+ YaspWriteW(L"\n");
+ command = YaspRead();
+ }
+ else
+ {
+ char* pstRead = YaspRead();
+ //+1 for null termination and +1 for '\n'
+ size_t iLen = strlen(command) + strlen(pstRead) + 2;
+ char* pstNewCommand = (char*)MALLOC(iLen * sizeof(char));
+#ifdef _MSC_VER
+ sprintf_s(pstNewCommand, iLen, "%s\n%s", command, pstRead);
+#else
+ sprintf(pstNewCommand, "%s\n%s", command, pstRead);
+#endif
+ FREE(pstRead);
+ FREE(command);
+ command = pstNewCommand;
+ }
+
+ controlStatus = processCommand(command);
+ }
+#ifdef DEBUG
+ std::cerr << "To end program press [ENTER]" << std::endl;
+#endif
+ return ConfigVariable::getExitStatus();
+}
+
+static Parser::ControlStatus processCommand(char* _pstCommand)
+{
+ Parser *parser = new Parser();
+ parser->setParseTrace(parseTrace);
+ if (strcmp(_pstCommand, "") != 0)
+ {
+ wchar_t* pwstCommand = to_wide_string(_pstCommand);
+ /*
+ ** -*- PARSING -*-
+ */
+ parseCommandTask(parser, timed, pwstCommand);
+
+ /*
+ ** -*- DUMPING TREE -*-
+ */
+ if(dumpAst == true)
+ {
+ dumpAstTask(parser->getTree(), timed);
+ }
+
+ if(parser->getExitStatus() == Parser::Succeded)
+ {
+ /*
+ ** -*- PRETTY PRINT TREE -*-
+ */
+ if(printAst == true)
+ {
+ printAstTask(parser->getTree(), timed);
+ }
+
+ /*
+ ** -*- EXECUTING TREE -*-
+ */
+ if(execAst == true)
+ {
+ //before calling YaspReader, try to call %onprompt function
+ callOnPrompt();
+ execAstTask(parser->getTree(), timed, ASTtimed);
+ }
+
+ /*
+ ** -*- DUMPING STACK AFTER EXECUTION -*-
+ */
+ if(dumpStack == true)
+ {
+ dumpStackTask(timed);
+ }
+ }
+ else if(parser->getExitStatus() == Parser::Failed && parser->getControlStatus() == Parser::AllControlClosed)
+ {
+ if(execAst == true)
+ {
+ //before calling YaspReader, try to call %onprompt function
+ callOnPrompt();
+ }
+
+ YaspWriteW(parser->getErrorMessage());
+ }
+
+ FREE(pwstCommand);
+ }
+ else
+ {
+ if(execAst == true)
+ {
+ //before calling YaspReader, try to call %onprompt function
+ callOnPrompt();
+ }
+ }
+ return parser->getControlStatus();
+}
+
+static void TermPrintf(char *text)
+{
+ //std::cout << text;
+ printf("%s", text);
+}
+
+/*
+** -*- MAIN -*-
+*/
+int main(int argc, char *argv[])
+{
+ int iFileIndex = INTERACTIVE;
+ int iLangIndex = 0;
+
+ prog_name = to_wide_string(argv[0]);
+
+ setScilabMode(SCILAB_STD);
+ get_option(argc, argv, &iFileIndex, &iLangIndex);
+
+ if (iFileIndex >= argc || iLangIndex >= argc)
+ {
+ // we used -l, -e or -f without another argument
+ usage();
+ return -1;
+ }
+
+// if WITHOUT_GUI is defined
+// force Terminal IO -> Terminal IO + StartScilabEngine
+
+// WITHOUT_GUI (All Platform) => Terminal IO + StartScilabEngine
+// GUI (MacOSX) => [no option] -> Console IO + InitMacOSXEnv
+// | [-nwni] -> Terminal IO + StartScilabEngine
+// | [-nw] -> Terminal IO + InitMacOSXEnv
+#ifndef WITHOUT_GUI
+ if (consoleMode)
+ {
+ setYaspInputMethod(&TermReadAndProcess);
+ setYaspOutputMethod(&TermPrintf);
+ #if defined(__APPLE__)
+ if(!noJvm)
+ {
+ return initMacOSXEnv(argc, argv, iFileIndex);
+ }
+ #endif // !defined(__APPLE__)
+ return StartScilabEngine(argc, argv, iFileIndex, iLangIndex);
+ }
+ else
+ {
+ setYaspInputMethod(&ConsoleRead);
+ setYaspOutputMethod(&ConsolePrintf);
+ #if defined(__APPLE__)
+ return initMacOSXEnv(argc, argv, iFileIndex);
+ #else
+ return StartScilabEngine(argc, argv, iFileIndex, iLangIndex);
+ #endif // !defined(__APPLE__)
+ }
+#else
+ setYaspInputMethod(&TermReadAndProcess);
+ setYaspOutputMethod(&TermPrintf);
+ return StartScilabEngine(argc, argv, iFileIndex, iLangIndex);
+#endif // defined(WITHOUT_GUI)
+}
+
+/*
+** -*- Batch Main -*-
+*/
+static int batchMain(char *pstFileName)
+{
+ /*
+ ** -*- PARSING -*-
+ */
+ Parser *parser = new Parser();
+ parser->setParseTrace(parseTrace);
+
+
+ wchar_t* pwstFileName = to_wide_string(pstFileName);
+ /*
+ ** -*- PARSING -*-
+ */
+ parseFileTask(parser, timed, pwstFileName, L"YaSp");
+
+ /*
+ ** -*- DUMPING TREE -*-
+ */
+ if (dumpAst == true)
+ {
+ dumpAstTask(parser->getTree(), timed);
+ }
+
+ if (parser->getExitStatus() == Parser::Succeded)
+ {
+ /*
+ ** -*- PRETTY PRINT TREE -*-
+ */
+ if (printAst == true)
+ {
+ printAstTask(parser->getTree(), timed);
+ }
+
+ }
+ else
+ {
+ YaspWriteW(parser->getErrorMessage());
+ }
+
+#ifdef DEBUG
+ std::cerr << "To end program press [ENTER]" << std::endl;
+#endif
+ return parser->getExitStatus();
+}
+
+
+int StartScilabEngine(int argc, char*argv[], int iFileIndex, int iLangIndex)
+{
+ int iMainRet = 0;
+ Runner::init();
+
+ /* Scilab Startup */
+ InitializeEnvironnement();
+
+ if(iLangIndex)
+ {
+ wchar_t* pwstLang = to_wide_string(argv[iLangIndex]);
+ setlanguage(pwstLang);
+ FREE(pwstLang);
+ }
+
+
+ InitializeString();
+
+#ifdef _MSC_VER
+ InitializeWindows_tools();
+#endif
+
+ //InitializeCore();
+
- InitializeShell();
-
+ if (!noJvm)
+ {
+ /* bug 3702 */
+ /* tclsci creates a TK window on Windows */
+ /* it changes focus on previous windows */
+ /* we put InitializeTclTk before InitializeGUI */
+
+ //InitializeTclTk();
+ InitializeJVM();
+ InitializeGUI();
+
+ /* create needed data structure if not already created */
+ loadGraphicModule() ;
+
- /* Standard mode -> init Java Console */
- if ( !consoleMode )
- {
- /* Initialize console: lines... */
- InitializeConsole();
- }
-
+ loadBackGroundClassPath();
+ }
+
++ /* Standard mode -> init Java Console */
++ if ( !consoleMode )
++ {
++ /* Initialize console: lines... */
++ InitializeConsole();
++ }
++
++
+ /* set current language of scilab */
+ FuncManager *pFM = new FuncManager();
+ pFM->LoadModules(noStart);
+
+ //execute scilab.start
+ if(noStart == false)
+ {
+ execScilabStartTask();
+ }
+
+ int pause = 0;
+ //set prompt value
+ C2F(setprlev)(&pause);
+
+ ConfigVariable::setPromptMode(-1);
+ try
+ {
+ if(execCommand)
+ {//-e option
+
+ processCommand(argv[iFileIndex]);
+ }
+ else if(execFile)
+ {//-f option execute exec('%s',-1)
+ char* pstCommand = (char*)MALLOC(sizeof(char) * (strlen("exec(\"\",-1)") + strlen(argv[iFileIndex]) + 1));
+ sprintf(pstCommand, "exec(\"%s\",-1)", argv[iFileIndex]);
+ processCommand(pstCommand);
+ FREE(pstCommand);
+ }
+ }
+ catch(ScilabException se)
+ {
+ YaspErrorW(se.GetErrorMessage().c_str());
+ }
+
+ ConfigVariable::setPromptMode(2);
+ if (!parseFile)
+ {
+ //always run as interactiveMain even after -e or -f option
+ file_name = L"prompt";
+ iMainRet = interactiveMain();
+ }
+ else
+ {
+ // Only for parsing test, won't execute anything.
+ iMainRet = batchMain(argv[iFileIndex]);
+ }
+
+ //execute scilab.quit
+ if(noStart == false)
+ {
+ execScilabQuitTask();
+ }
+ //close main scope
+ symbol::Context::getInstance()->scope_end();
+ delete pFM;
+
+ /* Remove TMPDIR before exit */
+ clearTMPDIR();
+
+ return iMainRet;
+}
+
+int InitializeEnvironnement(void)
+{
+ SetScilabEnvironment();
+ InitializeLocalization();
+
+ ConfigVariable::setConsoleWidth(75);
+ ConfigVariable::setFormat(16);
+ Add_All_Variables();
+ FileManager::initialize();
+ return 0;
+}
+
+void Add_All_Variables(void)
+{
+ Add_pi();
+ Add_eps();
+ Add_i();
+ Add_s();
+ Add_z();
+ Add_true();
+ Add_false();
+ Add_Nan();
+ Add_Inf();
+ Add_WITH_DEMOS();
+}
+
+void Add_WITH_DEMOS(void)
+{
+ Add_Boolean_Constant(L"WITH_DEMOS", false);
+}
+
+void Add_Nan(void)
+{
+ double dbl1 = 1.0;
+ double dbl0 = dbl1 - dbl1;
+ Add_Double_Constant(L"%nan", dbl0/dbl0, 0, false);
+}
+
+void Add_Inf(void)
+{
+ double dbl1 = 1.0;
+ double dbl0 = dbl1 - dbl1;
+ Add_Double_Constant(L"%inf", dbl1/dbl0, 0, false);
+}
+
+void Add_false(void)
+{
+ Add_Boolean_Constant(L"%f", false);
+}
+
+void Add_true(void)
+{
+ Add_Boolean_Constant(L"%t", true);
+}
+
+void Add_pi(void)
+{
+ Add_Double_Constant(L"%pi", 3.1415926535897931159980, 0, false);
+}
+
+void Add_eps(void)
+{
+ Add_Double_Constant(L"%eps", C2F(dlamch)("p",1L), 0, false);
+}
+
+void Add_i(void)
+{
+ Add_Double_Constant(L"%i", 0, 1, true);
+}
+
+void Add_s(void)
+{
+ Double dblCoef(1,2);
+ dblCoef.set(0, 0, 0);
+ dblCoef.set(0, 1, 1);
+
+ Add_Poly_Constant(L"%s",L"s", 2, &dblCoef);
+}
+
+void Add_z(void)
+{
+ Double dblCoef(1,2);
+ dblCoef.set(0, 0, 0);
+ dblCoef.set(0, 1, 1);
+
+ Add_Poly_Constant(L"%z",L"z", 2, &dblCoef);
+}
+
+void Add_Poly_Constant(wstring _szName, wstring _szPolyVar, int _iRank, Double *_pdbl)
+{
+ types::Polynom *pVar = new types::Polynom(_szPolyVar, 1, 1, &_iRank);
+ SinglePoly *poPoly = pVar->get(0,0);
+ poPoly->setCoef(_pdbl);
+ Context::getInstance()->put(symbol::Symbol(_szName), *pVar);
+}
+
+void Add_Double_Constant(wstring _szName, double _dblReal, double _dblImg, bool _bComplex)
+{
+ types::Double* pVal = new types::Double(1,1,_bComplex);
+ pVal->set(0, 0, _dblReal);
+ pVal->setImg(0, 0, _dblImg);
+ symbol::Context::getInstance()->put(symbol::Symbol(_szName), *pVal);
+}
+
+void Add_Boolean_Constant(wstring _szName, bool _bBool)
+{
+ types::Bool* pVal = new types::Bool(_bBool);
+ symbol::Context::getInstance()->put(symbol::Symbol(_szName), *pVal);
+}
+
+void Add_String_Constant(wstring _szName, const char* _pstString)
+{
+ types::String* ps = new types::String(_pstString);
+ symbol::Context::getInstance()->put(symbol::Symbol(_szName), *ps);
+}
+
libscifileio_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
-libscifileio_algo_la_SOURCES = $(FILEIO_SOURCES)
-libscifileio_la_SOURCES = $(GATEWAY_SOURCES) $(GATEWAY_CPP_SOURCES)
+libscifileio_algo_la_SOURCES = $(FILEIO_C_SOURCES) $(FILEIO_CPP_SOURCES)
+libscifileio_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
libscifileio_algo_la_CFLAGS = $(libscifileio_la_CFLAGS)
+libscifileio_algo_la_CPPFLAGS = $(libscifileio_la_CPPFLAGS)
# For the code check (splint)
-CHECK_SRC= $(FILEIO_SOURCES) $(GATEWAY_SOURCES)
+CHECK_SRC= $(FILEIO_C_SOURCES) $(FILEIO_CPP_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
INCLUDE_FLAGS = $(libscifileio_la_CFLAGS)
- # pb of order $(top_builddir)/modules/shell/libscishell.la
+ # pb of order $(top_builddir)/modules/console/libsciconsole.la
libscifileio_la_LIBADD = libscifileio-algo.la \
$(top_builddir)/modules/string/libscistring.la \
$(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
noinst_LTLIBRARIES = libscifileio-algo.la
pkglib_LTLIBRARIES = libscifileio.la
libscifileio_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
-libscifileio_algo_la_SOURCES = $(FILEIO_SOURCES)
-libscifileio_la_SOURCES = $(GATEWAY_SOURCES) $(GATEWAY_CPP_SOURCES)
+libscifileio_algo_la_SOURCES = $(FILEIO_C_SOURCES) $(FILEIO_CPP_SOURCES)
+libscifileio_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
libscifileio_algo_la_CFLAGS = $(libscifileio_la_CFLAGS)
+libscifileio_algo_la_CPPFLAGS = $(libscifileio_la_CPPFLAGS)
# For the code check (splint)
-CHECK_SRC = $(FILEIO_SOURCES) $(GATEWAY_SOURCES)
+CHECK_SRC = $(FILEIO_C_SOURCES) $(FILEIO_CPP_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
INCLUDE_FLAGS = $(libscifileio_la_CFLAGS)
- # pb of order $(top_builddir)/modules/shell/libscishell.la
+ # pb of order $(top_builddir)/modules/console/libsciconsole.la
libscifileio_la_LIBADD = libscifileio-algo.la \
$(top_builddir)/modules/string/libscistring.la \
$(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
-I$(top_srcdir)/modules/call_scilab/includes \
-I$(top_srcdir)/modules/io/includes \
-I$(top_srcdir)/modules/string/includes \
- -I$(top_srcdir)/modules/localization/includes
++ -I$(top_srcdir)/modules/console/includes \
+ -I$(top_srcdir)/modules/localization/includes \
+ -I$(top_srcdir)/modules/operations/includes
+
+libscifunctions_la_CPPFLAGS= \
+ -I$(srcdir)/includes/ \
+ -I$(srcdir)/src/c/ \
+ -I$(top_srcdir)/modules/functions_manager/includes/ \
+ -I$(top_srcdir)/modules/symbol/includes/ \
+ -I$(top_srcdir)/modules/abstractSyntaxTree/includes/ \
+ -I$(top_srcdir)/modules/api_scilab/includes/ \
+ -I$(top_srcdir)/modules/operations/includes/ \
+ -I$(top_srcdir)/modules/parse/includes/ \
+ -I$(top_srcdir)/modules/string/includes/ \
+ -I$(top_srcdir)/modules/fileio/includes \
+ -I$(top_srcdir)/modules/system_env/includes \
- -I$(top_srcdir)/modules/shell/includes \
++ -I$(top_srcdir)/modules/console/includes \
+ -I$(top_srcdir)/modules/output_stream/includes \
+ -I$(top_srcdir)/modules/types/includes/ \
+ -I$(top_srcdir)/modules/threads/includes/ \
+ -I$(top_srcdir)/modules/elementary_functions/includes/
pkglib_LTLIBRARIES = libscifunctions.la
noinst_LTLIBRARIES = libscifunctions-algo.la
-I$(top_srcdir)/modules/call_scilab/includes \
-I$(top_srcdir)/modules/io/includes \
-I$(top_srcdir)/modules/string/includes \
- -I$(top_srcdir)/modules/localization/includes
++ -I$(top_srcdir)/modules/console/includes \
+ -I$(top_srcdir)/modules/localization/includes \
+ -I$(top_srcdir)/modules/operations/includes
+
+libscifunctions_la_CPPFLAGS = \
+ -I$(srcdir)/includes/ \
+ -I$(srcdir)/src/c/ \
+ -I$(top_srcdir)/modules/functions_manager/includes/ \
+ -I$(top_srcdir)/modules/symbol/includes/ \
+ -I$(top_srcdir)/modules/abstractSyntaxTree/includes/ \
+ -I$(top_srcdir)/modules/api_scilab/includes/ \
+ -I$(top_srcdir)/modules/operations/includes/ \
+ -I$(top_srcdir)/modules/parse/includes/ \
+ -I$(top_srcdir)/modules/string/includes/ \
+ -I$(top_srcdir)/modules/fileio/includes \
+ -I$(top_srcdir)/modules/system_env/includes \
- -I$(top_srcdir)/modules/shell/includes \
++ -I$(top_srcdir)/modules/console/includes \
+ -I$(top_srcdir)/modules/output_stream/includes \
+ -I$(top_srcdir)/modules/types/includes/ \
+ -I$(top_srcdir)/modules/threads/includes/ \
+ -I$(top_srcdir)/modules/elementary_functions/includes/
pkglib_LTLIBRARIES = libscifunctions.la
noinst_LTLIBRARIES = libscifunctions-algo.la
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}</ProjectGuid>
+ <RootNamespace>functions_gw</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../../libs/MALLOC/includes;../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../abstractSyntaxTree/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../shell/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>../../../../libs/MALLOC/includes;../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../abstractSyntaxTree/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../console/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FUNCTIONS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../../libs/MALLOC/includes;../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../abstractSyntaxTree/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../shell/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>../../../../libs/MALLOC/includes;../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../abstractSyntaxTree/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../console/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FUNCTIONS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../../../libs/MALLOC/includes;../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../abstractSyntaxTree/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../shell/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>../../../../libs/MALLOC/includes;../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../abstractSyntaxTree/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../console/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FUNCTIONS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../../../libs/MALLOC/includes;../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../abstractSyntaxTree/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../shell/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>../../../../libs/MALLOC/includes;../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../abstractSyntaxTree/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../console/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FUNCTIONS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="functions_gw.cpp" />
+ <ClCompile Include="sci_exec.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+ </ClCompile>
+ <ClCompile Include="sci_execstr.cpp" />
+ <ClCompile Include="sci_functionlist.cpp" />
+ <ClCompile Include="sci_getCurrentThreadId.cpp" />
+ <ClCompile Include="sci_getThreads.cpp" />
+ <ClCompile Include="sci_mode.cpp" />
+ <ClCompile Include="sci_whereis.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\includes\dynlib_functions_gw.h" />
+ <ClInclude Include="..\..\includes\functions_gw.hxx" />
+ </ItemGroup>
+ <ItemGroup>
+ <Library Include="..\..\..\..\bin\blasplus.lib" />
+ <Library Include="..\..\..\..\bin\lapack.lib" />
+ <Library Include="..\..\..\..\bin\libintl.lib" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\libs\MALLOC\MALLOC.vcxproj">
+ <Project>{6a84ad8c-ba18-4a3f-9c72-ec3df0939e9e}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\tools\Dumpexts\Dumpexts.vcxproj">
+ <Project>{3170e4c2-1173-4264-a222-7ee8ccb3ddf7}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\abstractSyntaxTree\abstractSyntaxTree-tools\abstractSyntaxTree-tools.vcxproj">
+ <Project>{1f4a0344-99ed-461b-bd53-1593788fb34d}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\abstractSyntaxTree\abstractSyntaxTree.vcxproj">
+ <Project>{0d3fa25b-8116-44ec-a45e-260789daa3d9}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\api_scilab\api_scilab.vcxproj">
+ <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
++ <ProjectReference Include="..\..\..\console\src\c\console.vcxproj">
++ <Project>{445d3b85-c9b1-498b-9c88-0a3c2390b1cc}</Project>
++ </ProjectReference>
+ <ProjectReference Include="..\..\..\core\src\c\core.vcxproj">
+ <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\elementary_functions\src\cpp\elem_func\elem_func.vcxproj">
+ <Project>{e1284d3e-4b3f-446b-b541-f661a8a166a7}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\fileio\fileio.vcxproj">
+ <Project>{4fc72d4a-80ee-4b1a-8724-0201c1a35621}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\localization\src\localization.vcxproj">
+ <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\operations\operations.vcxproj">
+ <Project>{1bb396f7-ce61-4cfc-9c22-266b2cfb2e74}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj">
+ <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\parse\parse.vcxproj">
+ <Project>{74d43792-dbfc-47f0-adbc-4d7a20cdada2}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
- <ProjectReference Include="..\..\..\shell\src\c\shell.vcxproj">
- <Project>{805aa73f-ef7b-4177-bf46-200b72d8f83a}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
+ <ProjectReference Include="..\..\..\symbol\symbol.vcxproj">
+ <Project>{2c60033b-0dbd-4ca4-80d3-176c9be9ce2f}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\system_env\system_env.vcxproj">
+ <Project>{7ca60aef-9afa-4d06-af28-613c0aa27640}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\types\sci_gateway\cpp\types_gw\types_gw.vcxproj">
+ <Project>{c2e5f4f6-5ee7-4b36-bfac-4ac36bb41420}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\types\types.vcxproj">
+ <Project>{64e090da-dcb5-4f4d-93d7-e88ddec9c2ef}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\types\typesmacro\typesmacro.vcxproj">
+ <Project>{9252a034-7f22-4cb1-a634-4577da69f2d0}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\..\src\c\functions.vcxproj">
+ <Project>{53a01263-92be-4c87-aa9a-79297f882310}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
SciErr sciErr = getNamedVarType(pvApiCtx, localvariables[i], &iType);
if (!sciErr.iErr)
{
- if (iType == sci_c_function)
+ if (iType == sci_c_function)
{
- macroslist[nbMacros++] = strdup(localvariables[i]);
+ macroslist[nbMacros++] = os_strdup(localvariables[i]);
}
}
}
*
*/
/*--------------------------------------------------------------------------*/
-
+#ifndef _MSC_VER
+ #include <iconv.h>
+ #include <errno.h>
+#endif
+
+#include <wchar.h>
+ #include <wctype.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
src/cpp/DiaryList.cpp \
src/cpp/diary_manager.cpp \
src/cpp/getDiaryDate.cpp \
- src/cpp/getFullFilename.cpp
-
-GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_diary.cpp
-
-OUTPUT_STREAM_C_SOURCES = src/c/erro.c \
- src/c/cerro.c \
- src/c/Scierror.c \
- src/c/msgstore.c \
- src/c/msgout.c \
- src/c/msgs.c \
- src/c/msgstxt.c \
- src/c/basout.c \
- src/c/sciprint.c \
- src/c/sciprint_full.c \
- src/c/errmds.c \
- src/c/errorTable.c \
- src/c/error.c \
- src/c/error_internal.c \
- src/c/do_xxprintf.c \
- src/c/set_xxprintf.c \
- src/c/lasterror.c
-
-OUTPUT_STREAM_FORTRAN_SOURCES = src/fortran/wspdsp.f \
- src/fortran/wmdsp.f \
- src/fortran/strdsp.f \
- src/fortran/prntid.f \
- src/fortran/print.f \
- src/fortran/lspdsp.f \
- src/fortran/fmttyp.f \
- src/fortran/fmt.f \
- src/fortran/dspdsp.f \
- src/fortran/dmrdsp.f \
- src/fortran/dmpdsp.f \
- src/fortran/dmdspf.f \
- src/fortran/dmdsp.f \
- src/fortran/dldsp.f \
- src/fortran/basouttofile.f \
- src/fortran/formatnumber.f
-
-
-GATEWAY_C_SOURCES = sci_gateway/c/gw_output_stream.c \
- sci_gateway/c/sci_print.c \
- sci_gateway/c/sci_mprintf.c \
- sci_gateway/c/sci_msprintf.c \
- sci_gateway/c/sci_disp.c
-
-GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/intprint.f \
- sci_gateway/fortran/intdisp.f
-
-libscioutput_stream_la_CFLAGS= -I$(top_srcdir)/libs/MALLOC/includes/ \
--I$(srcdir)/includes/ \
--I$(top_srcdir)/modules/core/includes \
--I$(srcdir)/src/c/ \
--I$(top_srcdir)/modules/console/includes \
--I$(top_srcdir)/modules/api_scilab/includes \
--I$(top_srcdir)/modules/string/includes
-
-libscioutput_stream_la_CPPFLAGS= -I$(top_srcdir)/libs/MALLOC/includes/ \
--I$(srcdir)/includes/ \
--I$(top_srcdir)/modules/core/includes \
--I$(srcdir)/src/cpp/ \
--I$(srcdir)/src/c/ \
--I$(top_srcdir)/modules/api_scilab/includes \
--I$(top_srcdir)/modules/string/includes
+ src/cpp/getFullFilename.cpp \
+ src/cpp/scilab_sprintf.cpp
+
+#
+GATEWAY_CPP_SOURCES = \
+ sci_gateway/cpp/sci_diary.cpp \
+ sci_gateway/cpp/sci_disp.cpp \
+ sci_gateway/cpp/output_stream_gw.cpp \
+ sci_gateway/cpp/sci_msprintf.cpp \
+ sci_gateway/cpp/sci_mprintf.cpp
+
+OUTPUT_STREAM_C_SOURCES = \
+ src/c/erro.c \
+ src/c/cerro.c \
+ src/c/Scierror.c \
+ src/c/msgstore.c \
+ src/c/msgout.c \
+ src/c/msgs.c \
+ src/c/msgstxt.c \
+ src/c/basout.c \
+ src/c/sciprint.c \
+ src/c/sciprint_full.c \
+ src/c/errmds.c \
+ src/c/error.c \
+ src/c/error_internal.c \
+ src/c/do_xxprintf.c \
+ src/c/set_xxprintf.c
+
+OUTPUT_STREAM_FORTRAN_SOURCES = \
+ src/fortran/wspdsp.f \
+ src/fortran/wmdsp.f \
+ src/fortran/strdsp.f \
+ src/fortran/prntid.f \
+ src/fortran/print.f \
+ src/fortran/lspdsp.f \
+ src/fortran/fmttyp.f \
+ src/fortran/fmt.f \
+ src/fortran/dspdsp.f \
+ src/fortran/dmrdsp.f \
+ src/fortran/dmpdsp.f \
+ src/fortran/dmdspf.f \
+ src/fortran/dmdsp.f \
+ src/fortran/dldsp.f \
+ src/fortran/basouttofile.f \
+ src/fortran/formatnumber.f
+
+
+GATEWAY_C_SOURCES = \
+ sci_gateway/c/gw_output_stream.c \
+ sci_gateway/c/sci_print.c
+
+
+GATEWAY_FORTRAN_SOURCES = \
+ sci_gateway/fortran/intprint.f \
+ sci_gateway/fortran/intdisp.f
+
+libscioutput_stream_la_CFLAGS= \
+ -I$(top_srcdir)/libs/MALLOC/includes/ \
+ -I$(srcdir)/includes/ \
+ -I$(top_srcdir)/modules/core/includes \
+ -I$(srcdir)/src/c/ \
+ -I$(top_srcdir)/modules/string/includes \
- -I$(top_srcdir)/modules/shell/includes \
++ -I$(top_srcdir)/modules/console/includes \
+ -I$(top_srcdir)/modules/api_scilab/includes \
+ -I$(top_srcdir)/modules/operations/includes
+
+libscioutput_stream_la_CPPFLAGS= \
+ -I$(top_srcdir)/libs/MALLOC/includes/ \
+ -I$(srcdir)/includes/ \
+ -I$(top_srcdir)/modules/core/includes \
+ -I$(srcdir)/src/cpp/ \
+ -I$(srcdir)/src/c/ \
+ -I$(top_srcdir)/modules/api_scilab/includes \
+ -I$(top_srcdir)/modules/operations/includes \
+ -I$(top_srcdir)/modules/string/includes \
+ -I$(top_srcdir)/modules/types/includes \
+ -I$(top_srcdir)/modules/functions_manager/includes \
+ -I$(top_srcdir)/modules/symbol/includes \
+ -I$(top_srcdir)/modules/abstractSyntaxTree/includes \
+ -I$(top_srcdir)/modules/system_env/includes \
+ -I$(top_srcdir)/modules/threads/includes \
- -I$(top_srcdir)/modules/shell/includes
++ -I$(top_srcdir)/modules/console/includes
pkglib_LTLIBRARIES = libscioutput_stream.la
libscioutput_stream_algo_la_CPPFLAGS = $(libscioutput_stream_la_CPPFLAGS)
# For the code check (splint)
-CHECK_SRC= $(OUTPUT_STREAM_C_SOURCES) $(GATEWAY_C_SOURCES)
-INCLUDE_FLAGS = $(libscioutput_stream_la_CFLAGS)
+CHECK_SRC= $(OUTPUT_STREAM_C_SOURCES) $(GATEWAY_C_SOURCES) $(OUTPUT_STREAM_CPP_SOURCES)
+INCLUDE_FLAGS = $(libscioutput_stream_la_CFLAGS) $(libscioutput_stream_la_CPPFLAGS)
# Many stuff depends on this one ... commented
- libscioutput_stream_la_LIBADD = libscioutput_stream-algo.la
- #$(top_builddir)/modules/console/libsciconsole.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/shell/libscishell.la $(top_builddir)/libs/MALLOC/libscimalloc.la
+ libscioutput_stream_la_LIBADD = libscioutput_stream-algo.la
+ #$(top_builddir)/modules/console/libsciconsole.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/libs/MALLOC/libscimalloc.la
#### Target ######
modulename=output_stream
src/cpp/DiaryList.cpp \
src/cpp/diary_manager.cpp \
src/cpp/getDiaryDate.cpp \
- src/cpp/getFullFilename.cpp
-
-GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_diary.cpp
-OUTPUT_STREAM_C_SOURCES = src/c/erro.c \
- src/c/cerro.c \
- src/c/Scierror.c \
- src/c/msgstore.c \
- src/c/msgout.c \
- src/c/msgs.c \
- src/c/msgstxt.c \
- src/c/basout.c \
- src/c/sciprint.c \
- src/c/sciprint_full.c \
- src/c/errmds.c \
- src/c/errorTable.c \
- src/c/error.c \
- src/c/error_internal.c \
- src/c/do_xxprintf.c \
- src/c/set_xxprintf.c \
- src/c/lasterror.c
-
-OUTPUT_STREAM_FORTRAN_SOURCES = src/fortran/wspdsp.f \
- src/fortran/wmdsp.f \
- src/fortran/strdsp.f \
- src/fortran/prntid.f \
- src/fortran/print.f \
- src/fortran/lspdsp.f \
- src/fortran/fmttyp.f \
- src/fortran/fmt.f \
- src/fortran/dspdsp.f \
- src/fortran/dmrdsp.f \
- src/fortran/dmpdsp.f \
- src/fortran/dmdspf.f \
- src/fortran/dmdsp.f \
- src/fortran/dldsp.f \
- src/fortran/basouttofile.f \
- src/fortran/formatnumber.f
-
-GATEWAY_C_SOURCES = sci_gateway/c/gw_output_stream.c \
- sci_gateway/c/sci_print.c \
- sci_gateway/c/sci_mprintf.c \
- sci_gateway/c/sci_msprintf.c \
- sci_gateway/c/sci_disp.c
-
-GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/intprint.f \
- sci_gateway/fortran/intdisp.f
-
-libscioutput_stream_la_CFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
--I$(srcdir)/includes/ \
--I$(top_srcdir)/modules/core/includes \
--I$(srcdir)/src/c/ \
--I$(top_srcdir)/modules/console/includes \
--I$(top_srcdir)/modules/api_scilab/includes \
--I$(top_srcdir)/modules/string/includes
-
-libscioutput_stream_la_CPPFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
--I$(srcdir)/includes/ \
--I$(top_srcdir)/modules/core/includes \
--I$(srcdir)/src/cpp/ \
--I$(srcdir)/src/c/ \
--I$(top_srcdir)/modules/api_scilab/includes \
--I$(top_srcdir)/modules/string/includes
+ src/cpp/getFullFilename.cpp \
+ src/cpp/scilab_sprintf.cpp
+
+
+#
+GATEWAY_CPP_SOURCES = \
+ sci_gateway/cpp/sci_diary.cpp \
+ sci_gateway/cpp/sci_disp.cpp \
+ sci_gateway/cpp/output_stream_gw.cpp \
+ sci_gateway/cpp/sci_msprintf.cpp \
+ sci_gateway/cpp/sci_mprintf.cpp
+
+OUTPUT_STREAM_C_SOURCES = \
+ src/c/erro.c \
+ src/c/cerro.c \
+ src/c/Scierror.c \
+ src/c/msgstore.c \
+ src/c/msgout.c \
+ src/c/msgs.c \
+ src/c/msgstxt.c \
+ src/c/basout.c \
+ src/c/sciprint.c \
+ src/c/sciprint_full.c \
+ src/c/errmds.c \
+ src/c/error.c \
+ src/c/error_internal.c \
+ src/c/do_xxprintf.c \
+ src/c/set_xxprintf.c
+
+OUTPUT_STREAM_FORTRAN_SOURCES = \
+ src/fortran/wspdsp.f \
+ src/fortran/wmdsp.f \
+ src/fortran/strdsp.f \
+ src/fortran/prntid.f \
+ src/fortran/print.f \
+ src/fortran/lspdsp.f \
+ src/fortran/fmttyp.f \
+ src/fortran/fmt.f \
+ src/fortran/dspdsp.f \
+ src/fortran/dmrdsp.f \
+ src/fortran/dmpdsp.f \
+ src/fortran/dmdspf.f \
+ src/fortran/dmdsp.f \
+ src/fortran/dldsp.f \
+ src/fortran/basouttofile.f \
+ src/fortran/formatnumber.f
+
+GATEWAY_C_SOURCES = \
+ sci_gateway/c/gw_output_stream.c \
+ sci_gateway/c/sci_print.c
+
+GATEWAY_FORTRAN_SOURCES = \
+ sci_gateway/fortran/intprint.f \
+ sci_gateway/fortran/intdisp.f
+
+libscioutput_stream_la_CFLAGS = \
+ -I$(top_srcdir)/libs/MALLOC/includes/ \
+ -I$(srcdir)/includes/ \
+ -I$(top_srcdir)/modules/core/includes \
+ -I$(srcdir)/src/c/ \
+ -I$(top_srcdir)/modules/string/includes \
- -I$(top_srcdir)/modules/shell/includes \
++ -I$(top_srcdir)/modules/console/includes \
+ -I$(top_srcdir)/modules/api_scilab/includes \
+ -I$(top_srcdir)/modules/operations/includes
+
+libscioutput_stream_la_CPPFLAGS = \
+ -I$(top_srcdir)/libs/MALLOC/includes/ \
+ -I$(srcdir)/includes/ \
+ -I$(top_srcdir)/modules/core/includes \
+ -I$(srcdir)/src/cpp/ \
+ -I$(srcdir)/src/c/ \
+ -I$(top_srcdir)/modules/api_scilab/includes \
+ -I$(top_srcdir)/modules/operations/includes \
+ -I$(top_srcdir)/modules/string/includes \
+ -I$(top_srcdir)/modules/types/includes \
+ -I$(top_srcdir)/modules/functions_manager/includes \
+ -I$(top_srcdir)/modules/symbol/includes \
+ -I$(top_srcdir)/modules/abstractSyntaxTree/includes \
+ -I$(top_srcdir)/modules/system_env/includes \
+ -I$(top_srcdir)/modules/threads/includes \
- -I$(top_srcdir)/modules/shell/includes
++ -I$(top_srcdir)/modules/console/includes
pkglib_LTLIBRARIES = libscioutput_stream.la
noinst_LTLIBRARIES = libscioutput_stream-algo.la
libscioutput_stream_algo_la_CPPFLAGS = $(libscioutput_stream_la_CPPFLAGS)
# For the code check (splint)
-CHECK_SRC = $(OUTPUT_STREAM_C_SOURCES) $(GATEWAY_C_SOURCES)
-INCLUDE_FLAGS = $(libscioutput_stream_la_CFLAGS)
+CHECK_SRC = $(OUTPUT_STREAM_C_SOURCES) $(GATEWAY_C_SOURCES) $(OUTPUT_STREAM_CPP_SOURCES)
+INCLUDE_FLAGS = $(libscioutput_stream_la_CFLAGS) $(libscioutput_stream_la_CPPFLAGS)
# Many stuff depends on this one ... commented
- libscioutput_stream_la_LIBADD = libscioutput_stream-algo.la
- #$(top_builddir)/modules/console/libsciconsole.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/shell/libscishell.la $(top_builddir)/libs/MALLOC/libscimalloc.la
+ libscioutput_stream_la_LIBADD = libscioutput_stream-algo.la
+ #$(top_builddir)/modules/console/libsciconsole.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/libs/MALLOC/libscimalloc.la
#### Target ######
modulename = output_stream
EXPORTS
ConsolePrintf
-
+ getLinesSize
+ getColumnsSize
+ linesmore
- TermPrintf_Windows
++ TermPrintf_Windows
++ GetCurrentPrompt
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../shell/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../console/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../console/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../console/src/c/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../console/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../console/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
</ClCompile>
<PreLinkEvent>
<Message>Make dependencies</Message>
- <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)LibScilab.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)fileio.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)Console_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)sciconsole.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)String_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)string.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)Scilab_Windows_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scilab_windows.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)Localization_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scilocalization.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)Output_stream_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)Output_stream_f.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)api_scilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)api_scilab.lib" 1>NUL 2>NUL
+ <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)LibScilab.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)fileio.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)Console_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)sciconsole.lib" 1>NUL 2>NUL
- lib /DEF:"$(ProjectDir)Shell_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)libshell.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)String_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)string.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)Scilab_Windows_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)scilab_windows.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)Localization_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)scilocalization.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)Output_stream_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)Output_stream_f.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)api_scilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)api_scilab.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)system_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)system_env.lib" 1>NUL 2>NUL
</Command>
</PreLinkEvent>
<Link>
- <AdditionalDependencies>LibScilab.lib;fileio.lib;sciconsole.lib;libshell.lib;string.lib;scilocalization.lib;scilab_windows.lib;output_stream_f.lib;api_scilab.lib;system_env.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalDependencies>LibScilab.lib;fileio.lib;sciconsole.lib;string.lib;scilocalization.lib;scilab_windows.lib;output_stream_f.lib;api_scilab.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>LibScilab.lib;fileio.lib;sciconsole.lib;string.lib;scilocalization.lib;scilab_windows.lib;output_stream_f.lib;api_scilab.lib;system_env.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
<ModuleDefinitionFile>output_stream_export.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../shell/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../console/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../console/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../console/src/c/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../console/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../console/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
</ClCompile>
<PreLinkEvent>
<Message>Make dependencies</Message>
- <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)LibScilab.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)fileio.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)Console_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)sciconsole.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)String_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)string.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)Scilab_Windows_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scilab_windows.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)Localization_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scilocalization.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)Output_stream_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)Output_stream_f.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)api_scilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)api_scilab.lib" 1>NUL 2>NUL
+ <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)LibScilab.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)fileio.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)Console_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)sciconsole.lib" 1>NUL 2>NUL
- lib /DEF:"$(ProjectDir)Shell_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)libshell.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)String_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)string.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)Scilab_Windows_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)scilab_windows.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)Localization_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)scilocalization.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)Output_stream_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)Output_stream_f.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)api_scilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)api_scilab.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)system_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)system_env.lib" 1>NUL 2>NUL
+
</Command>
</PreLinkEvent>
<Link>
- <AdditionalDependencies>LibScilab.lib;fileio.lib;sciconsole.lib;libshell.lib;string.lib;scilocalization.lib;scilab_windows.lib;output_stream_f.lib;api_scilab.lib;system_env.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalDependencies>LibScilab.lib;fileio.lib;sciconsole.lib;string.lib;scilocalization.lib;scilab_windows.lib;output_stream_f.lib;api_scilab.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>LibScilab.lib;fileio.lib;sciconsole.lib;string.lib;scilocalization.lib;scilab_windows.lib;output_stream_f.lib;api_scilab.lib;system_env.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
<ModuleDefinitionFile>output_stream_export.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../shell/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../console/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../console/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../console/src/c/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../console/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../console/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<PreLinkEvent>
<Message>Make dependencies</Message>
- <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)LibScilab.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)fileio.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)Console_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)sciconsole.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)String_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)string.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)Scilab_Windows_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scilab_windows.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)Localization_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scilocalization.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)Output_stream_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)Output_stream_f.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)api_scilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)api_scilab.lib" 1>NUL 2>NUL
+ <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)LibScilab.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)fileio.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)Console_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)sciconsole.lib" 1>NUL 2>NUL
- lib /DEF:"$(ProjectDir)Shell_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)libshell.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)String_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)string.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)Scilab_Windows_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)scilab_windows.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)Localization_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)scilocalization.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)Output_stream_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)Output_stream_f.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)api_scilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)api_scilab.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)system_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)system_env.lib" 1>NUL 2>NUL
</Command>
</PreLinkEvent>
<Link>
- <AdditionalDependencies>LibScilab.lib;fileio.lib;sciconsole.lib;libshell.lib;string.lib;scilocalization.lib;scilab_windows.lib;output_stream_f.lib;api_scilab.lib;system_env.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalDependencies>LibScilab.lib;fileio.lib;sciconsole.lib;string.lib;scilocalization.lib;scilab_windows.lib;output_stream_f.lib;api_scilab.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>LibScilab.lib;fileio.lib;sciconsole.lib;string.lib;scilocalization.lib;scilab_windows.lib;output_stream_f.lib;api_scilab.lib;system_env.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
<ModuleDefinitionFile>output_stream_export.def</ModuleDefinitionFile>
<GenerateDebugInformation>false</GenerateDebugInformation>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../shell/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../console/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../console/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../console/src/c/windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../console/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../console/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<PreLinkEvent>
<Message>Make dependencies</Message>
- <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)LibScilab.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)fileio.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)Console_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)sciconsole.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)String_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)string.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)Scilab_Windows_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scilab_windows.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)Localization_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scilocalization.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)Output_stream_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)Output_stream_f.lib" 1>NUL 2>NUL
-lib /DEF:"$(ProjectDir)api_scilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)api_scilab.lib" 1>NUL 2>NUL
+ <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)LibScilab.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)fileio.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)Console_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)sciconsole.lib" 1>NUL 2>NUL
- lib /DEF:"$(ProjectDir)Shell_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)libshell.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)String_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)string.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)Scilab_Windows_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)scilab_windows.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)Localization_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)scilocalization.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)Output_stream_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)Output_stream_f.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)api_scilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)api_scilab.lib" 1>NUL 2>NUL
+lib /DEF:"$(ProjectDir)system_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)system_env.lib" 1>NUL 2>NUL
+
</Command>
</PreLinkEvent>
<Link>
- <AdditionalDependencies>LibScilab.lib;fileio.lib;sciconsole.lib;libshell.lib;string.lib;scilocalization.lib;scilab_windows.lib;output_stream_f.lib;api_scilab.lib;system_env.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalDependencies>LibScilab.lib;fileio.lib;sciconsole.lib;string.lib;scilocalization.lib;scilab_windows.lib;output_stream_f.lib;api_scilab.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>LibScilab.lib;fileio.lib;sciconsole.lib;string.lib;scilocalization.lib;scilab_windows.lib;output_stream_f.lib;api_scilab.lib;system_env.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
<ModuleDefinitionFile>output_stream_export.def</ModuleDefinitionFile>
<GenerateDebugInformation>false</GenerateDebugInformation>
<None Include="Localization_Import.def" />
<None Include="output_stream_f_Import.def" />
<None Include="Scilab_Windows_Import.def" />
- <None Include="Shell_Import.def" />
<None Include="String_Import.def" />
+ <None Include="System_env_Import.def" />
<None Include="output_stream_export.def" />
<None Include="..\..\Makefile.am" />
<None Include="..\..\output_stream.iss" />
$(top_builddir)/modules/scicos/libscisundials.la \
$(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la \
$(top_builddir)/modules/mexlib/libmex.la \
- \
+$(top_builddir)/modules/core/libscicore.la \
$(top_builddir)/libs/MALLOC/libscimalloc.la \
$(top_builddir)/modules/output_stream/libscioutput_stream.la \
- $(top_builddir)/modules/arnoldi/libsciarnoldi.la
+ $(top_builddir)/modules/arnoldi/libsciarnoldi.la
#### scicos : Conf files ####
libsciscicos_la_rootdir = $(mydatadir)
@XCOS_TRUE@$(top_builddir)/modules/scicos/libscisundials.la \
@XCOS_TRUE@$(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la \
@XCOS_TRUE@$(top_builddir)/modules/mexlib/libmex.la \
-@XCOS_TRUE@ \
+@XCOS_TRUE@$(top_builddir)/modules/core/libscicore.la \
@XCOS_TRUE@$(top_builddir)/libs/MALLOC/libscimalloc.la \
@XCOS_TRUE@$(top_builddir)/modules/output_stream/libscioutput_stream.la \
- @XCOS_TRUE@$(top_builddir)/modules/arnoldi/libsciarnoldi.la
+ @XCOS_TRUE@$(top_builddir)/modules/arnoldi/libsciarnoldi.la
#### scicos : Conf files ####
<ClCompile Include="..\..\sci_gateway\c\sci_getblocklabel.c" />
<ClCompile Include="..\..\sci_gateway\c\sci_getscicosvars.c" />
<ClCompile Include="..\..\sci_gateway\c\sci_haltscicos.c" />
+ <ClCompile Include="..\..\sci_gateway\c\sci_loadScicos.c" />
<ClCompile Include="..\..\sci_gateway\c\sci_model2blk.c" />
- <ClCompile Include="..\..\sci_gateway\c\sci_permutobj.c" />
<ClCompile Include="..\..\sci_gateway\c\sci_phase_simulation.c" />
<ClCompile Include="..\..\sci_gateway\c\sci_pointer_xproperty.c" />
<ClCompile Include="..\..\sci_gateway\c\sci_scicos_debug.c" />
//
// This file is distributed under the same license as the Scilab package.
// =============================================================================
- // <-- NOT FIXED -->
-if amell(10,[1:10])<> 0 then pause,end
-if or(size(amell([1:10],[1:10])) <> [1 10]) then pause,end
-if or(amell([1:10],[1:10])<> 0) then pause,end
+a=amell(10,0.1);
+if a > 3.693 then pause,end
+if a < 3.692 then pause,end
+if or(size(amell([1:10], 0.1)) <> [1 10]) then pause,end
+if or(amell([1:10], 1)<> 0) then pause,end
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2008 - DIGITEO
-//
+// 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
+
+// 'syredi' unit tests
+
+test_path = pathconvert(SCI + '/modules/signal_processing/tests/unit_tests');
+
+// requires test_utilities.sci
+exec(test_path + 'test_utilities.sci');
+
+// ****************************************************************
+// * Part I: defining the tests *
+// * Part II: performing the tests *
+// ****************************************************************
// This file is distributed under the same license as the Scilab package.
// =============================================================================
- // <-- NOT FIXED -->
+// **** Part I: defining the tests ****
+// old tests wrapped
+function test_syredi_old()
[fact,b2,b1,b0,c1,c0,zzeros,zpoles]=syredi(1,4,[2*%pi/10,4*%pi/10,0,0],0.02,0.001);
ref_fact = 0.005976;
-if norm(fact-ref_fact) > 0.0000037 then pause,end
-if or(b2<>[1 1 1]) then pause,end
-if or(size(b1)<>[1 3]) then pause,end
-if b1(3)<> 1 then pause,end
-if or(b0<>[1 1 0]) then pause,end
-if or(size(c1)<>[1 3]) then pause,end
-if or(size(c0)<>[1 3]) then pause,end
-if c0(3)<> 0 then pause,end
-if or(size(zzeros)<>[1 5]) then pause,end
-if or(size(zpoles)<>[1 5]) then pause,end
+if norm(fact-ref_fact) > 0.0000037 then pause,end;
+if or(b2<>[1 1 1]) then pause,end;
+if or(size(b1)<>[1 3]) then pause,end;
+if b1(3)<> 1 then pause,end;
+if or(b0<>[1 1 0]) then pause,end;
+if or(size(c1)<>[1 3]) then pause,end;
+if or(size(c0)<>[1 3]) then pause,end;
+if c0(3)<> 0 then pause,end;
+if or(size(zzeros)<>[1 5]) then pause,end;
+if or(size(zpoles)<>[1 5]) then pause,end;
+endfunction
+
+function test_syredi_new()
+load(test_path + 'syredi.dat', 'fact1_ref', 'b21_ref', 'b11_ref', 'b01_ref', 'c11_ref', 'c01_ref', 'zzeros1_ref', 'zpoles1_ref', 'fact2_ref', 'b22_ref', 'b12_ref', 'b02_ref', 'c12_ref', 'c02_ref', 'zzeros2_ref', 'zpoles2_ref');
+[fact1, b21, b11, b01, c11, c01, zzeros1, zpoles1] = syredi(1, 4, [1, 2, 0, 0], 0.02, 0.001);
+check(list(fact1, b21, b11, b01, c11, c01, zzeros1, zpoles1), list(fact1_ref,b21_ref,b11_ref,b01_ref,c11_ref,c01_ref,zzeros1_ref,zpoles1_ref));
+[fact2, b22, b12, b02, c12, c02, zzeros2, zpoles2] = syredi(3, 4, [1, 2, 3, 3.01], 0.1, 0.001);
+check(list(fact2, b22, b12, b02, c12, c02, zzeros2, zpoles2), list(fact2_ref,b22_ref,b12_ref,b02_ref,c12_ref,c02_ref,zzeros2_ref,zpoles2_ref));
+endfunction
+
+// **** Part II: performing the tests ****
+
+// wrap all tests together
+function test_syredi()
+test_syredi_old();
+test_syredi_new();
+endfunction
+
+test_syredi();
<ClInclude Include="tokens.h" />
</ItemGroup>
<ItemGroup>
- <None Include="..\..\locales\en_US\string.pot" />
+ <None Include="..\..\locales\string.pot" />
<None Include="LibScilab_Import.def" />
+ <None Include="linpack_f_Import.def" />
<None Include="localization_Import.def" />
- <None Include="Scilab_windows_Import.def" />
<None Include="string_f_Import.def" />
+ <None Include="System_env_Import.def" />
<None Include="..\..\Makefile.am" />
<None Include="..\..\string.iss" />
<None Include="..\..\sci_gateway\string_gateway.xml" />
fileAndExt = filename+extension;
if or(fileAndExt == ["Create_ISS.sce","Create_ISS_nojre.sce"]) then
- SaveCurrentPath=pwd();
- if ~(SaveCurrentPath == path) then
- chdir(path);
- end
+ SaveCurrentPath=pwd();
+ if ~(SaveCurrentPath == path) then
+ chdir(path);
+ end
+
+ if ~(Update_Script_Innosetup("Scilab.iss") == %T ) then
+ printf("\nScript aborted.\n");
+ end
+ chdir(SaveCurrentPath);
- if ~(Update_Script_Innosetup("Scilab.iss") == %T ) then
- printf("\nScript aborted.\n");
- end
- chdir(SaveCurrentPath);
+
else
- printf("Error: name of this file isn""t ""Create_ISS.sce"" but %s\n",(filename+extension));
- printf("Please rename this file\n");
+ printf("Error: name of this file isn""t ""Create_ISS.sce"" but %s\n",(filename+extension));
+ printf("Please rename this file\n");
end
exit
//------------------------------------------------------------------------------
external 'GetModuleHandleA@kernel32.dll stdcall';
var
- AboutModulesButton: TButton;
+ AboutModulesButton: TButton;
//------------------------------------------------------------------------------
function isCLIType(): Boolean;
- begin
- Result := true;
- if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}'))) then
- begin
- Result := false;
- end;
- end;
+ begin
+ Result := true;
+ if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}'))) then
+ begin
+ Result := false;
+ end;
+ end;
//------------------------------------------------------------------------------
function getExecNameForDesktop(Param: String): String;
- begin
- if (isCLIType() = true) then
- begin
- Result := ExpandConstant('{app}') + '\bin\scilex.exe';
- end
- else
- begin
- Result := ExpandConstant('{app}') + '\bin\wscilex.exe';
- end;
- end;
+ begin
+ if (isCLIType() = true) then
+ begin
+ Result := ExpandConstant('{app}') + '\bin\YaSp.exe';
+ end
+ else
+ begin
+ Result := ExpandConstant('{app}') + '\bin\YaSp.exe';
+ end;
+ end;
//------------------------------------------------------------------------------
function DoTasksJustAfterInstall: Boolean;
- var
- bOK : Boolean;
- begin
- Result := true;
+ var
+ bOK : Boolean;
- bOK := CreateModulesFile();
- if (bOK = false) then
- begin
- Result := false;
- end;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_MKL_CPU_LIBRARY}') ) = true) then
- begin
- bOK := checkMD5Files_MKL();
- if (bOK = false) then
- begin
- SuppressibleMsgBox(CustomMessage('DoTasksJustAfterInstallMsg2'),mbError, MB_OK, MB_OK );
- Result := false;
- end else begin
- bOK := Install_MKL();
- if (bOK = false) then
- begin
- Result := false;
- end;
- end;
- end;
+ begin
+ Result := true;
- if (IsComponentSelected( ExpandConstant('{#COMPN_FFTW_MKL_LIBRARY}') ) = true) then
- begin
+ bOK := CreateModulesFile();
+ if (bOK = false) then
+ begin
+ Result := false;
+ end;
- bOK := checkMD5Files_MKL_FFTW();
- if (bOK = false) then
- begin
- SuppressibleMsgBox(CustomMessage('DoTasksJustAfterInstallMsg3'),mbError, MB_OK, MB_OK );
- Result := false;
- end else begin
+ if (IsComponentSelected( ExpandConstant('{#COMPN_MKL_CPU_LIBRARY}') ) = true) then
+ begin
+ bOK := Install_commons_MKL();
+ if (bOK = false) then
+ begin
+ SuppressibleMsgBox(CustomMessage('DoTasksJustAfterInstallMsg2'),mbError, MB_OK, MB_OK );
+ Result := false;
+ end
+ else
+ begin
+ bOK := Install_MKL();
+ if (bOK = false) then
+ begin
+ SuppressibleMsgBox(CustomMessage('DoTasksJustAfterInstallMsg2'),mbError, MB_OK, MB_OK );
+ Result := false;
+ end;
+ end;
+ end;
- bOK := Install_MKL_FFTW();
- if (bOK = false) then
- begin
- Result := false;
- end;
- end;
- end;
+ if (IsComponentSelected( ExpandConstant('{#COMPN_FFTW_MKL_LIBRARY}') ) = true) then
+ begin
+ bOK := Install_MKL_FFTW();
+ if (bOK = false) then
+ begin
+ SuppressibleMsgBox(CustomMessage('DoTasksJustAfterInstallMsg3'),mbError, MB_OK, MB_OK );
+ Result := false;
+ end;
+ end;
- end;
- //------------------------------------------------------------------------------
- function haveProgramFiles64(): Boolean;
- var
- strEnv : String;
- begin
- strEnv := GetEnv('ProgramW6432');
- result := DirExists(strEnv);
- end;
- //------------------------------------------------------------------------------
- function isWow64(): Boolean;
- begin
- result := false;
- if (RegKeyExists(HKLM, 'SOFTWARE\Wow6432Node') = true) and (haveProgramFiles64() = true) then
+ if (IsComponentSelected( ExpandConstant('{#COMPN_CHM}') ) = true) then
+ begin
+ bOK := Install_CHM();
+ if (bOK = false) then
begin
- result := true;
+ SuppressibleMsgBox(CustomMessage('DoTasksJustAfterInstallMsg4'),mbError, MB_OK, MB_OK );
+ Result := false;
end;
- end;
+ end;
+
+
+ end;
//------------------------------------------------------------------------------
function GetJREVersion(): String;
- begin
- Result := '';
- #ifdef SCILAB_X64
+ begin
+ Result := '';
+ if Is64BitInstallMode() then
+ begin
RegQueryStringValue( HKLM, 'SOFTWARE\JavaSoft\Java Runtime Environment', 'CurrentVersion', Result );
- #else
+ end;
// 2 cas :
- if (isWow64() = true) then
- begin
- // Scilab 32 bits sur Windows 64 bits
- RegQueryStringValue( HKLM, 'SOFTWARE\Wow6432Node\JavaSoft\Java Runtime Environment', 'CurrentVersion', Result );
- end else
- begin
- // Scilab 32 bits sur Windows 32 bits
- RegQueryStringValue( HKLM, 'SOFTWARE\JavaSoft\Java Runtime Environment', 'CurrentVersion', Result );
- end;
- #endif
-
+ if IsWin64() then
+ begin
+ // Scilab 32 bits sur Windows 64 bits
+ RegQueryStringValue( HKLM, 'SOFTWARE\Wow6432Node\JavaSoft\Java Runtime Environment', 'CurrentVersion', Result );
+ end
+ else
+ begin
+ // Scilab 32 bits sur Windows 32 bits
+ RegQueryStringValue( HKLM, 'SOFTWARE\JavaSoft\Java Runtime Environment', 'CurrentVersion', Result );
end;
+
+ end;
//------------------------------------------------------------------------------
function CheckJREVersion(): Boolean;
- var
- jreVersion: String;
- minJREVersionRegistry: String;
- begin
- //
- // Initialize min java version constant
- //
- minJREVersionRegistry := ExpandConstant('{#javaSpecificationVersion}');
- //
- //
- // now we check the version of the installed JRE
- jreVersion := GetJREVersion();
- //
- if ( jreVersion = '' ) then begin
- Result := false;
- end else if ( jreVersion < minJREVersionRegistry ) then begin
- Result := false;
- end else begin
- Result := true;
- end;
+ var
+ jreVersion: String;
+ minJREVersionRegistry: String;
+ begin
+ //
+ // Initialize min java version constant
+ //
+ minJREVersionRegistry := ExpandConstant('{#javaSpecificationVersion}');
+ //
+ //
+ // now we check the version of the installed JRE
+ jreVersion := GetJREVersion();
+ //
+ if ( jreVersion = '' ) then begin
+ Result := false;
+ end else if ( jreVersion < minJREVersionRegistry ) then begin
+ Result := false;
+ end else begin
+ Result := true;
end;
+ end;
//------------------------------------------------------------------------------
function VerifyJREVersion() : Boolean;
- var
- bJREVersion: Boolean;
- begin
- bJREVersion := CheckJREVersion();
-
- if ( bJREVersion <> true ) then begin
- SuppressibleMsgBox( CustomMessage('MsgBoxJavaDetection1') + #13 +
- CustomMessage('MsgBoxJavaDetection2') + ExpandConstant('{#javaSpecificationVersion}') + '.',
- mbError, MB_OK, MB_OK );
- end;
-
- Result := bJREVersion;
+ var
+ bJREVersion: Boolean;
+ begin
+ bJREVersion := CheckJREVersion();
+
+ if ( bJREVersion <> true ) then begin
+ SuppressibleMsgBox( CustomMessage('MsgBoxJavaDetection1') + #13 +
+ CustomMessage('MsgBoxJavaDetection2') + ExpandConstant('{#javaSpecificationVersion}') + '.',
+ mbError, MB_OK, MB_OK );
end;
- //------------------------------------------------------------------------------
+ Result := bJREVersion;
+ end;
+ //------------------------------------------------------------------------------
procedure ButtonAboutModulesOnClick(Sender: TObject);
var
- ErrorCode: Integer;
+ ErrorCode: Integer;
begin
- if not ShellExec('', ExpandConstant('{#MODULES_LIST_WEB_PAGE}'),
- '', '', SW_SHOW, ewNoWait, ErrorCode) then
- begin
- // handle failure if necessary
- SuppressibleMsgBox( CustomMessage('MsgBoxWebOpen'),mbError, MB_OK, MB_OK );
- end;
+ if not ShellExec('', ExpandConstant('{#MODULES_LIST_WEB_PAGE}'),
+ '', '', SW_SHOW, ewNoWait, ErrorCode) then
+ begin
+ // handle failure if necessary
+ SuppressibleMsgBox( CustomMessage('MsgBoxWebOpen'),mbError, MB_OK, MB_OK );
+ end;
end;
//------------------------------------------------------------------------------
function BackButtonClick(CurPageID: Integer): Boolean;
begin
i := 0;
- setArrayLength(ModulesXmlFileLines, 256);
- for d := 0 to GetArrayLength(ModulesXmlFileLines)-1 do
- begin
- ModulesXmlFileLines[d] := '';
- end;
-
- ModuleFileName := ExpandConstant('{app}') +'\etc\modules.xml';
-
- ModulesXmlFileLines[i] := '<?xml version="1.0" encoding="UTF-8" standalone="no"?>'; i := i + 1;
- ModulesXmlFileLines[i] := '<!DOCTYPE modules SYSTEM "../modules/core/xml/modules.dtd">'; i := i + 1;
- ModulesXmlFileLines[i] := '<!-- =================== -->'; i := i + 1;
- ModulesXmlFileLines[i] := '<!--'; i := i + 1;
- ModulesXmlFileLines[i] := ' Modules list for Scilab'; i := i + 1;
- ModulesXmlFileLines[i] := ' @author Allan CORNET'; i := i + 1;
- ModulesXmlFileLines[i] := ' @date DIGITEO 2010'; i := i + 1;
- ModulesXmlFileLines[i] := ' ==================='; i := i + 1;
- ModulesXmlFileLines[i] := ' Do not touch if you do not know what you are doing'; i := i + 1;
- ModulesXmlFileLines[i] := ' Warning "core" module must be always the first module'; i := i + 1;
- ModulesXmlFileLines[i] := ' activate="yes" module will be launched ( or not "no")'; i := i + 1;
- ModulesXmlFileLines[i] := ' -->'; i := i + 1;
- ModulesXmlFileLines[i] := '<!-- =================== -->'; i := i + 1;
- ModulesXmlFileLines[i] := '<modules>'; i := i + 1;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
- begin
- ModulesXmlFileLines[i] := '<module name="core" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="api_scilab" activate="yes"/>'; i := i + 1;
- end;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
- begin
- ModulesXmlFileLines[i] := '<module name="helptools" activate="yes"/>'; i := i + 1;
- end;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
- begin
- ModulesXmlFileLines[i] := '<module name="differential_equations" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="double" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="elementary_functions" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="functions" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="fileio" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_GRAPHICS}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="graphics" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="renderer" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="graphic_export" activate="yes"/>'; i := i + 1;
- end;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
- begin
- ModulesXmlFileLines[i] := '<module name="boolean" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="cacsd" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="data_structures" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="console" activate="yes"/>'; i := i + 1;
- end;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
- begin
- ModulesXmlFileLines[i] := '<module name="action_binding" activate="yes"/>'; i := i + 1;
- end;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
- begin
- ModulesXmlFileLines[i] := '<module name="completion" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="history_manager" activate="yes"/>'; i := i + 1;
- end;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
- begin
- ModulesXmlFileLines[i] := '<module name="gui" activate="yes"/>'; i := i + 1;
- end;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
- begin
- ModulesXmlFileLines[i] := '<module name="dynamic_link" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="integer" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="io" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="output_stream" activate="yes"/>'; i := i + 1;
- end;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
- begin
- ModulesXmlFileLines[i] := '<module name="jvm" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="commons" activate="yes"/>'; i := i + 1;
- end;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
- begin
- ModulesXmlFileLines[i] := '<module name="linear_algebra" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="localization" activate="yes"/>'; i := i + 1;
- end;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
- begin
- ModulesXmlFileLines[i] := '<module name="graph" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="ui_data" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="history_browser" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_INTERSCI}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="intersci" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_INTERP}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="interpolation" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_OPTIM}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="optimization" activate="yes"/>'; i := i + 1;
- end;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
- begin
- ModulesXmlFileLines[i] := '<module name="overloading" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_POLY}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="polynomials" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_SIGPROC}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="signal_processing" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_SPARSE}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="sparse" activate="yes"/>'; i := i + 1;
- end;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
- begin
- ModulesXmlFileLines[i] := '<module name="special_functions" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="string" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_SYMB}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="symbolic" activate="yes"/>'; i := i + 1;
- end;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
- begin
- ModulesXmlFileLines[i] := '<module name="time" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="windows_tools" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_STATS}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="statistics" activate="yes"/>'; i := i + 1;
- end;
-
- ModulesXmlFileLines[i] := '<!-- comments -->'; i := i + 1;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_ARNOLDI}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="arnoldi" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_COMPATFUNCTIONS}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="compatibility_functions" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_JAVASCI}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="javasci" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_MAP2SCI}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="maple2scilab" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_M2SCI}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="m2sci" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_MEXLIB}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="mexlib" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_TCLSCI}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="tclsci" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_TEXMACS}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="texmacs" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_SOUND}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="sound" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_RANDLIB}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="randlib" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_DEVTOOLS}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="development_tools" activate="yes"/>'; i := i + 1;
- end;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
- begin
- ModulesXmlFileLines[i] := '<module name="demo_tools" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_SPREADSHEET}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="spreadsheet" activate="yes"/>'; i := i + 1;
- end;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
- begin
- ModulesXmlFileLines[i] := '<module name="call_scilab" activate="yes"/>'; i := i + 1;
- end;
-
- ModulesXmlFileLines[i] := '<!-- comments -->'; i := i + 1;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_XCOS}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="xcos" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="scicos" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="scicos_blocks" activate="yes"/>'; i := i + 1;
- end;
-
- ModulesXmlFileLines[i] := '<!-- comments -->'; i := i + 1;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_PVM}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="pvm" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_FFTW}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="fftw" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_UMFPACK}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="umfpack" activate="yes"/>'; i := i + 1;
- end;
-
- ModulesXmlFileLines[i] := '<!-- comments -->'; i := i + 1;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
- begin
- ModulesXmlFileLines[i] := '<module name="genetic_algorithms" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="simulated_annealing" activate="yes"/>'; i := i + 1;
- ModulesXmlFileLines[i] := '<module name="parameters" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_MATIO}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="matio" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_ATOMS}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="atoms" activate="yes"/>'; i := i + 1;
- end;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_MODULES_MANAGER}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="modules_manager" activate="yes"/>'; i := i + 1;
- end;
-
- if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
- begin
- ModulesXmlFileLines[i] := '<module name="types" activate="yes"/>'; i := i + 1;
- end;
-
- ModulesXmlFileLines[i] := '<module name="hdf5" activate="yes"/>'; i := i + 1;
-
- if IsComponentSelected( ExpandConstant('{#COMPN_SCINOTES}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="scinotes" activate="yes"/>'; i := i + 1;
- end;
-
-#ifndef SCILAB_F2C
- if IsComponentSelected( ExpandConstant('{#COMPN_PARALLEL}') ) then
- begin
- ModulesXmlFileLines[i] := '<module name="parallel" activate="yes"/>'; i := i + 1;
- end;
-#endif
-
- ModulesXmlFileLines[i] := '</modules>'; i := i + 1;
-
- Result := SaveStringsToFile(ModuleFileName, ModulesXmlFileLines, False);
+// setArrayLength(ModulesXmlFileLines, 256);
+// for d := 0 to GetArrayLength(ModulesXmlFileLines)-1 do
+// begin
- // ModulesXmlFileLines[i] := '';
++// ModulesXmlFileLines[d] := '';
+// end;
- //
++
+// ModuleFileName := ExpandConstant('{app}') +'\etc\modules.xml';
- //
++
+// ModulesXmlFileLines[i] := '<?xml version="1.0" encoding="UTF-8" standalone="no"?>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<!DOCTYPE modules SYSTEM "../modules/core/xml/modules.dtd">'; i := i + 1;
+// ModulesXmlFileLines[i] := '<!-- =================== -->'; i := i + 1;
+// ModulesXmlFileLines[i] := '<!--'; i := i + 1;
+// ModulesXmlFileLines[i] := ' Modules list for Scilab'; i := i + 1;
+// ModulesXmlFileLines[i] := ' @author Allan CORNET'; i := i + 1;
+// ModulesXmlFileLines[i] := ' @date DIGITEO 2010'; i := i + 1;
+// ModulesXmlFileLines[i] := ' ==================='; i := i + 1;
+// ModulesXmlFileLines[i] := ' Do not touch if you do not know what you are doing'; i := i + 1;
+// ModulesXmlFileLines[i] := ' Warning "core" module must be always the first module'; i := i + 1;
+// ModulesXmlFileLines[i] := ' activate="yes" module will be launched ( or not "no")'; i := i + 1;
+// ModulesXmlFileLines[i] := ' -->'; i := i + 1;
+// ModulesXmlFileLines[i] := '<!-- =================== -->'; i := i + 1;
+// ModulesXmlFileLines[i] := '<modules>'; i := i + 1;
- //
++
+// if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="core" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="api_scilab" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="helptools" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="differential_equations" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="double" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="elementary_functions" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="functions" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="fileio" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if IsComponentSelected( ExpandConstant('{#COMPN_GRAPHICS}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="graphics" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="renderer" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="graphic_export" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="boolean" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="cacsd" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="data_structures" activate="yes"/>'; i := i + 1;
- // ModulesXmlFileLines[i] := '<module name="shell" activate="yes"/>'; i := i + 1;
- //
++// ModulesXmlFileLines[i] := '<module name="console" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="action_binding" activate="yes"/>'; i := i + 1;
- // ModulesXmlFileLines[i] := '<module name="console" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="completion" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="history_manager" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="gui" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="dynamic_link" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="integer" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="io" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="output_stream" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="jvm" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="commons" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="linear_algebra" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="localization" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="graph" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="ui_data" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="history_browser" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if IsComponentSelected( ExpandConstant('{#COMPN_INTERSCI}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="intersci" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if IsComponentSelected( ExpandConstant('{#COMPN_INTERP}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="interpolation" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if IsComponentSelected( ExpandConstant('{#COMPN_OPTIM}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="optimization" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="overloading" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if IsComponentSelected( ExpandConstant('{#COMPN_POLY}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="polynomials" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if IsComponentSelected( ExpandConstant('{#COMPN_SIGPROC}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="signal_processing" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if IsComponentSelected( ExpandConstant('{#COMPN_SPARSE}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="sparse" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="special_functions" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="string" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if IsComponentSelected( ExpandConstant('{#COMPN_SYMB}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="symbolic" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="time" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="windows_tools" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if IsComponentSelected( ExpandConstant('{#COMPN_STATS}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="statistics" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// ModulesXmlFileLines[i] := '<!-- comments -->'; i := i + 1;
- //
++
+// if IsComponentSelected( ExpandConstant('{#COMPN_ARNOLDI}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="arnoldi" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if IsComponentSelected( ExpandConstant('{#COMPN_COMPATFUNCTIONS}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="compatibility_functions" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if IsComponentSelected( ExpandConstant('{#COMPN_JAVASCI}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="javasci" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if IsComponentSelected( ExpandConstant('{#COMPN_MAP2SCI}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="maple2scilab" activate="yes"/>'; i := i + 1;
+// end;
+//
+// if IsComponentSelected( ExpandConstant('{#COMPN_M2SCI}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="m2sci" activate="yes"/>'; i := i + 1;
+// end;
+//
+// if IsComponentSelected( ExpandConstant('{#COMPN_MEXLIB}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="mexlib" activate="yes"/>'; i := i + 1;
+// end;
+//
+// if IsComponentSelected( ExpandConstant('{#COMPN_TCLSCI}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="tclsci" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if IsComponentSelected( ExpandConstant('{#COMPN_TEXMACS}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="texmacs" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if IsComponentSelected( ExpandConstant('{#COMPN_SOUND}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="sound" activate="yes"/>'; i := i + 1;
+// end;
+//
+// if IsComponentSelected( ExpandConstant('{#COMPN_RANDLIB}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="randlib" activate="yes"/>'; i := i + 1;
+// end;
- //
++
+// if IsComponentSelected( ExpandConstant('{#COMPN_DEVTOOLS}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="development_tools" activate="yes"/>'; i := i + 1;
+// end;
+//
+// if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="demo_tools" activate="yes"/>'; i := i + 1;
+// end;
+//
+// if IsComponentSelected( ExpandConstant('{#COMPN_SPREADSHEET}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="spreadsheet" activate="yes"/>'; i := i + 1;
+// end;
+//
+// if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="call_scilab" activate="yes"/>'; i := i + 1;
+// end;
+//
+// ModulesXmlFileLines[i] := '<!-- comments -->'; i := i + 1;
+//
+// if IsComponentSelected( ExpandConstant('{#COMPN_XCOS}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="xcos" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="scicos" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="scicos_blocks" activate="yes"/>'; i := i + 1;
+// end;
+//
+// ModulesXmlFileLines[i] := '<!-- comments -->'; i := i + 1;
+//
+// if IsComponentSelected( ExpandConstant('{#COMPN_PVM}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="pvm" activate="yes"/>'; i := i + 1;
+// end;
+//
+// if IsComponentSelected( ExpandConstant('{#COMPN_FFTW}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="fftw" activate="yes"/>'; i := i + 1;
+// end;
+//
+// if IsComponentSelected( ExpandConstant('{#COMPN_UMFPACK}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="umfpack" activate="yes"/>'; i := i + 1;
+// end;
+//
+// ModulesXmlFileLines[i] := '<!-- comments -->'; i := i + 1;
+//
+// if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="genetic_algorithms" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="simulated_annealing" activate="yes"/>'; i := i + 1;
+// ModulesXmlFileLines[i] := '<module name="parameters" activate="yes"/>'; i := i + 1;
+// end;
+//
+// if IsComponentSelected( ExpandConstant('{#COMPN_MATIO}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="matio" activate="yes"/>'; i := i + 1;
+// end;
+//
+// if IsComponentSelected( ExpandConstant('{#COMPN_ATOMS}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="atoms" activate="yes"/>'; i := i + 1;
+// end;
+//
+// if IsComponentSelected( ExpandConstant('{#COMPN_MODULES_MANAGER}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="modules_manager" activate="yes"/>'; i := i + 1;
+// end;
+//
+// if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="types" activate="yes"/>'; i := i + 1;
+// end;
+//
+// ModulesXmlFileLines[i] := '<module name="hdf5" activate="yes"/>'; i := i + 1;
+//
+// if IsComponentSelected( ExpandConstant('{#COMPN_SCINOTES}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="scinotes" activate="yes"/>'; i := i + 1;
+// end;
- //
++//
++//#ifndef SCILAB_F2C
+// if IsComponentSelected( ExpandConstant('{#COMPN_PARALLEL}') ) then
+// begin
+// ModulesXmlFileLines[i] := '<module name="parallel" activate="yes"/>'; i := i + 1;
+// end;
++//#endif
+//
+// ModulesXmlFileLines[i] := '</modules>'; i := i + 1;
- //
++
+// Result := SaveStringsToFile(ModuleFileName, ModulesXmlFileLines, False);
- //
- Result := True;
++ Result := True;
+
end;
//------------------------------------------------------------------------------
#define COMPN_ATOMS 'ATOMS'
#define COMPN_MODULES_MANAGER 'modules_manager'
#define COMPN_PARALLEL 'parallel'
+ #define COMPN_CHM 'chm_scilab'
;
-Name: {#COMPN_SCILAB}; Description: Scilab {#ScilabVersion}; Types: default full custom cli; Flags: fixed;
+Name: {#COMPN_SCILAB}; Description: Scilab {#ScilabVersion}; Types: full ; Flags: fixed;
;
-Name: {#COMPN_EQUDIF}; Description: {cm:DescriptionEquDif}; Types: default full custom cli; Flags: fixed;
-Name: {#COMPN_POLY}; Description: {cm:DescriptionPolynomials}; Types: default full custom cli; Flags: fixed;
-Name: {#COMPN_SYMB}; Description: {cm:DescriptionSymbolic}; Types: default full custom cli; Flags: fixed;
-Name: {#COMPN_SPARSE}; Description: {cm:DescriptionSparse}; Types: default full custom cli; Flags: fixed;
-Name: {#COMPN_LINALG}; Description: {cm:DescriptionLinAlg}; Types: default full custom cli; Flags: fixed;
-Name: {#COMPN_CACSD}; Description: {cm:DescriptionCacsd}; Types: default full custom cli; Flags: fixed;
-Name: {#COMPN_STATS}; Description: {cm:DescriptionStats}; Types: default full custom cli; Flags: fixed;
-Name: {#COMPN_GRAPHICS}; Description: {cm:DescriptionGraphics}; Types: default full custom; Flags: fixed;
+Name: {#COMPN_EQUDIF}; Description: {cm:DescriptionEquDif}; Types: full ; Flags: fixed;
+Name: {#COMPN_POLY}; Description: {cm:DescriptionPolynomials}; Types: full ; Flags: fixed;
+Name: {#COMPN_SYMB}; Description: {cm:DescriptionSymbolic}; Types: full ; Flags: fixed;
+Name: {#COMPN_SPARSE}; Description: {cm:DescriptionSparse}; Types: full ; Flags: fixed;
+Name: {#COMPN_LINALG}; Description: {cm:DescriptionLinAlg}; Types: full ; Flags: fixed;
+Name: {#COMPN_CACSD}; Description: {cm:DescriptionCacsd}; Types: full ; Flags: fixed;
+Name: {#COMPN_STATS}; Description: {cm:DescriptionStats}; Types: full; Flags: fixed;
+Name: {#COMPN_GRAPHICS}; Description: {cm:DescriptionGraphics}; Types: full; Flags: fixed;
;
-Name: {#COMPN_JVM_MODULE}; Description: {cm:DescriptionModuleJVM}; Types: default full custom; Flags: fixed;
+Name: {#COMPN_JVM_MODULE}; Description: {cm:DescriptionModuleJVM}; Types: full; Flags: fixed;
;
-Name: {#COMPN_SCINOTES}; Description:{cm:DescriptionSciNotes}; Types: default full custom; Flags: fixed;
+Name: {#COMPN_SCINOTES}; Description:{cm:DescriptionSciNotes}; Types: full; Flags: fixed;
;
-Name: {#COMPN_CPU_OPTIMIZATION}; Description:{cm:DescriptionCPUOptimization}; Types: default full custom cli;
+Name: {#COMPN_CPU_OPTIMIZATION}; Description:{cm:DescriptionCPUOptimization}; Types: full;
;
Name: {#COMPN_MKL_CPU_LIBRARY}; Description:{cm:DescriptionMKLLibrary}; Flags: exclusive
;
Name: {#COMPN_FFTW_MKL_LIBRARY};Description: {cm:DescriptionFftwMKLDownload}; Flags: exclusive
Name: {#COMPN_FFTW_REF_LIBRARY};Description: {cm:DescriptionRefFftwLibrary}; Flags: exclusive
;
-Name: {#COMPN_SIGPROC}; Description: {cm:DescriptionSigProc}; Types: default full custom;
-Name: {#COMPN_INTERP}; Description: {cm:DescriptionInterpolation}; Types: default full custom;
-Name: {#COMPN_OPTIM}; Description: {cm:DescriptionOptim}; Types: default full custom;
+Name: {#COMPN_SIGPROC}; Description: {cm:DescriptionSigProc}; Types: full;
+Name: {#COMPN_INTERP}; Description: {cm:DescriptionInterpolation}; Types: full;
+Name: {#COMPN_OPTIM}; Description: {cm:DescriptionOptim}; Types: full ;
;
-Name: {#COMPN_XCOS}; Description: {cm:DescriptionXcos}; Types: default full custom;
+Name: {#COMPN_XCOS}; Description: {cm:DescriptionXcos}; Types: full ;
;
-Name: {#COMPN_ARNOLDI}; Description: {cm:DescriptionArnoldi}; Types: default full custom;
-Name: {#COMPN_UMFPACK}; Description: {cm:DescriptionUmfpack}; Types: default full custom;
+Name: {#COMPN_ARNOLDI}; Description: {cm:DescriptionArnoldi}; Types:full;
+Name: {#COMPN_UMFPACK}; Description: {cm:DescriptionUmfpack}; Types:full;
;
-Name: {#COMPN_COMPATFUNCTIONS}; Description: {cm:DescriptionCompatFunctions}; Types: default full custom;
-Name: {#COMPN_M2SCI}; Description: {cm:DescriptionM2sci}; Types: default full custom;
-Name: {#COMPN_MATIO}; Description: {cm:DescriptionMatio}; Types: default full custom;
+Name: {#COMPN_COMPATFUNCTIONS}; Description: {cm:DescriptionCompatFunctions}; Types: full;
+Name: {#COMPN_M2SCI}; Description: {cm:DescriptionM2sci}; Types: full;
+Name: {#COMPN_MATIO}; Description: {cm:DescriptionMatio}; Types: full;
;
-Name: {#COMPN_TEXMACS}; Description: {cm:DescriptionTexmacs}; Types: default full custom;
-Name: {#COMPN_SOUND}; Description: {cm:DescriptionSound}; Types: default full custom;
-Name: {#COMPN_RANDLIB}; Description: {cm:DescriptionRandlib}; Types: default full custom;
+Name: {#COMPN_TEXMACS}; Description: {cm:DescriptionTexmacs}; Types: full ;
+Name: {#COMPN_SOUND}; Description: {cm:DescriptionSound}; Types: full ;
+Name: {#COMPN_RANDLIB}; Description: {cm:DescriptionRandlib}; Types: full ;
;
-Name: {#COMPN_JAVASCI}; Description: {cm:DescriptionJavasci}; Types: default full custom;
-Name: {#COMPN_MEXLIB}; Description: {cm:DescriptionMexlib}; Types: default full custom;
-Name: {#COMPN_INTERSCI}; Description: {cm:DescriptionIntersci}; Types: default full custom;
-Name: {#COMPN_MAP2SCI}; Description: {cm:DescriptionMaple2sci}; Types: default full custom;
+Name: {#COMPN_JAVASCI}; Description: {cm:DescriptionJavasci}; Types: full;
+Name: {#COMPN_MEXLIB}; Description: {cm:DescriptionMexlib}; Types: full;
+Name: {#COMPN_INTERSCI}; Description: {cm:DescriptionIntersci}; Types: full ;
+Name: {#COMPN_MAP2SCI}; Description: {cm:DescriptionMaple2sci}; Types: full ;
;
-Name: {#COMPN_TCLSCI}; Description: {cm:DescriptionTclTK}; Types: default full custom;
+Name: {#COMPN_TCLSCI}; Description: {cm:DescriptionTclTK}; Types: full;
;
-Name: {#COMPN_SPREADSHEET}; Description: {cm:DescriptionSpreadsheet}; Types: default full custom;
+Name: {#COMPN_SPREADSHEET}; Description: {cm:DescriptionSpreadsheet}; Types: full;
;
-;Name: {#COMPN_PVM}; Description: {cm:DescriptionPvm}; Types: default full custom;
+;Name: {#COMPN_PVM}; Description: {cm:DescriptionPvm}; Types: full ;
;
-Name: {#COMPN_ATOMS}; Description: {cm:DescriptionAtoms}; Types: default full custom;
-Name: {#COMPN_MODULES_MANAGER}; Description: {cm:DescriptionModulesManager}; Types: default full custom;
+Name: {#COMPN_ATOMS}; Description: {cm:DescriptionAtoms}; Types: full;
+Name: {#COMPN_MODULES_MANAGER}; Description: {cm:DescriptionModulesManager}; Types: full;
;
+ #ifndef SCILAB_F2C
-Name: {#COMPN_PARALLEL}; Description: {cm:DescriptionParallel}; Types: default full custom;
+Name: {#COMPN_PARALLEL}; Description: {cm:DescriptionParallel}; Types: full;
+ #endif
;
-Name: {#COMPN_PARAMETERS}; Description: {cm:DescriptionParametersTlbx}; Types: full custom;
-Name: {#COMPN_GENETICALGORITHMS}; Description: {cm:DescriptionGeneticTlbx}; Types: full custom;
-Name: {#COMPN_SIMANNEALING}; Description: {cm:DescriptionSimulAnnealingTlbx}; Types: full custom;
+Name: {#COMPN_PARAMETERS}; Description: {cm:DescriptionParametersTlbx}; Types: full;
+Name: {#COMPN_GENETICALGORITHMS}; Description: {cm:DescriptionGeneticTlbx}; Types: full;
+Name: {#COMPN_SIMANNEALING}; Description: {cm:DescriptionSimulAnnealingTlbx}; Types: full;
;
-Name: {#COMPN_DEVTOOLS}; Description: {cm:DescriptionDevTools}; Types: full custom;
+Name: {#COMPN_DEVTOOLS}; Description: {cm:DescriptionDevTools}; Types: full;
;
;
-Name: {#COMPN_TESTS}; Description: {cm:DescriptionTests}; Types: full custom; ExtraDiskSpaceRequired: {#TESTS_SIZE}
-Name: {#COMPN_TOOLBOX_SKELETON}; Description: {cm:DescriptionTlbxSkeleton}; Types: full custom;
+Name: {#COMPN_TESTS}; Description: {cm:DescriptionTests}; Types: full ; ExtraDiskSpaceRequired: {#TESTS_SIZE}
+Name: {#COMPN_TOOLBOX_SKELETON}; Description: {cm:DescriptionTlbxSkeleton}; Types: full;
;
#ifndef SCILAB_WITHOUT_JRE
- Name: {#COMPN_JRE}; Description: {cm:DescriptionJVM} (1.6.0_18); Types: full; Flags: fixed;
-Name: {#COMPN_JRE}; Description: {cm:DescriptionJVM} ({#javaUsed}); Types: default full custom; Flags: fixed;
++Name: {#COMPN_JRE}; Description: {cm:DescriptionJVM} ({#javaUsed}); Types: full; Flags: fixed;
#endif
;
+ Name: {#COMPN_CHM}; Description: {cm:DescriptionCHM}; Types: full; ExtraDiskSpaceRequired: {#CHM_SIZE}
+ ;
;-------------------------------------------------------------------------------
;
Name: {commondesktop}\{#ScilabName}; Filename: {code:getExecNameForDesktop};WorkingDir: "{app}";Comment: "Start Scilab - The open source platform for numerical computation"; MinVersion: 4,4; Tasks: desktopicon
;
Name: {group}\{#ScilabName}; Filename: {code:getExecNameForDesktop};WorkingDir: "{app}"
- Name: {group}\{cm:ConsoleIconName}; Filename: {app}\bin\YaSp.exe;WorkingDir: "{app}"
-Name: {group}\{cm:ConsoleIconName}; Filename: {app}\bin\scilex.exe;WorkingDir: "{app}"
+
- #ifdef WITH_CHM
- Name: {group}\{cm:DescriptionHelpScilabCHM}; Filename:"{app}\{cm:ScilabCHM}";
- #endif
++Name: {group}\{cm:ConsoleIconName}; Filename: {app}\bin\YaSp.exe;WorkingDir: "{app}"
+ ;
+ Name: {group}\{cm:DescriptionHelpScilabCHM}; Filename:"{app}\{cm:ScilabCHM}"; Components: {#COMPN_CHM};
+ ;
+
Name: "{group}\{cm:WebIconScilab}"; Filename: "{app}\scilabwebsite.url";
Name: {group}\{cm:UnInstallIcon}; Filename: {uninstallexe};
projects / scilab.git / commitdiff