Testcases that used the prebuilt runtime library generate their own runtime library DLL/so and use that instead now
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6022 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
afb0350669
commit
aa07e2c4d5
12 changed files with 31 additions and 16 deletions
|
|
@ -40,7 +40,7 @@ SWIGOPT += -noprefix
|
||||||
# a file is found which has _runme.scm appended after the testcase name.
|
# a file is found which has _runme.scm 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=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH $(CHICKEN_CSI) $*$(SO) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
|
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(CHICKEN_CSI) $*$(SO) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
# Clean
|
# Clean
|
||||||
|
|
|
||||||
|
|
@ -35,8 +35,10 @@ TARGETPREFIX =
|
||||||
TARGETSUFFIX =
|
TARGETSUFFIX =
|
||||||
SWIGOPT = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
|
SWIGOPT = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
|
||||||
INCLUDES = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
|
INCLUDES = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
|
||||||
RUNTIMEDIR = $(top_builddir)/Runtime/.libs
|
#RUNTIMEDIR = $(top_builddir)/Runtime/.libs
|
||||||
DYNAMIC_LIB_PATH = $(RUNTIMEDIR):.
|
#DYNAMIC_LIB_PATH = .
|
||||||
|
LIBS = -L. -l$*_runtime
|
||||||
|
LIBPREFIX = lib
|
||||||
|
|
||||||
#
|
#
|
||||||
# Please keep test cases in alphabetical order.
|
# Please keep test cases in alphabetical order.
|
||||||
|
|
@ -355,14 +357,21 @@ swig_and_compile_c = \
|
||||||
$(LANGUAGE)$(VARIANT)
|
$(LANGUAGE)$(VARIANT)
|
||||||
|
|
||||||
swig_and_compile_multi_cpp = \
|
swig_and_compile_multi_cpp = \
|
||||||
|
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \
|
||||||
|
SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBPREFIX='$(LIBPREFIX)' \
|
||||||
|
INCLUDES="$(INCLUDES)" SWIGOPT="-runtime $(SWIGOPT)" NOLINK=true \
|
||||||
|
TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)_runtime" INTERFACE="$*_runtime.i" \
|
||||||
|
$(LANGUAGE)$(VARIANT)_cpp && \
|
||||||
for f in `cat $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list` ; do \
|
for f in `cat $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list` ; do \
|
||||||
$(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)" LIBS='$(LIBS)' \
|
||||||
INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" RUNTIMEDIR="$(RUNTIMEDIR)" \
|
INCLUDES="$(INCLUDES)" SWIGOPT="-noruntime $(SWIGOPT)" NOLINK=true \
|
||||||
TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACE="$$f.i" \
|
TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACE="$$f.i" \
|
||||||
NOLINK=true $(LANGUAGE)$(VARIANT)_multi_cpp; \
|
$(LANGUAGE)$(VARIANT)_cpp; \
|
||||||
done
|
done
|
||||||
|
|
||||||
|
swig_and_compile_runtime = \
|
||||||
|
|
||||||
setup = \
|
setup = \
|
||||||
if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
|
if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
|
||||||
echo "Checking testcase $* (with run test) under $(LANGUAGE)" ; \
|
echo "Checking testcase $* (with run test) under $(LANGUAGE)" ; \
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ include $(srcdir)/../common.mk
|
||||||
# a file is found which has _runme.scm appended after the testcase name.
|
# a file is found which has _runme.scm 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=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH $(GUILE) -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
|
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(GUILE) -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
# Clean
|
# Clean
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ SCRIPTPREFIX = ../guile/
|
||||||
# a file is found which has _runme.scm appended after the testcase name.
|
# a file is found which has _runme.scm 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=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH $(GUILE) -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
|
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(GUILE) -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
setup = \
|
setup = \
|
||||||
|
|
|
||||||
3
SWIG/Examples/test-suite/imports_runtime.i
Normal file
3
SWIG/Examples/test-suite/imports_runtime.i
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
// Empty module for building the runtime library
|
||||||
|
%module imports_runtime
|
||||||
|
|
||||||
|
|
@ -34,7 +34,7 @@ include $(srcdir)/../common.mk
|
||||||
# a file is found which has _runme.scm appended after the testcase name.
|
# a file is found which has _runme.scm 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=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH mzscheme -r $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
|
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH mzscheme -r $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
# Clean
|
# Clean
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ top_builddir = @top_builddir@
|
||||||
include $(srcdir)/../common.mk
|
include $(srcdir)/../common.mk
|
||||||
|
|
||||||
# Overridden variables here
|
# Overridden variables here
|
||||||
SWIGOPT = -shadow -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
|
# none!
|
||||||
|
|
||||||
# Rules for the different types of tests
|
# Rules for the different types of tests
|
||||||
%.cpptest:
|
%.cpptest:
|
||||||
|
|
@ -34,7 +34,7 @@ SWIGOPT = -shadow -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
|
||||||
# a file is found which has _runme.pl appended after the testcase name.
|
# a file is found which has _runme.pl 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=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH @PERL@ $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
|
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH @PERL@ $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
# Clean: remove the generated .pm file
|
# Clean: remove the generated .pm file
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ include $(srcdir)/../common.mk
|
||||||
# a file is found which has _runme.pike appended after the testcase name.
|
# a file is found which has _runme.pike 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=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH pike $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
|
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH pike $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
# Clean: remove the generated .pike file
|
# Clean: remove the generated .pike file
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ CPP_TEST_CASES += \
|
||||||
include $(srcdir)/../common.mk
|
include $(srcdir)/../common.mk
|
||||||
|
|
||||||
# Overridden variables here
|
# Overridden variables here
|
||||||
# none!
|
LIBS = -L. -l_$*_runtime
|
||||||
|
|
||||||
# Rules for the different types of tests
|
# Rules for the different types of tests
|
||||||
%.cpptest:
|
%.cpptest:
|
||||||
|
|
@ -54,7 +54,7 @@ include $(srcdir)/../common.mk
|
||||||
# a file is found which has _runme.py appended after the testcase name.
|
# a file is found which has _runme.py 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=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH python $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
|
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH python $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
# Clean: remove the generated .py file
|
# Clean: remove the generated .py file
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ include $(srcdir)/../common.mk
|
||||||
# a file is found which has _runme.rb appended after the testcase name.
|
# a file is found which has _runme.rb 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=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH ruby $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
|
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH ruby $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
# Clean
|
# Clean
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ include $(srcdir)/../common.mk
|
||||||
# a file is found which has _runme.tcl appended after the testcase name.
|
# a file is found which has _runme.tcl 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=$(DYNAMIC_LIB_PATH):$$LD_LIBRARY_PATH tclsh $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
|
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH tclsh $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX);) \
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
# Clean
|
# Clean
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
// Empty module for building the runtime library
|
||||||
|
%module template_typedef_import_runtime
|
||||||
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue