jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #86 from smarchetto/gsoc2012-scilab

Browse source 
Scilab: fix test-suite (errors, status, verbosity)
This commit is contained in:
Simon Marchetto 2013-09-06 06:15:14 -07:00
commit 25cb1f2094
4 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Examples/test-suite/ignore_template_constructor.i
View file

@ -36,6 +36,8 @@ public:
#endif #endif
#if !defined(SWIGSCILAB)
%template(VectFlow) std::vector<Flow>; %template(VectFlow) std::vector<Flow>;
%inline %{ %inline %{
@ -43,3 +45,5 @@ std::vector<Flow> inandout(std::vector<Flow> v) {
return v; return v;
} }
%} %}
#endif

12
Examples/test-suite/scilab/Makefile.in
View file

@ -6,9 +6,9 @@ LANGUAGE = scilab
SCILAB = @SCILAB@ SCILAB = @SCILAB@
SCILAB_STARTOPT = @SCILABSTARTOPT@ SCILAB_STARTOPT = @SCILABSTARTOPT@
SCRIPTSUFFIX = _runme.sci SCRIPTSUFFIX = _runme.sci
srcdir = @srcdir@ srcdir = $(abspath @srcdir@)
top_srcdir = @top_srcdir@ top_srcdir = $(abspath @top_srcdir@)
top_builddir = @top_builddir@ top_builddir = $(abspath @top_builddir@)
# Overridden variables here # Overridden variables here
@ -32,14 +32,14 @@ swig_and_compile_cpp = \
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \
SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \
INCLUDES="$(INCLUDES)" SWIGOPT= OUTDIR="$(OUTDIR)" \ INCLUDES="$(INCLUDES)" SWIGOPT= OUTDIR="$(OUTDIR)" \
TARGET="$*_wrap.cxx" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \ TARGET="$(OUTDIR)/$*_wrap.cxx" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \
scilab_cpp scilab_cpp
swig_and_compile_c = \ swig_and_compile_c = \
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CSRCS="$(CSRCS)" \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CSRCS="$(CSRCS)" \
SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \
INCLUDES="$(INCLUDES)" SWIGOPT= OUTDIR="$(OUTDIR)" \ INCLUDES="$(INCLUDES)" SWIGOPT= OUTDIR="$(OUTDIR)" \
TARGET="$*_wrap.c" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \ TARGET="$(OUTDIR)/$*_wrap.c" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \
scilab scilab
swig_and_compile_multi_cpp = \ swig_and_compile_multi_cpp = \
@ -47,7 +47,7 @@ swig_and_compile_multi_cpp = \
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \
SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \
INCLUDES="$(INCLUDES)" SWIGOPT= OUTDIR="$(OUTDIR)" \ INCLUDES="$(INCLUDES)" SWIGOPT= OUTDIR="$(OUTDIR)" \
TARGET="$*_wrap.cxx" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \ TARGET="$(OUTDIR)/$*_wrap.cxx" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \
scilab_cpp; \ scilab_cpp; \
done done

1
Examples/test-suite/scilab/swigtest.start
View file

@ -1,4 +1,5 @@
lines(0); lines(0);
ilib_verbose(0);
// Get test name (used in swigtest.quit file) // Get test name (used in swigtest.quit file)
[units, typ, names] = file(1); [units, typ, names] = file(1);

7
Source/Modules/scilab.cxx
View file

@ -207,12 +207,17 @@ public:
/* Write all to the builder.sce file */ /* Write all to the builder.sce file */
Printf(builderCode, "];\n"); Printf(builderCode, "];\n");
Printf(builderCode, "ret = 1;\n");
Printf(builderCode, "if ~isempty(table) then\n"); Printf(builderCode, "if ~isempty(table) then\n");
Printf(builderCode, " ilib_build(ilib_name, table, files, libs, [], ldflags, cflags);\n"); Printf(builderCode, " ilib_build(ilib_name, table, files, libs, [], ldflags, cflags);\n");
Printf(builderCode, " libfilename = 'lib' + ilib_name + getdynlibext();\n");
Printf(builderCode, " if isfile(libfilename) & isfile('loader.sce') then\n");
Printf(builderCode, " ret = 0;\n");
Printf(builderCode, " end\n");
Printf(builderCode, "end\n"); Printf(builderCode, "end\n");
Printf(builderCode, "cd(originaldir);\n"); Printf(builderCode, "cd(originaldir);\n");
Printf(builderCode, "exit"); Printf(builderCode, "exit(ret)");
String *builderFilename = NewStringf("%sbuilder.sce", SWIG_output_directory()); String *builderFilename = NewStringf("%sbuilder.sce", SWIG_output_directory());
builderFile = NewFile(builderFilename, "w", SWIG_output_files()); builderFile = NewFile(builderFilename, "w", SWIG_output_files());
if (!builderFile) { if (!builderFile) {