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

fix typemap_subst.i testcase

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2009-sploving@11526 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Baozeng Ding 2009-08-10 14:01:05 +00:00
commit d433e27f15
6 changed files with 19 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Examples/Makefile.in
View file

@ -1152,13 +1152,13 @@ SCILAB = @SCILAB@
scilab: $(SRCS) scilab: $(SRCS)
$(SWIG) -scilab $(SWIGOPT) $(INTERFACEPATH) $(SWIG) -scilab $(SWIGOPT) $(INTERFACEPATH)
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH $(SCILAB) -nwni -nb -f builder.sce
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Running a Scilab example # Running a Scilab example
# ----------------------------------------------------------------- # -----------------------------------------------------------------
scilab_run: scilab_run:
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH $(SCILAB) -nwni < runme.sci env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH $(SCILAB) -nwni -nb -f runme.sci
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Cleaning the scilab examples # Cleaning the scilab examples

40
Examples/test-suite/scilab/Makefile
View file

@ -1,40 +0,0 @@
#######################################################################
# Makefile for scilab test-suite
#######################################################################
LANGUAGE = scilab
SCILAB = scilab
SCRIPTSUFFIX = _runme.sci
srcdir = .
top_srcdir = ../../..
top_builddir = ../../..
include $(srcdir)/../common.mk
# Overridden variables here
# none!
# Rules for the different types of tests
%.cpptest:
%.ctest:
$(setup)
+$(swig_and_compile_c)
$(run_testcase)
%.multicpptest:
# Runs the testcase. A testcase is only run if
# a file is found which has _runme.sci appended after the testcase name.
run_testcase = \
if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(SCILAB) -nwni -nb -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ; ) \
fi; \
# Clean: remove the generated .sci file
%.clean:
@rm -f $*.sci *_wrap.c
clean:
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile scilab_clean

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

@ -9,9 +9,6 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
C_TEST_CASES += \
integers \
include $(srcdir)/../common.mk include $(srcdir)/../common.mk
@ -19,27 +16,28 @@ include $(srcdir)/../common.mk
# none! # none!
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest:
%.ctest: %.ctest:
$(setup) $(setup)
cp ../$*.i $*.i
if [ -f ../$*.h ]; then (cp ../$*.h $*.h; ) fi;
+$(swig_and_compile_c) +$(swig_and_compile_c)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest:
$(setup)
+$(swig_and_compile_multi_cpp)
$(run_testcase)
# Runs the testcase. A testcase is only run if # Runs the testcase. A testcase is only run if
# a file is found which has _runme.sci appended after the testcase name. # a file is found which has _runme.sci appended after the testcase name.
run_testcase = \ run_testcase = \
if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(SCILAB) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ; ) \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(SCILAB) -nwni -nb -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ; ) \
fi; \ fi; \
# Clean: remove the generated .sci file # Clean: remove the generated .sci file
%.clean: %.clean:
@rm -f $*.sci *_wrap.c @rm -f $*.sci *_wrap.c *.i *.h
clean: clean:
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile scilab_clean $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile scilab_clean

2
Lib/scilab/sciruntime.swg
View file

@ -1,3 +1,5 @@
%insert(runtime) "swigrun.swg";
%insert(runtime) "swigerrors.swg";
%insert(runtime) %{ %insert(runtime) %{
void SWIG_Error(int code, const char *msg) { void SWIG_Error(int code, const char *msg) {

1
Source/Modules/scilab.cxx
View file

@ -119,6 +119,7 @@ public:
Delete(f_builder_code); Delete(f_builder_code);
/* Dump out all the files */ /* Dump out all the files */
SwigType_emit_type_table(f_runtime, f_wrappers);
Dump(f_runtime, f_begin); Dump(f_runtime, f_begin);
Dump(f_header, f_begin); Dump(f_header, f_begin);
Dump(f_wrappers, f_begin); Dump(f_wrappers, f_begin);

7
configure.in
View file

@ -2168,6 +2168,12 @@ SKIP_UFFI=
#fi #fi
AC_SUBST(SKIP_UFFI) AC_SUBST(SKIP_UFFI)
SKIP_SCILAB=
if test -z "$SCILAB"; then
SKIP_SCILAB="1"
fi
AC_SUBST(SKIP_SCILAB)
#---------------------------------------------------------------- #----------------------------------------------------------------
# Additional language dependencies # Additional language dependencies
#---------------------------------------------------------------- #----------------------------------------------------------------
@ -2248,6 +2254,7 @@ AC_CONFIG_FILES([ \
Examples/test-suite/cffi/Makefile \ Examples/test-suite/cffi/Makefile \
Examples/test-suite/uffi/Makefile \ Examples/test-suite/uffi/Makefile \
Examples/test-suite/r/Makefile \ Examples/test-suite/r/Makefile \
Examples/test-suite/scilab/Makefile \
Lib/ocaml/swigp4.ml Lib/ocaml/swigp4.ml
]) ])
AC_CONFIG_FILES([preinst-swig], [chmod +x preinst-swig]) AC_CONFIG_FILES([preinst-swig], [chmod +x preinst-swig])