modify test-suite (barring python atm) to not rely on the -I path to find the input .i file - removes the new warning 125 and sets up the test-suite for testing with ccache. This change required the use of -outcurrentdir and moving the .i files from the language subdirectories to the directory above along with some .i file name changes.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10949 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2008-11-26 21:35:15 +00:00
commit db83e51441
61 changed files with 390 additions and 709 deletions

View file

@ -1,8 +1,9 @@
TOP = ../../.. TOP = ../../..
SWIG = $(TOP)/../swig SWIG = $(TOP)/../swig
SWIGOPT = -I../../Interface SWIGOPT = -outcurrentdir
SRCS = SRCS =
TARGET = gifplot TARGET = gifplot
INTERFACEDIR = ../../Interface/
INTERFACE = gifplot.i INTERFACE = gifplot.i
LIBS = -L../.. -lgifplot LIBS = -L../.. -lgifplot
INCLUDES = -I../../Include INCLUDES = -I../../Include
@ -10,7 +11,7 @@ INCLUDES = -I../../Include
all:: all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' java
javac *.java javac *.java
clean:: clean::

View file

@ -1,8 +1,9 @@
TOP = ../../.. TOP = ../../..
SWIG = $(TOP)/../swig SWIG = $(TOP)/../swig
SWIGOPT = -I../../Interface SWIGOPT = -outcurrentdir
SRCS = SRCS =
TARGET = gifplot TARGET = gifplot
INTERFACEDIR = ../../Interface/
INTERFACE = gifplot.i INTERFACE = gifplot.i
LIBS = -L../.. -lgifplot -lm LIBS = -L../.. -lgifplot -lm
INCLUDES = -I../../Include INCLUDES = -I../../Include
@ -10,12 +11,12 @@ INCLUDES = -I../../Include
all:: all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' perl5 TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' perl5
static:: static::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \
TARGET='myperl' INTERFACE='$(INTERFACE)' perl5_static TARGET='myperl' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' perl5_static
clean:: clean::
$(MAKE) -f $(TOP)/Makefile perl5_clean $(MAKE) -f $(TOP)/Makefile perl5_clean

View file

@ -1,8 +1,9 @@
TOP = ../../.. TOP = ../../..
SWIG = $(TOP)/../preinst-swig SWIG = $(TOP)/../preinst-swig
SWIGOPT = -I../../Interface SWIGOPT = -outcurrentdir
SRCS = SRCS =
TARGET = gifplot TARGET = gifplot
INTERFACEDIR = ../../Interface/
INTERFACE = gifplot.i INTERFACE = gifplot.i
LIBS = -L../.. -lgifplot LIBS = -L../.. -lgifplot
INCLUDES = -I../../Include INCLUDES = -I../../Include
@ -10,12 +11,12 @@ INCLUDES = -I../../Include
all:: all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' python
static:: static::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \
TARGET='mypython' INTERFACE='$(INTERFACE)' python_static TARGET='mypython' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' python_static
clean:: clean::
$(MAKE) -f $(TOP)/Makefile python_clean $(MAKE) -f $(TOP)/Makefile python_clean

View file

@ -1,8 +1,9 @@
TOP = ../../.. TOP = ../../..
SWIG = $(TOP)/../swig SWIG = $(TOP)/../swig
SWIGOPT = -I../../Interface SWIGOPT = -outcurrentdir
SRCS = SRCS =
TARGET = gifplot TARGET = gifplot
INTERFACEDIR = ../../Interface/
INTERFACE = gifplot.i INTERFACE = gifplot.i
LIBS = -L../.. -lgifplot LIBS = -L../.. -lgifplot
INCLUDES = -I../../Include INCLUDES = -I../../Include
@ -10,12 +11,12 @@ INCLUDES = -I../../Include
all:: all::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' ruby
static:: static::
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \
TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static TARGET='myruby' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' ruby_static
clean:: clean::
$(MAKE) -f $(TOP)/Makefile ruby_clean $(MAKE) -f $(TOP)/Makefile ruby_clean

View file

@ -12,11 +12,11 @@
# certain packages have been installed. Set the prefixes # certain packages have been installed. Set the prefixes
# accordingly. # accordingly.
# #
# 2. To use this makefile, simply set SRCS, INTERFACE, INCLUDES, LIBS, # 2. To use this makefile, set required varibles, eg SRCS, INTERFACE,
# TARGET, and do a # INTERFACEDIR, INCLUDES, LIBS, TARGET, and do a
# $(MAKE) -f Makefile.template.in SRCS='$(SRCS)' \ # $(MAKE) -f Makefile.template.in SRCS='$(SRCS)' \
# INCLUDES='$(INCLUDES) LIBS='$(LIBS)' INTERFACE='$(INTERFACE)' \ # INCLUDES='$(INCLUDES) LIBS='$(LIBS)' INTERFACE='$(INTERFACE)' \
# TARGET='$(TARGET)' method # INTERFACEDIR='$(INTERFACEDIR)' TARGET='$(TARGET)' method
# #
# 'method' describes what is being built. # 'method' describes what is being built.
#--------------------------------------------------------------- #---------------------------------------------------------------
@ -31,6 +31,8 @@ SRCS =
INCLUDES = INCLUDES =
LIBS = LIBS =
INTERFACE = INTERFACE =
INTERFACEDIR =
INTERFACEPATH = $(INTERFACEDIR)$(INTERFACE)
SWIGOPT = SWIGOPT =
SWIG = swig SWIG = swig
@ -105,12 +107,12 @@ TCLCXXSHARED = @TCLCXXSHARED@
tclsh: $(SRCS) tclsh: $(SRCS)
$(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) -ltclsh.i $(INTERFACE) $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) -ltclsh.i $(INTERFACEPATH)
$(CC) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(TCL_INCLUDE) \ $(CC) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(TCL_INCLUDE) \
$(TCL_LIB) $(TCL_OPTS) $(LIBS) $(SYSLIBS) -o $(TARGET) $(TCL_LIB) $(TCL_OPTS) $(LIBS) $(SYSLIBS) -o $(TARGET)
tclsh_cpp: $(SRCS) tclsh_cpp: $(SRCS)
$(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) -ltclsh.i $(INTERFACE) $(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) -ltclsh.i $(INTERFACEPATH)
$(CXX) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE) \ $(CXX) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE) \
$(TCL_LIB) $(TCL_OPTS) $(LIBS) $(SYSLIBS) -o $(TARGET) $(TCL_LIB) $(TCL_OPTS) $(LIBS) $(SYSLIBS) -o $(TARGET)
@ -119,13 +121,13 @@ tclsh_cpp: $(SRCS)
# ----------------------------------------------------------- # -----------------------------------------------------------
wish: $(SRCS) wish: $(SRCS)
$(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) -lwish.i $(INTERFACE) $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) -lwish.i $(INTERFACEPATH)
$(CC) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(TCL_INCLUDE) \ $(CC) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(TCL_INCLUDE) \
$(XINCLUDE) $(TCL_LIB) $(TK_OPTS) $(XLIB) $(LIBS) $(SYSLIBS) -o $(TARGET) $(XINCLUDE) $(TCL_LIB) $(TK_OPTS) $(XLIB) $(LIBS) $(SYSLIBS) -o $(TARGET)
wish_cpp: $(SRCS) wish_cpp: $(SRCS)
$(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) -lwish.i $(INTERFACE) $(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) -lwish.i $(INTERFACEPATH)
$(CXX) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE) \ $(CXX) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE) \
$(XINCLUDE) $(TCL_LIB) $(TK_OPTS) $(XLIB) $(LIBS) $(SYSLIBS) -o $(TARGET) $(XINCLUDE) $(TCL_LIB) $(TK_OPTS) $(XLIB) $(LIBS) $(SYSLIBS) -o $(TARGET)
@ -134,7 +136,7 @@ wish_cpp: $(SRCS)
# ----------------------------------------------------------- # -----------------------------------------------------------
tcl: $(SRCS) tcl: $(SRCS)
$(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE) $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACEPATH)
$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(TCL_INCLUDE) $(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(TCL_INCLUDE)
$(TCLLDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) $(TCLLDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO)
@ -143,7 +145,7 @@ tcl: $(SRCS)
# ----------------------------------------------------------- # -----------------------------------------------------------
tcl_cpp: $(SRCS) tcl_cpp: $(SRCS)
$(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE) $(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACEPATH)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE)
$(TCLCXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) $(TCLCXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO)
@ -175,7 +177,7 @@ PERL5_CCFLAGS = @PERL5CCFLAGS@
# ---------------------------------------------------------------- # ----------------------------------------------------------------
perl5: $(SRCS) perl5: $(SRCS)
$(SWIG) -perl5 $(SWIGOPT) $(INTERFACE) $(SWIG) -perl5 $(SWIGOPT) $(INTERFACEPATH)
$(CC) -c -Dbool=char $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PERL5_CCFLAGS) -I$(PERL5_INCLUDE) $(CC) -c -Dbool=char $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PERL5_CCFLAGS) -I$(PERL5_INCLUDE)
$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PERL5_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PERL5_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
@ -184,7 +186,7 @@ perl5: $(SRCS)
# ---------------------------------------------------------------- # ----------------------------------------------------------------
perl5_cpp: $(SRCS) perl5_cpp: $(SRCS)
$(SWIG) -perl5 -c++ $(SWIGOPT) $(INTERFACE) $(SWIG) -perl5 -c++ $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PERL5_CCFLAGS) -I$(PERL5_INCLUDE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PERL5_CCFLAGS) -I$(PERL5_INCLUDE)
$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PERL5_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PERL5_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
@ -202,11 +204,11 @@ perl5_xs: $(SRCS)
PERL5_LIB = -L$(PERL5_INCLUDE) -l@PERL5LIB@ @LIBS@ $(SYSLIBS) PERL5_LIB = -L$(PERL5_INCLUDE) -l@PERL5LIB@ @LIBS@ $(SYSLIBS)
perl5_static: $(SRCS) perl5_static: $(SRCS)
$(SWIG) -perl5 -static -lperlmain.i $(SWIGOPT) $(INTERFACE) $(SWIG) -perl5 -static -lperlmain.i $(SWIGOPT) $(INTERFACEPATH)
$(CC) $(CFLAGS) -Dbool=char $(SRCS) $(ISRCS) $(INCLUDES) -I$(PERL5_INCLUDE) $(PERL5_LIB) $(LIBS) -o $(TARGET) $(CC) $(CFLAGS) -Dbool=char $(SRCS) $(ISRCS) $(INCLUDES) -I$(PERL5_INCLUDE) $(PERL5_LIB) $(LIBS) -o $(TARGET)
perl5_static_cpp: $(SRCS) perl5_static_cpp: $(SRCS)
$(SWIG) -perl5 -c++ -static -lperlmain.i $(SWIGOPT) $(INTERFACE) $(SWIG) -perl5 -c++ -static -lperlmain.i $(SWIGOPT) $(INTERFACEPATH)
$(CXX) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) -I$(PERL5_INCLUDE) $(PERL5_LIB) $(LIBS) -o $(TARGET) $(CXX) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) -I$(PERL5_INCLUDE) $(PERL5_LIB) $(LIBS) -o $(TARGET)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
@ -255,7 +257,7 @@ endif
# ---------------------------------------------------------------- # ----------------------------------------------------------------
python: $(SRCS) python: $(SRCS)
$(SWIGPYTHON) $(SWIGOPT) $(INTERFACE) $(SWIGPYTHON) $(SWIGOPT) $(INTERFACEPATH)
$(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(PYTHON_INCLUDE) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(PYTHON_INCLUDE)
$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PYTHON_DLNK) $(LIBS) -o $(LIBPREFIX)_$(TARGET)$(PYTHON_SO) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PYTHON_DLNK) $(LIBS) -o $(LIBPREFIX)_$(TARGET)$(PYTHON_SO)
@ -264,7 +266,7 @@ python: $(SRCS)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
python_cpp: $(SRCS) python_cpp: $(SRCS)
$(SWIGPYTHON) -c++ $(SWIGOPT) $(INTERFACE) $(SWIGPYTHON) -c++ $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(PYTHON_INCLUDE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(PYTHON_INCLUDE)
$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PYTHON_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)_$(TARGET)$(PYTHON_SO) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PYTHON_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)_$(TARGET)$(PYTHON_SO)
@ -280,12 +282,12 @@ TKINTER =
PYTHON_LIBOPTS = $(PYTHON_LINK) @LIBS@ $(TKINTER) $(SYSLIBS) PYTHON_LIBOPTS = $(PYTHON_LINK) @LIBS@ $(TKINTER) $(SYSLIBS)
python_static: $(SRCS) python_static: $(SRCS)
$(SWIGPYTHON) -lembed.i $(SWIGOPT) $(INTERFACE) $(SWIGPYTHON) -lembed.i $(SWIGOPT) $(INTERFACEPATH)
$(CC) $(CFLAGS) @LINKFORSHARED@ $(ISRCS) $(SRCS) $(INCLUDES) \ $(CC) $(CFLAGS) @LINKFORSHARED@ $(ISRCS) $(SRCS) $(INCLUDES) \
$(PYTHON_INCLUDE) $(LIBS) -L$(PYTHON_LIB) $(PYTHON_LIBOPTS) -o $(TARGET) $(PYTHON_INCLUDE) $(LIBS) -L$(PYTHON_LIB) $(PYTHON_LIBOPTS) -o $(TARGET)
python_static_cpp: $(SRCS) python_static_cpp: $(SRCS)
$(SWIGPYTHON) -c++ -lembed.i $(SWIGOPT) $(INTERFACE) $(SWIGPYTHON) -c++ -lembed.i $(SWIGOPT) $(INTERFACEPATH)
$(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \
$(PYTHON_INCLUDE) $(LIBS) -L$(PYTHON_LIB) $(PYTHON_LIBOPTS) -o $(TARGET) $(PYTHON_INCLUDE) $(LIBS) -L$(PYTHON_LIB) $(PYTHON_LIBOPTS) -o $(TARGET)
@ -336,7 +338,7 @@ OCTAVE_SO = @OCTAVE_SO@
# ---------------------------------------------------------------- # ----------------------------------------------------------------
octave: $(SRCS) octave: $(SRCS)
$(SWIG) -octave $(SWIGOPT) $(INTERFACE) $(SWIG) -octave $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -g -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(CXXSRCS) $(INCLUDES) -I$(OCTAVE_INCLUDE) $(CXX) -g -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(CXXSRCS) $(INCLUDES) -I$(OCTAVE_INCLUDE)
$(CC) -g -c $(CCSHARED) $(CFLAGS) $(SRCS) $(INCLUDES) $(OCTAVE_INCLUDE) $(CC) -g -c $(CCSHARED) $(CFLAGS) $(SRCS) $(INCLUDES) $(OCTAVE_INCLUDE)
$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(OCTAVE_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(OCTAVE_SO) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(OCTAVE_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(OCTAVE_SO)
@ -346,7 +348,7 @@ octave: $(SRCS)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
octave_cpp: $(SRCS) octave_cpp: $(SRCS)
$(SWIG) -c++ -octave $(SWIGOPT) $(INTERFACE) $(SWIG) -c++ -octave $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -g -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) -I$(OCTAVE_INCLUDE) $(CXX) -g -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) -I$(OCTAVE_INCLUDE)
$(CXXSHARED) -g $(CFLAGS) $(OBJS) $(IOBJS) $(OCTAVE_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(OCTAVE_SO) $(CXXSHARED) -g $(CFLAGS) $(OBJS) $(IOBJS) $(OCTAVE_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(OCTAVE_SO)
@ -373,12 +375,12 @@ GUILE_LIBPREFIX = lib
# Build a dynamically loaded module with passive linkage and the scm interface # Build a dynamically loaded module with passive linkage and the scm interface
#------------------------------------------------------------------ #------------------------------------------------------------------
guile: $(SRCS) guile: $(SRCS)
$(SWIG) -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACE) $(SWIG) -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACEPATH)
$(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS) $(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS)
$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
guile_cpp: $(SRCS) guile_cpp: $(SRCS)
$(SWIG) -c++ -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACE) $(SWIG) -c++ -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS)
$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
@ -389,12 +391,12 @@ guile_externalhdr:
# Build a dynamically loaded module with passive linkage and the gh interface # Build a dynamically loaded module with passive linkage and the gh interface
#------------------------------------------------------------------ #------------------------------------------------------------------
guile_gh: $(SRCS) guile_gh: $(SRCS)
$(SWIG) -guile -gh -Linkage passive $(SWIGOPT) $(INTERFACE) $(SWIG) -guile -gh -Linkage passive $(SWIGOPT) $(INTERFACEPATH)
$(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS) $(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS)
$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
guile_gh_cpp: $(SRCS) guile_gh_cpp: $(SRCS)
$(SWIG) -c++ -guile -gh -Linkage passive $(SWIGOPT) $(INTERFACE) $(SWIG) -c++ -guile -gh -Linkage passive $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS)
$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
@ -403,12 +405,12 @@ guile_gh_cpp: $(SRCS)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
guile_passive: $(SRCS) guile_passive: $(SRCS)
$(SWIG) -guile -Linkage passive $(SWIGOPT) $(INTERFACE) $(SWIG) -guile -Linkage passive $(SWIGOPT) $(INTERFACEPATH)
$(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS) $(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS)
$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
guile_passive_cpp: $(SRCS) guile_passive_cpp: $(SRCS)
$(SWIG) -c++ -guile -Linkage passive $(SWIGOPT) $(INTERFACE) $(SWIG) -c++ -guile -Linkage passive $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS)
$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
@ -419,24 +421,24 @@ guile_passive_cpp: $(SRCS)
GUILE_LIBOPTS = @GUILELINK@ @LIBS@ $(SYSLIBS) GUILE_LIBOPTS = @GUILELINK@ @LIBS@ $(SYSLIBS)
guile_static: $(SRCS) guile_static: $(SRCS)
$(SWIG) -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACE) $(SWIG) -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACEPATH)
$(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) \ $(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) \
-DSWIGINIT="SCM scm_init_$(TARGET)_module(void); scm_init_$(TARGET)_module();" \ -DSWIGINIT="SCM scm_init_$(TARGET)_module(void); scm_init_$(TARGET)_module();" \
$(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile
guile_static_cpp: $(SRCS) guile_static_cpp: $(SRCS)
$(SWIG) -c++ -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACE) $(SWIG) -c++ -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACEPATH)
$(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \
-DSWIGINIT="SCM scm_init_$(TARGET)_module(void); scm_init_$(TARGET)_module();" \ -DSWIGINIT="SCM scm_init_$(TARGET)_module(void); scm_init_$(TARGET)_module();" \
$(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile
guile_simple: $(SRCS) guile_simple: $(SRCS)
$(SWIG) -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACE) $(SWIG) -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACEPATH)
$(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) \ $(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) \
$(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile
guile_simple_cpp: $(SRCS) guile_simple_cpp: $(SRCS)
$(SWIG) -c++ -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACE) $(SWIG) -c++ -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACEPATH)
$(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \
$(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile
@ -471,7 +473,7 @@ JAVACFLAGS = @JAVACFLAGS@
# ---------------------------------------------------------------- # ----------------------------------------------------------------
java: $(SRCS) java: $(SRCS)
$(SWIG) -java $(SWIGOPT) $(INTERFACE) $(SWIG) -java $(SWIGOPT) $(INTERFACEPATH)
$(CC) -c $(CCSHARED) $(CFLAGS) $(JAVACFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(JAVA_INCLUDE) $(CC) -c $(CCSHARED) $(CFLAGS) $(JAVACFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(JAVA_INCLUDE)
$(JAVALDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO) $(JAVALDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO)
@ -480,7 +482,7 @@ java: $(SRCS)
# ---------------------------------------------------------------- # ----------------------------------------------------------------
java_cpp: $(SRCS) java_cpp: $(SRCS)
$(SWIG) -java -c++ $(SWIGOPT) $(INTERFACE) $(SWIG) -java -c++ $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(JAVACFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(JAVA_INCLUDE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(JAVACFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(JAVA_INCLUDE)
$(JAVACXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO) $(JAVACXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO)
@ -504,12 +506,12 @@ MODULA3_INCLUDE= @MODULA3INC@
# ---------------------------------------------------------------- # ----------------------------------------------------------------
modula3: $(SRCS) modula3: $(SRCS)
$(SWIG) -modula3 $(SWIGOPT) $(INTERFACE) $(SWIG) -modula3 $(SWIGOPT) $(INTERFACEPATH)
# $(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) \ # $(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) \
# $(OBJS) $(IOBJS) $(LIBS) # $(OBJS) $(IOBJS) $(LIBS)
modula3_cpp: $(SRCS) modula3_cpp: $(SRCS)
$(SWIG) -modula3 -c++ $(SWIGOPT) $(INTERFACE) $(SWIG) -modula3 -c++ $(SWIGOPT) $(INTERFACEPATH)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Cleaning the modula3 examples # Cleaning the modula3 examples
@ -533,12 +535,12 @@ MZSCHEME_SO = @MZSCHEME_SO@
# ---------------------------------------------------------------- # ----------------------------------------------------------------
mzscheme: $(SRCS) mzscheme: $(SRCS)
$(SWIG) -mzscheme $(SWIGOPT) $(INTERFACE) $(SWIG) -mzscheme $(SWIGOPT) $(INTERFACEPATH)
$(MZC) `echo $(INCLUDES) | sed 's/-I/++ccf -I/g'` --cc $(ISRCS) $(SRCS) $(MZC) `echo $(INCLUDES) | sed 's/-I/++ccf -I/g'` --cc $(ISRCS) $(SRCS)
$(MZC) --ld $(TARGET)$(MZSCHEME_SO) $(OBJS) $(IOBJS) $(MZC) --ld $(TARGET)$(MZSCHEME_SO) $(OBJS) $(IOBJS)
mzscheme_cpp: $(SRCS) mzscheme_cpp: $(SRCS)
$(SWIG) -mzscheme -c++ $(SWIGOPT) $(INTERFACE) $(SWIG) -mzscheme -c++ $(SWIGOPT) $(INTERFACEPATH)
$(MZC) `echo $(INCLUDES) | sed 's/-I/++ccf -I/g'` --cc $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(MZC) `echo $(INCLUDES) | sed 's/-I/++ccf -I/g'` --cc $(ICXXSRCS) $(SRCS) $(CXXSRCS)
$(CXXSHARED) $(CFLAGS) -o $(LIBPREFIX)$(TARGET)$(MZSCHEME_SO) $(OBJS) $(IOBJS) $(MZDYNOBJ) $(CPP_DLLIBS) $(CXXSHARED) $(CFLAGS) -o $(LIBPREFIX)$(TARGET)$(MZSCHEME_SO) $(OBJS) $(IOBJS) $(MZDYNOBJ) $(CPP_DLLIBS)
@ -573,7 +575,7 @@ OCAMLCORE=\
ocaml_static: $(SRCS) ocaml_static: $(SRCS)
$(OCAMLCORE) $(OCAMLCORE)
$(SWIG) -ocaml $(SWIGOPT) $(INTERFACE) $(SWIG) -ocaml $(SWIGOPT) $(INTERFACEPATH)
$(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS) $(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS)
$(OCC) -g -c $(INTERFACE:%.i=%.mli) $(OCC) -g -c $(INTERFACE:%.i=%.mli)
$(OCC) -g -c $(INTERFACE:%.i=%.ml) $(OCC) -g -c $(INTERFACE:%.i=%.ml)
@ -587,7 +589,7 @@ ocaml_static: $(SRCS)
ocaml_dynamic: $(SRCS) ocaml_dynamic: $(SRCS)
$(OCAMLCORE) $(OCAMLCORE)
$(SWIG) -ocaml $(SWIGOPT) $(INTERFACE) $(SWIG) -ocaml $(SWIGOPT) $(INTERFACEPATH)
$(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS) $(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS)
$(CXXSHARED) $(CFLAGS) $(CCSHARED) $(CFLAGS) -o $(INTERFACE:%.i=%@SO@) \ $(CXXSHARED) $(CFLAGS) $(CCSHARED) $(CFLAGS) -o $(INTERFACE:%.i=%@SO@) \
$(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) $(LIBS) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) $(LIBS)
@ -606,7 +608,7 @@ ocaml_dynamic: $(SRCS)
ocaml_static_toplevel: $(SRCS) ocaml_static_toplevel: $(SRCS)
$(OCAMLCORE) $(OCAMLCORE)
$(SWIG) -ocaml $(SWIGOPT) $(INTERFACE) $(SWIG) -ocaml $(SWIGOPT) $(INTERFACEPATH)
$(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS) $(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS)
$(OCC) -g -c $(INTERFACE:%.i=%.mli) $(OCC) -g -c $(INTERFACE:%.i=%.mli)
$(OCC) -g -c $(INTERFACE:%.i=%.ml) $(OCC) -g -c $(INTERFACE:%.i=%.ml)
@ -621,7 +623,7 @@ ocaml_static_toplevel: $(SRCS)
ocaml_static_cpp: $(SRCS) ocaml_static_cpp: $(SRCS)
$(OCAMLCORE) $(OCAMLCORE)
$(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACE) $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACEPATH)
cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c) cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c)
$(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \ $(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \
$(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS) $(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS)
@ -638,7 +640,7 @@ ocaml_static_cpp: $(SRCS)
ocaml_static_cpp_toplevel: $(SRCS) ocaml_static_cpp_toplevel: $(SRCS)
$(OCAMLCORE) $(OCAMLCORE)
$(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACE) $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACEPATH)
cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c) cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c)
$(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \ $(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \
$(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS) $(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS)
@ -656,7 +658,7 @@ ocaml_static_cpp_toplevel: $(SRCS)
ocaml_dynamic_cpp: $(SRCS) ocaml_dynamic_cpp: $(SRCS)
$(OCAMLCORE) $(OCAMLCORE)
$(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACE) $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACEPATH)
cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c) cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c)
$(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \ $(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \
$(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS) -ccopt -fPIC $(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS) -ccopt -fPIC
@ -697,7 +699,7 @@ RUBY_DLNK = @RUBYDYNAMICLINKING@
# ---------------------------------------------------------------- # ----------------------------------------------------------------
ruby: $(SRCS) ruby: $(SRCS)
$(SWIG) -ruby $(SWIGOPT) $(INTERFACE) $(SWIG) -ruby $(SWIGOPT) $(INTERFACEPATH)
$(CC) -c $(CCSHARED) $(CFLAGS) $(RUBY_CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(RUBY_INCLUDE) $(CC) -c $(CCSHARED) $(CFLAGS) $(RUBY_CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(RUBY_INCLUDE)
$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(RUBY_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(RUBY_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
@ -706,7 +708,7 @@ ruby: $(SRCS)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
ruby_cpp: $(SRCS) ruby_cpp: $(SRCS)
$(SWIG) -c++ -ruby $(SWIGOPT) $(INTERFACE) $(SWIG) -c++ -ruby $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(RUBY_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(RUBY_INCLUDE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(RUBY_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(RUBY_INCLUDE)
$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(RUBY_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(RUBY_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
@ -720,12 +722,12 @@ ruby_cpp: $(SRCS)
RUBY_LIBOPTS = @RUBYLINK@ @LIBS@ $(SYSLIBS) RUBY_LIBOPTS = @RUBYLINK@ @LIBS@ $(SYSLIBS)
ruby_static: $(SRCS) ruby_static: $(SRCS)
$(SWIG) -ruby -lembed.i $(SWIGOPT) $(INTERFACE) $(SWIG) -ruby -lembed.i $(SWIGOPT) $(INTERFACEPATH)
$(CC) $(CFLAGS) $(RUBY_CFLAGS) @LINKFORSHARED@ $(ISRCS) $(SRCS) $(INCLUDES) \ $(CC) $(CFLAGS) $(RUBY_CFLAGS) @LINKFORSHARED@ $(ISRCS) $(SRCS) $(INCLUDES) \
$(RUBY_INCLUDE) $(LIBS) -L$(RUBY_LIB) $(RUBY_LIBOPTS) -o $(TARGET) $(RUBY_INCLUDE) $(LIBS) -L$(RUBY_LIB) $(RUBY_LIBOPTS) -o $(TARGET)
ruby_cpp_static: $(SRCS) ruby_cpp_static: $(SRCS)
$(SWIG) -c++ -ruby -lembed.i $(SWIGOPT) $(INTERFACE) $(SWIG) -c++ -ruby -lembed.i $(SWIGOPT) $(INTERFACEPATH)
$(CXX) $(CFLAGS) $(RUBY_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(CXX) $(CFLAGS) $(RUBY_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \
$(RUBY_INCLUDE) $(LIBS) -L$(RUBY_LIB) $(RUBY_LIBOPTS) -o $(TARGET) $(RUBY_INCLUDE) $(LIBS) -L$(RUBY_LIB) $(RUBY_LIBOPTS) -o $(TARGET)
@ -751,7 +753,7 @@ PHP4_INCLUDE = @PHP4INC@
PHP4_SO = @PHP4_SO@ PHP4_SO = @PHP4_SO@
php4: $(SRCS) php4: $(SRCS)
$(SWIG) -php5 $(SWIGOPT) $(INTERFACE) $(SWIG) -php5 $(SWIGOPT) $(INTERFACEPATH)
$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PHP4_INCLUDE) $(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PHP4_INCLUDE)
$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(PHP4_SO) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(PHP4_SO)
@ -760,7 +762,7 @@ php4: $(SRCS)
# -------------------------------------------------------------------- # --------------------------------------------------------------------
php4_cpp: $(SRCS) php4_cpp: $(SRCS)
$(SWIG) -php5 -cppext cxx -c++ $(SWIGOPT) $(INTERFACE) $(SWIG) -php5 -cppext cxx -c++ $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PHP4_INCLUDE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PHP4_INCLUDE)
$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(PHP4_SO) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(PHP4_SO)
@ -798,7 +800,7 @@ PIKE_DLNK = @PIKEDYNAMICLINKING@
# ---------------------------------------------------------------- # ----------------------------------------------------------------
pike: $(SRCS) pike: $(SRCS)
$(SWIG) -pike $(SWIGOPT) $(INTERFACE) $(SWIG) -pike $(SWIGOPT) $(INTERFACEPATH)
$(CC) -c $(CCSHARED) $(CFLAGS) $(PIKE_CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(PIKE_INCLUDE) $(CC) -c $(CCSHARED) $(CFLAGS) $(PIKE_CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(PIKE_INCLUDE)
$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PIKE_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PIKE_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
@ -807,7 +809,7 @@ pike: $(SRCS)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
pike_cpp: $(SRCS) pike_cpp: $(SRCS)
$(SWIG) -c++ -pike $(SWIGOPT) $(INTERFACE) $(SWIG) -c++ -pike $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(PIKE_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(PIKE_INCLUDE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(PIKE_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(PIKE_INCLUDE)
$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PIKE_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PIKE_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
@ -821,12 +823,12 @@ pike_cpp: $(SRCS)
PIKE_LIBOPTS = @PIKELINK@ @LIBS@ $(SYSLIBS) PIKE_LIBOPTS = @PIKELINK@ @LIBS@ $(SYSLIBS)
pike_static: $(SRCS) pike_static: $(SRCS)
$(SWIG) -pike -lembed.i $(SWIGOPT) $(INTERFACE) $(SWIG) -pike -lembed.i $(SWIGOPT) $(INTERFACEPATH)
$(CC) $(CFLAGS) $(PIKE_CFLAGS) @LINKFORSHARED@ $(ISRCS) $(SRCS) $(INCLUDES) \ $(CC) $(CFLAGS) $(PIKE_CFLAGS) @LINKFORSHARED@ $(ISRCS) $(SRCS) $(INCLUDES) \
$(PIKE_INCLUDE) $(LIBS) -L$(PIKE_LIB) $(PIKE_LIBOPTS) -o $(TARGET) $(PIKE_INCLUDE) $(LIBS) -L$(PIKE_LIB) $(PIKE_LIBOPTS) -o $(TARGET)
pike_cpp_static: $(SRCS) pike_cpp_static: $(SRCS)
$(SWIG) -c++ -pike -lembed.i $(SWIGOPT) $(INTERFACE) $(SWIG) -c++ -pike -lembed.i $(SWIGOPT) $(INTERFACEPATH)
$(CXX) $(CFLAGS) $(PIKE_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(CXX) $(CFLAGS) $(PIKE_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \
$(PIKE_INCLUDE) $(LIBS) -L$(PIKE_LIB) $(PIKE_LIBOPTS) -o $(TARGET) $(PIKE_INCLUDE) $(LIBS) -L$(PIKE_LIB) $(PIKE_LIBOPTS) -o $(TARGET)
@ -868,7 +870,7 @@ CHICKEN_COMPILED_MAIN_OBJECT = $(CHICKEN_COMPILED_MAIN:.c=.@OBJEXT@)
# This is the old way to build chicken, but it does not work correctly with exceptions # This is the old way to build chicken, but it does not work correctly with exceptions
chicken_direct: $(SRCS) chicken_direct: $(SRCS)
$(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH)
$(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \ $(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \
-dynamic -feature chicken-compile-shared \ -dynamic -feature chicken-compile-shared \
-output-file $(CHICKEN_COMPILED_SCHEME) -output-file $(CHICKEN_COMPILED_SCHEME)
@ -878,7 +880,7 @@ chicken_direct: $(SRCS)
$(LIBS) $(CHICKEN_SHAREDLIBOPTS) -o $(LIBPREFIX)$(TARGET)$(SO) $(LIBS) $(CHICKEN_SHAREDLIBOPTS) -o $(LIBPREFIX)$(TARGET)$(SO)
chicken_direct_cpp: $(CXXSRCS) $(CHICKSRCS) chicken_direct_cpp: $(CXXSRCS) $(CHICKSRCS)
$(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH)
$(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \ $(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \
-dynamic -feature chicken-compile-shared \ -dynamic -feature chicken-compile-shared \
-output-file $(CHICKEN_COMPILED_SCHEME) -output-file $(CHICKEN_COMPILED_SCHEME)
@ -893,7 +895,7 @@ chicken_direct_cpp: $(CXXSRCS) $(CHICKSRCS)
# The following two targets are also used by the test suite # The following two targets are also used by the test suite
chicken_static: $(SRCS) $(CHICKSRCS) chicken_static: $(SRCS) $(CHICKSRCS)
$(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH)
$(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \ $(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \
-output-file $(CHICKEN_COMPILED_SCHEME) -output-file $(CHICKEN_COMPILED_SCHEME)
$(CHICKEN) $(CHICKEN_MAIN) $(CHICKENOPTS) \ $(CHICKEN) $(CHICKEN_MAIN) $(CHICKENOPTS) \
@ -905,7 +907,7 @@ chicken_static: $(SRCS) $(CHICKSRCS)
$(OBJS) $(IOBJS) $(LIBS) $(CHICKEN_SHAREDLIBOPTS) -o $(TARGET) $(OBJS) $(IOBJS) $(LIBS) $(CHICKEN_SHAREDLIBOPTS) -o $(TARGET)
chicken_static_cpp: $(CXXSRCS) $(CHICKSRCS) chicken_static_cpp: $(CXXSRCS) $(CHICKSRCS)
$(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH)
$(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \ $(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \
-output-file $(CHICKEN_COMPILED_SCHEME) -output-file $(CHICKEN_COMPILED_SCHEME)
$(CHICKEN) $(CHICKEN_MAIN) $(CHICKENOPTS) \ $(CHICKEN) $(CHICKEN_MAIN) $(CHICKENOPTS) \
@ -921,11 +923,11 @@ chicken_static_cpp: $(CXXSRCS) $(CHICKSRCS)
# ---------------------------------------------------------------- # ----------------------------------------------------------------
chicken: chicken:
$(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH)
$(COMPILETOOL) $(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ISRCS) -o $(TARGET)$(SO) $(COMPILETOOL) $(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ISRCS) -o $(TARGET)$(SO)
chicken_cpp: chicken_cpp:
$(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH)
$(COMPILETOOL) $(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ICXXSRCS) $(CXXSRCS) -o $(TARGET)$(SO) $(COMPILETOOL) $(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ICXXSRCS) $(CXXSRCS) -o $(TARGET)$(SO)
chicken_externalhdr: chicken_externalhdr:
@ -953,7 +955,7 @@ CSHARPSO = @CSHARPSO@
# ---------------------------------------------------------------- # ----------------------------------------------------------------
csharp: $(SRCS) csharp: $(SRCS)
$(SWIG) -csharp $(SWIGOPT) $(INTERFACE) $(SWIG) -csharp $(SWIGOPT) $(INTERFACEPATH)
$(CC) -c $(CCSHARED) $(CFLAGS) $(CSHARPCFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(CC) -c $(CCSHARED) $(CFLAGS) $(CSHARPCFLAGS) $(SRCS) $(ISRCS) $(INCLUDES)
$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(CSHARP_DLNK) $(LIBS) -o $(CSHARP_LIBPREFIX)$(TARGET)$(CSHARPSO) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(CSHARP_DLNK) $(LIBS) -o $(CSHARP_LIBPREFIX)$(TARGET)$(CSHARPSO)
@ -962,7 +964,7 @@ csharp: $(SRCS)
# ---------------------------------------------------------------- # ----------------------------------------------------------------
csharp_cpp: $(SRCS) csharp_cpp: $(SRCS)
$(SWIG) -csharp -c++ $(SWIGOPT) $(INTERFACE) $(SWIG) -csharp -c++ $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(CSHARPCFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(CXX) -c $(CCSHARED) $(CFLAGS) $(CSHARPCFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES)
$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(CSHARP_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(CSHARP_LIBPREFIX)$(TARGET)$(CSHARPSO) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(CSHARP_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(CSHARP_LIBPREFIX)$(TARGET)$(CSHARPSO)
@ -1002,7 +1004,7 @@ LUA_INTERP = ../lua.c
# ---------------------------------------------------------------- # ----------------------------------------------------------------
lua: $(SRCS) lua: $(SRCS)
$(SWIG) -lua $(SWIGOPT) $(INTERFACE) $(SWIG) -lua $(SWIGOPT) $(INTERFACEPATH)
$(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(LUA_INCLUDE) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(LUA_INCLUDE)
$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(LUA_LIB) -o $(LIBPREFIX)$(TARGET)$(LUA_SO) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(LUA_LIB) -o $(LIBPREFIX)$(TARGET)$(LUA_SO)
@ -1011,7 +1013,7 @@ lua: $(SRCS)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
lua_cpp: $(SRCS) lua_cpp: $(SRCS)
$(SWIG) -c++ -lua $(SWIGOPT) $(INTERFACE) $(SWIG) -c++ -lua $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(LUA_INCLUDE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(LUA_INCLUDE)
$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(LUA_LIB) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(LUA_SO) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(LUA_LIB) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(LUA_SO)
@ -1020,12 +1022,12 @@ lua_cpp: $(SRCS)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
lua_static: $(SRCS) lua_static: $(SRCS)
$(SWIG) -lua -module example $(SWIGOPT) $(INTERFACE) $(SWIG) -lua -module example $(SWIGOPT) $(INTERFACEPATH)
$(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(LUA_INTERP) $(INCLUDES) \ $(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(LUA_INTERP) $(INCLUDES) \
$(LUA_INCLUDE) $(LIBS) $(LUA_LIB) -o $(TARGET) $(LUA_INCLUDE) $(LIBS) $(LUA_LIB) -o $(TARGET)
lua_static_cpp: $(SRCS) lua_static_cpp: $(SRCS)
$(SWIG) -c++ -lua -module example $(SWIGOPT) $(INTERFACE) $(SWIG) -c++ -lua -module example $(SWIGOPT) $(INTERFACEPATH)
$(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(LUA_INTERP) $(INCLUDES) \ $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(LUA_INTERP) $(INCLUDES) \
$(LUA_INCLUDE) $(LIBS) $(LUA_LIB) -o $(TARGET) $(LUA_INCLUDE) $(LIBS) $(LUA_LIB) -o $(TARGET)
@ -1043,12 +1045,12 @@ lua_clean:
################################################################## ##################################################################
allegrocl: $(SRCS) allegrocl: $(SRCS)
$(SWIG) -allegrocl -cwrap $(SWIGOPT) $(INTERFACE) $(SWIG) -allegrocl -cwrap $(SWIGOPT) $(INTERFACEPATH)
$(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS)
$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
allegrocl_cpp: $(SRCS) allegrocl_cpp: $(SRCS)
$(SWIG) -c++ -allegrocl $(SWIGOPT) $(INTERFACE) $(SWIG) -c++ -allegrocl $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES)
$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
@ -1062,10 +1064,10 @@ allegrocl_clean:
################################################################## ##################################################################
clisp: $(SRCS) clisp: $(SRCS)
$(SWIG) -clisp $(SWIGOPT) $(INTERFACE) $(SWIG) -clisp $(SWIGOPT) $(INTERFACEPATH)
clisp_cpp: $(SRCS) clisp_cpp: $(SRCS)
$(SWIG) -c++ -clisp $(SWIGOPT) $(INTERFACE) $(SWIG) -c++ -clisp $(SWIGOPT) $(INTERFACEPATH)
clisp_clean: clisp_clean:
rm -f *_wrap* *~ .~* rm -f *_wrap* *~ .~*
@ -1077,12 +1079,12 @@ clisp_clean:
################################################################## ##################################################################
cffi: $(SRCS) cffi: $(SRCS)
$(SWIG) -cffi $(SWIGOPT) $(INTERFACE) $(SWIG) -cffi $(SWIGOPT) $(INTERFACEPATH)
# $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS) # $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS)
# $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) # $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
cffi_cpp: $(SRCS) cffi_cpp: $(SRCS)
$(SWIG) -c++ -cffi $(SWIGOPT) $(INTERFACE) $(SWIG) -c++ -cffi $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES)
$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
@ -1096,12 +1098,12 @@ cffi_clean:
################################################################## ##################################################################
uffi: $(SRCS) uffi: $(SRCS)
$(SWIG) -uffi $(SWIGOPT) $(INTERFACE) $(SWIG) -uffi $(SWIGOPT) $(INTERFACEPATH)
# $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS) # $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS)
# $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) # $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
uffi_cpp: $(SRCS) uffi_cpp: $(SRCS)
$(SWIG) -c++ -uffi $(SWIGOPT) $(INTERFACE) $(SWIG) -c++ -uffi $(SWIGOPT) $(INTERFACEPATH)
# $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) # $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES)
# $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) # $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
@ -1119,11 +1121,11 @@ RCXXSRCS = $(INTERFACE:.i=_wrap.cpp) #Need to use _wrap.cpp for R build system a
RRSRC = $(INTERFACE:.i=.R) RRSRC = $(INTERFACE:.i=.R)
r: $(SRCS) r: $(SRCS)
$(SWIG) -r $(SWIGOPT) $(INTERFACE) $(SWIG) -r $(SWIGOPT) $(INTERFACEPATH)
+( PKG_LIBS="$(SRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(ISRCS) ) +( PKG_LIBS="$(SRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(ISRCS) )
r_cpp: $(CXXSRCS) r_cpp: $(CXXSRCS)
$(SWIG) -c++ -r $(SWIGOPT) -o $(RCXXSRCS) $(INTERFACE) $(SWIG) -c++ -r $(SWIGOPT) -o $(RCXXSRCS) $(INTERFACEPATH)
+( PKG_LIBS="$(CXXSRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) ) +( PKG_LIBS="$(CXXSRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) )
r_clean: r_clean:

View file

@ -19,7 +19,7 @@ SKIP_CPP_STD_CASES = Yes
CPP_TEST_CASES += li_std_string CPP_TEST_CASES += li_std_string
EXTRA_TEST_CASES += ext_test.externaltest EXTRA_TEST_CASES += chicken_ext_test.externaltest
include $(srcdir)/../common.mk include $(srcdir)/../common.mk

View file

@ -1,4 +1,4 @@
(load "ext_test.so") (load "chicken_ext_test.so")
(define a (test-create)) (define a (test-create))

View file

@ -1,4 +1,4 @@
%module ext_test %module chicken_ext_test
/* just use the imports_a.h header... for this test we only need a class */ /* just use the imports_a.h header... for this test we only need a class */
%{ %{

View file

@ -59,11 +59,12 @@ CXXSRCS =
CSRCS = CSRCS =
TARGETPREFIX = TARGETPREFIX =
TARGETSUFFIX = TARGETSUFFIX =
SWIGOPT = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$(LANGUAGE) -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) -DSWIG_NOEXTRA_QUALIFICATION SWIGOPT = -outcurrentdir -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
INCLUDES = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$(LANGUAGE) -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) INCLUDES = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
LIBS = -L. LIBS = -L.
LIBPREFIX = lib LIBPREFIX = lib
ACTION = check ACTION = check
INTERFACEDIR = ../
# #
# Please keep test cases in alphabetical order. # Please keep test cases in alphabetical order.
@ -405,6 +406,7 @@ CPP_STD_TEST_CASES += \
template_typedef_fnc \ template_typedef_fnc \
template_type_namespace \ template_type_namespace \
template_opaque template_opaque
# li_std_list
ifndef SKIP_CPP_STD_CASES ifndef SKIP_CPP_STD_CASES
@ -441,11 +443,13 @@ C_TEST_CASES += \
overload_extendc \ overload_extendc \
preproc \ preproc \
ret_by_value \ ret_by_value \
simple_array \
sizeof_pointer \ sizeof_pointer \
sneaky1 \ sneaky1 \
struct_rename \ struct_rename \
typedef_struct \ typedef_struct \
typemap_subst \ typemap_subst \
union \
unions unions
@ -491,14 +495,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="$(SWIGOPT)" NOLINK=true \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACE="$*.i" \ TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \
$(LANGUAGE)$(VARIANT)_cpp $(LANGUAGE)$(VARIANT)_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="$(SWIGOPT)" NOLINK=true \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACE="$*.i" \ TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \
$(LANGUAGE)$(VARIANT) $(LANGUAGE)$(VARIANT)
swig_and_compile_multi_cpp = \ swig_and_compile_multi_cpp = \
@ -506,7 +510,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)" LIBS='$(LIBS)' \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBS='$(LIBS)' \
INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACE="$$f.i" \ TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \
$(LANGUAGE)$(VARIANT)_cpp; \ $(LANGUAGE)$(VARIANT)_cpp; \
done done
@ -518,7 +522,7 @@ swig_and_compile_external = \
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS) $*_external.cxx" \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS) $*_external.cxx" \
SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \
INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACE="$*.i" \ TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \
$(LANGUAGE)$(VARIANT)_cpp $(LANGUAGE)$(VARIANT)_cpp
swig_and_compile_runtime = \ swig_and_compile_runtime = \

View file

@ -29,6 +29,7 @@ include $(srcdir)/../common.mk
# Overridden variables here # Overridden variables here
SWIGOPT += -namespace $*Namespace $(SWIGOPTSPECIAL) SWIGOPT += -namespace $*Namespace $(SWIGOPTSPECIAL)
INTERFACEDIR = ../../
CSHARPFLAGSSPECIAL = CSHARPFLAGSSPECIAL =

View file

@ -2,7 +2,7 @@
# Makefile for guile test-suite (with SCM API) # Makefile for guile test-suite (with SCM API)
####################################################################### #######################################################################
EXTRA_TEST_CASES += ext_test.externaltest EXTRA_TEST_CASES += guilescm_ext_test.externaltest
include ../guile/Makefile include ../guile/Makefile

View file

@ -1,4 +1,4 @@
(dynamic-call "scm_init_ext_test_module" (dynamic-link "./libext_test.so")) (dynamic-call "scm_init_guilescm_ext_test_module" (dynamic-link "./libguilescm_ext_test.so"))
; This is a test for SF Bug 1573892 ; This is a test for SF Bug 1573892
; If IsPointer is called before TypeQuery, the test-is-pointer will fail ; If IsPointer is called before TypeQuery, the test-is-pointer will fail

View file

@ -1,4 +1,4 @@
%module ext_test %module guilescm_ext_test
/* just use the imports_a.h header... for this test we only need a class */ /* just use the imports_a.h header... for this test we only need a class */
%{ %{

View file

@ -37,6 +37,7 @@ include $(srcdir)/../common.mk
# Overridden variables here # Overridden variables here
SWIGOPT += -package $* SWIGOPT += -package $*
INTERFACEDIR = ../../
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
@ -72,7 +73,7 @@ run_testcase = \
(cd $* && $(COMPILETOOL) $(JAVAC) -classpath . *.java) && \ (cd $* && $(COMPILETOOL) $(JAVAC) -classpath . *.java) && \
if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \
$(COMPILETOOL) $(JAVAC) -classpath . -d . $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \ $(COMPILETOOL) $(JAVAC) -classpath . -d . $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \
env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" DYLD_LIBRARY_PATH="$*:$$DYLD_LIBRARY_PATH" $(RUNTOOL) $(JAVA) -classpath . $*\_runme;) \ env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" DYLD_LIBRARY_PATH="$*:$$DYLD_LIBRARY_PATH" $(RUNTOOL) $(JAVA) -classpath . $*_runme;) \
fi; fi;
# Clean: remove testcase directories # Clean: remove testcase directories

View file

@ -1,4 +1,4 @@
%module li_std_pair %module li_std_pair_extra
// //
// activate the automatic comparison methods generation (==,!=,...) // activate the automatic comparison methods generation (==,!=,...)

View file

@ -1,4 +1,4 @@
%module li_std_string %module li_std_string_extra
%naturalvar A; %naturalvar A;
@ -51,5 +51,5 @@ std::basic_string<char,std::char_traits<char>,std::allocator<char> > test_value_
%} %}
%include ../li_std_string.i %include "li_std_string.i"

View file

@ -10,7 +10,9 @@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
CPP_TEST_CASES += \ CPP_TEST_CASES += \
cell_deref li_std_pair_extra \
li_std_string_extra \
octave_cell_deref
CPP_TEST_BROKEN += \ CPP_TEST_BROKEN += \
implicittest \ implicittest \

View file

@ -0,0 +1,69 @@
li_std_pair_extra
p = {1,2};
p1 = li_std_pair_extra.p_inout(p);
assert(all(cell2mat(p1)==[2,1]));
p2 = li_std_pair_extra.p_inoutd(p1);
assert(all(cell2mat(p2)==[1,2]));
d1 = li_std_pair_extra.d_inout(2);
assert(d1==4);
[i,d2] = li_std_pair_extra.d_inout2(2);
assert(all([i,d2]==[1,4]));
[i,p] = li_std_pair_extra.p_inout2(p);
assert(i==1&&all([cell2mat(p)]==[2,1]));
[p3,p4] = li_std_pair_extra.p_inout3(p1,p1);
assert(all(cell2mat(p3)==[2,1]));
assert(all(cell2mat(p4)==[2,1]));
psi = li_std_pair_extra.SIPair("hello",1);
assert(psi=={"hello",1});
pci = li_std_pair_extra.CIPair(complex(1,2),1);
assert(pci.first==complex(1,2)&&pci.second==1);
psi = li_std_pair_extra.SIPair("hi",1);
assert(psi.first=="hi"&&psi.second==1);
psii = li_std_pair_extra.SIIPair(psi,1);
assert(psii.first.first=="hi");
assert(psii.first.second==1);
assert(psii.second==1);
a = li_std_pair_extra.A();
b = li_std_pair_extra.B();
pab = li_std_pair_extra.ABPair(a,b);
pab.first = a;
pab.first.val = 2;
assert(pab.first.val == 2);
pci = li_std_pair_extra.CIntPair(1,0);
assert(pci.first==1&&pci.second==0);
a = li_std_pair_extra.A(5);
p1 = li_std_pair_extra.pairP1(1,a);
p2 = li_std_pair_extra.pairP2(a,1);
p3 = li_std_pair_extra.pairP3(a,a);
assert(a.val == li_std_pair_extra.p_identa(p1){2}.val);
p = li_std_pair_extra.IntPair(1,10);
assert(p.first==1&&p.second==10);
p.first = 1;
assert(p.first==1);
p = li_std_pair_extra.paircA1(1,a);
assert(p.first==1);
assert(swig_this(p.second)==swig_this(a));
p = li_std_pair_extra.paircA2(1,a);
assert(p.first==1);
assert(swig_this(p.second)==swig_this(a));
#pp = li_std_pair_extra.pairiiA(1,p); # conversion pb re const of pairA1/A2
pp = li_std_pair_extra.pairiiA(1,{1,A()});

View file

@ -1,69 +0,0 @@
li_std_pair
p = {1,2};
p1 = li_std_pair.p_inout(p);
assert(all(cell2mat(p1)==[2,1]));
p2 = li_std_pair.p_inoutd(p1);
assert(all(cell2mat(p2)==[1,2]));
d1 = li_std_pair.d_inout(2);
assert(d1==4);
[i,d2] = li_std_pair.d_inout2(2);
assert(all([i,d2]==[1,4]));
[i,p] = li_std_pair.p_inout2(p);
assert(i==1&&all([cell2mat(p)]==[2,1]));
[p3,p4] = li_std_pair.p_inout3(p1,p1);
assert(all(cell2mat(p3)==[2,1]));
assert(all(cell2mat(p4)==[2,1]));
psi = li_std_pair.SIPair("hello",1);
assert(psi=={"hello",1});
pci = li_std_pair.CIPair(complex(1,2),1);
assert(pci.first==complex(1,2)&&pci.second==1);
psi = li_std_pair.SIPair("hi",1);
assert(psi.first=="hi"&&psi.second==1);
psii = li_std_pair.SIIPair(psi,1);
assert(psii.first.first=="hi");
assert(psii.first.second==1);
assert(psii.second==1);
a = li_std_pair.A();
b = li_std_pair.B();
pab = li_std_pair.ABPair(a,b);
pab.first = a;
pab.first.val = 2;
assert(pab.first.val == 2);
pci = li_std_pair.CIntPair(1,0);
assert(pci.first==1&&pci.second==0);
a = li_std_pair.A(5);
p1 = li_std_pair.pairP1(1,a);
p2 = li_std_pair.pairP2(a,1);
p3 = li_std_pair.pairP3(a,a);
assert(a.val == li_std_pair.p_identa(p1){2}.val);
p = li_std_pair.IntPair(1,10);
assert(p.first==1&&p.second==10);
p.first = 1;
assert(p.first==1);
p = li_std_pair.paircA1(1,a);
assert(p.first==1);
assert(swig_this(p.second)==swig_this(a));
p = li_std_pair.paircA2(1,a);
assert(p.first==1);
assert(swig_this(p.second)==swig_this(a));
#pp = li_std_pair.pairiiA(1,p); # conversion pb re const of pairA1/A2
pp = li_std_pair.pairiiA(1,{1,A()});

View file

@ -1,55 +0,0 @@
%module li_std_string
%naturalvar A;
%include <std_basic_string.i>
%include <std_string.i>
%inline %{
struct A : std::string
{
A(const std::string& s) : std::string(s)
{
}
};
struct B
{
B(const std::string& s) : cname(0), name(s), a(s)
{
}
char *cname;
std::string name;
A a;
};
const char* test_ccvalue(const char* x) {
return x;
}
char* test_cvalue(char* x) {
return x;
}
std::basic_string<char> test_value_basic1(std::basic_string<char> x) {
return x;
}
std::basic_string<char,std::char_traits<char> > test_value_basic2(std::basic_string<char,std::char_traits<char> > x) {
return x;
}
std::basic_string<char,std::char_traits<char>,std::allocator<char> > test_value_basic3(std::basic_string<char,std::char_traits<char>,std::allocator<char> > x) {
return x;
}
%}
%include ../li_std_string.i

View file

@ -1,27 +1,27 @@
li_std_string li_std_string_extra
x="hello"; x="hello";
if (li_std_string.test_ccvalue(x) != x) if (li_std_string_extra.test_ccvalue(x) != x)
error("bad string mapping") error("bad string mapping")
endif endif
if (li_std_string.test_cvalue(x) != x) if (li_std_string_extra.test_cvalue(x) != x)
error("bad string mapping") error("bad string mapping")
endif endif
if (li_std_string.test_value(x) != x) if (li_std_string_extra.test_value(x) != x)
error("bad string mapping: %s, %s", x, li_std_string.test_value(x)) error("bad string mapping: %s, %s", x, li_std_string_extra.test_value(x))
endif endif
if (li_std_string.test_const_reference(x) != x) if (li_std_string_extra.test_const_reference(x) != x)
error("bad string mapping") error("bad string mapping")
endif endif
s = li_std_string.string("he"); s = li_std_string_extra.string("he");
#s += "ll" #s += "ll"
#s.append('o') #s.append('o')
s = s + "llo"; s = s + "llo";
@ -34,25 +34,25 @@ if (s[1:4] != x[1:4])
error("bad string mapping") error("bad string mapping")
endif endif
if (li_std_string.test_value(s) != x) if (li_std_string_extra.test_value(s) != x)
error("bad string mapping") error("bad string mapping")
endif endif
if (li_std_string.test_const_reference(s) != x) if (li_std_string_extra.test_const_reference(s) != x)
error("bad string mapping") error("bad string mapping")
endif endif
a = li_std_string.A(s); a = li_std_string_extra.A(s);
if (li_std_string.test_value(a) != x) if (li_std_string_extra.test_value(a) != x)
error("bad string mapping") error("bad string mapping")
endif endif
if (li_std_string.test_const_reference(a) != x) if (li_std_string_extra.test_const_reference(a) != x)
error("bad string mapping") error("bad string mapping")
endif endif
b = li_std_string.string(" world"); b = li_std_string_extra.string(" world");
s = a + b; s = a + b;
if (a + b != "hello world") if (a + b != "hello world")
@ -74,48 +74,48 @@ endif
s = "hello world"; s = "hello world";
b = li_std_string.B("hi"); b = li_std_string_extra.B("hi");
b.name = li_std_string.string("hello"); b.name = li_std_string_extra.string("hello");
if (b.name != "hello") if (b.name != "hello")
error("bad string mapping") error("bad string mapping")
endif endif
b.a = li_std_string.A("hello"); b.a = li_std_string_extra.A("hello");
if (b.a != "hello") if (b.a != "hello")
error("bad string mapping") error("bad string mapping")
endif endif
if (li_std_string.test_value_basic1(x) != x) if (li_std_string_extra.test_value_basic1(x) != x)
error("bad string mapping") error("bad string mapping")
endif endif
if (li_std_string.test_value_basic2(x) != x) if (li_std_string_extra.test_value_basic2(x) != x)
error("bad string mapping") error("bad string mapping")
endif endif
if (li_std_string.test_value_basic3(x) != x) if (li_std_string_extra.test_value_basic3(x) != x)
error("bad string mapping") error("bad string mapping")
endif endif
# Global variables # Global variables
s = "initial string"; s = "initial string";
if (li_std_string.cvar.GlobalString2 != "global string 2") if (li_std_string_extra.cvar.GlobalString2 != "global string 2")
error("GlobalString2 test 1") error("GlobalString2 test 1")
endif endif
li_std_string.cvar.GlobalString2 = s; li_std_string_extra.cvar.GlobalString2 = s;
if (li_std_string.cvar.GlobalString2 != s) if (li_std_string_extra.cvar.GlobalString2 != s)
error("GlobalString2 test 2") error("GlobalString2 test 2")
endif endif
if (li_std_string.cvar.ConstGlobalString != "const global string") if (li_std_string_extra.cvar.ConstGlobalString != "const global string")
error("ConstGlobalString test") error("ConstGlobalString test")
endif endif
# Member variables # Member variables
myStructure = li_std_string.Structure(); myStructure = li_std_string_extra.Structure();
if (myStructure.MemberString2 != "member string 2") if (myStructure.MemberString2 != "member string 2")
error("MemberString2 test 1") error("MemberString2 test 1")
endif endif
@ -127,36 +127,36 @@ if (myStructure.ConstMemberString != "const member string")
error("ConstMemberString test") error("ConstMemberString test")
endif endif
if (li_std_string.cvar.Structure_StaticMemberString2 != "static member string 2") if (li_std_string_extra.cvar.Structure_StaticMemberString2 != "static member string 2")
error("StaticMemberString2 test 1") error("StaticMemberString2 test 1")
endif endif
li_std_string.cvar.Structure_StaticMemberString2 = s; li_std_string_extra.cvar.Structure_StaticMemberString2 = s;
if (li_std_string.cvar.Structure_StaticMemberString2 != s) if (li_std_string_extra.cvar.Structure_StaticMemberString2 != s)
error("StaticMemberString2 test 2") error("StaticMemberString2 test 2")
endif endif
if (li_std_string.cvar.Structure_ConstStaticMemberString != "const static member string") if (li_std_string_extra.cvar.Structure_ConstStaticMemberString != "const static member string")
error("ConstStaticMemberString test") error("ConstStaticMemberString test")
endif endif
if (li_std_string.test_reference_input("hello") != "hello") if (li_std_string_extra.test_reference_input("hello") != "hello")
error error
endif endif
s = li_std_string.test_reference_inout("hello"); s = li_std_string_extra.test_reference_inout("hello");
if (s != "hellohello") if (s != "hellohello")
error error
endif endif
if (li_std_string.stdstring_empty() != "") if (li_std_string_extra.stdstring_empty() != "")
error error
endif endif
if (li_std_string.c_empty() != "") if (li_std_string_extra.c_empty() != "")
error error
endif endif
if (li_std_string.c_null() != None) if (li_std_string_extra.c_null() != None)
error error
endif endif

View file

@ -1,4 +1,4 @@
cell_deref; octave_cell_deref;
assert(func("hello")); assert(func("hello"));
assert(func({"hello"})); assert(func({"hello"}));

View file

@ -1,4 +1,4 @@
%module cell_deref %module octave_cell_deref
%inline { %inline {
bool func(const char* s) { bool func(const char* s) {

View file

@ -8,6 +8,9 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
#CPP_TEST_CASES += \
# php_namewarn_rename \
include $(srcdir)/../common.mk include $(srcdir)/../common.mk
# Overridden variables here # Overridden variables here

View file

@ -1,4 +1,4 @@
%module namewarn_rename %module php_namewarn_rename
%inline %{ %inline %{

View file

@ -52,8 +52,10 @@ CPP_TEST_CASES += \
li_implicit \ li_implicit \
li_std_vectora \ li_std_vectora \
li_std_map \ li_std_map \
li_std_pair_extra \
li_std_set \ li_std_set \
li_std_stream \ li_std_stream \
li_std_string_extra \
li_std_wstream \ li_std_wstream \
li_std_wstring \ li_std_wstring \
nondynamic \ nondynamic \

View file

@ -1,68 +0,0 @@
%module(naturalvar="1") implicittest
%implicitconv;
%inline
{
struct B { };
}
%inline
{
struct A
{
int ii;
A(int i) { ii = 1; }
A(double d) { ii = 2; }
A(const B& b) { ii = 3; }
explicit A(char *s) { ii = 4; }
int get() const { return ii; }
};
int get(const A& a) { return a.ii; }
template <class T>
struct A_T
{
int ii;
A_T(int i) { ii = 1; }
A_T(double d) { ii = 2; }
A_T(const B& b) { ii = 3; }
explicit A_T(char *s) { ii = 4; }
int get() const { return ii; }
};
}
%inline
{
struct Foo
{
int ii;
Foo(){ ii = 0;}
Foo(int){ ii = 1;}
Foo(double){ ii = 2;}
explicit Foo(char *s){ii = 3;}
Foo(const Foo& f){ ii = f.ii;}
};
struct Bar
{
int ii;
Foo f;
Bar() {ii = -1;}
Bar(const Foo& ff){ ii = ff.ii;}
};
int get_b(const Bar&b) { return b.ii; }
Foo foo;
}
%template(A_int) A_T<int>;

View file

@ -1,210 +0,0 @@
%module li_std_pair
//
// activate the automatic comparison methods generation (==,!=,...)
//
%{
#include <algorithm> // for std::swap
%}
%include std_pair.i
%include std_string.i
%include std_complex.i
%inline
%{
struct A
{
int val;
A(int v = 0): val(v)
{
}
};
struct B
{
};
%}
%std_comp_methods(std::pair<std::string, int>);
namespace std {
%template(CIntPair) pair<const int, const int>;
%template() pair<double, double>;
%template(ShortPair) pair<short, short>;
%template(IntPair) pair<int, int>;
%extend pair<int, int>
{
%template(pair) pair<short,short>;
}
%template(SIPair) pair<std::string, int>;
%template(CIPair) pair<std::complex<double>, int>;
%template(SIIPair) pair<std::pair<std::string, int>, int>;
%template(AIntPair) pair<A, int>;
%template(CCIntPair) pair<const A, const pair<int, int> >;
%template(ABPair) pair<A, B>;
%template(IntAPair) pair<int, A>;
%template(pairP1) pair<int, A*>;
%template(pairP2) pair<A*, int>;
%template(pairP3) pair<A*, A*>;
%template(pairP4) pair<int, int*>;
%template(pairP5) pair<int*, int>;
%template(pairP6) pair<int*, int*>;
}
%std_comp_methods(std::pair<std::pair<std::string, int>, int>);
%apply std::pair<int,int> *INOUT {std::pair<int,int> *INOUT2};
%inline %{
/* Test the "out" typemap for pair<T, U> */
std::pair<int, int> makeIntPair(int a, int b) {
return std::make_pair(a, b);
}
/**
* There is no "out" typemap for a pointer to a pair, so
* this should return a wrapped instance of a std::pair
* instead of the native "array" type for the target language.
*/
std::pair<int, int> * makeIntPairPtr(int a, int b) {
static std::pair<int, int> p = std::make_pair(a, b);
return &p;
}
/**
* There is no "out" typemap for a non-const reference to a pair, so
* this should return a wrapped instance of a std::pair instead of
* the native "array" type for the target language.
*/
std::pair<int, int>& makeIntPairRef(int a, int b) {
static std::pair<int, int> p = std::make_pair(a, b);
return p;
}
/**
* There is no "out" typemap for a const reference to a pair, so
* this should return a wrapped instance of a std::pair
* instead of the native "array" type for the target language.
*/
const std::pair<int, int> & makeIntPairConstRef(int a, int b) {
static std::pair<int, int> p = std::make_pair(a, b);
return p;
}
/* Test the "in" typemap for pair<T, U> */
int product1(std::pair<int, int> p) {
return p.first*p.second;
}
/* Test the "in" typemap for const pair<T, U>& */
int product2(const std::pair<int, int>& p) {
return p.first*p.second;
}
std::pair<int, int>
p_ident(std::pair<int, int> p, const std::pair<int, int>& q) {
return p;
}
std::pair<int, A*>
p_identa(const std::pair<int, A*>& p) {
return p;
}
void
d_inout(double *INOUT) {
*INOUT += *INOUT;
}
void
d_inout(int *INOUT) {
*INOUT += *INOUT;
}
int
d_inout2(double *INOUT) {
*INOUT += *INOUT;
return 1;
}
void
p_inout(std::pair<int, int> *INOUT) {
std::swap(INOUT->first, INOUT->second);
}
int
p_inout2(std::pair<int, int> *INOUT) {
std::swap(INOUT->first, INOUT->second);
return 1;
}
void
p_inout3(std::pair<int,int> *INOUT, std::pair<int,int> *INOUT2) {
std::swap(*INOUT, *INOUT2);
}
void
p_inoutd(std::pair<double, double> *INOUT) {
std::swap(INOUT->first, INOUT->second);
}
std::string
s_ident(const std::string& s) {
return s;
}
#if 0
std::pair<char, char>
p_ident(std::pair<char, char> p, const std::pair<char, char>& q) {
return p;
}
/* Test the "in" typemap for const pair<T, U>* */
std::pair<A, B>
p_ident(std::pair<A, B> p, const std::pair<A, B>& q) {
return q;
}
/* Test the "in" typemap for const pair<T, U>* */
std::pair<int, A>
p_ident(std::pair<int, A> p, const std::pair<int, A>& q) {
return p;
}
std::pair<int, int>
p_ident(std::pair<int, int> p, const std::pair<A, int>& q) {
return p;
}
std::pair<int, int>
p_ident(std::pair<int, int> p, const std::pair<A, B>& q) {
return p;
}
#endif
%}
namespace std
{
%template(paircA1) pair<const int, A*>;
%template(paircA2) pair<const int, const A*>;
%template(pairiiA) pair<int,pair<int, A*> >;
}

View file

@ -0,0 +1,59 @@
import li_std_pair_extra
p = (1,2)
p1 = li_std_pair_extra.p_inout(p)
p2 = li_std_pair_extra.p_inoutd(p1)
d1 = li_std_pair_extra.d_inout(2)
i,d2 = li_std_pair_extra.d_inout2(2)
i,p = li_std_pair_extra.p_inout2(p)
p3,p4 = li_std_pair_extra.p_inout3(p1,p1)
psi = li_std_pair_extra.SIPair("hello",1)
pci = li_std_pair_extra.CIPair(1,1)
#psi.first = "hi"
psi = li_std_pair_extra.SIPair("hi",1)
if psi != ("hi",1):
raise RuntimeError
psii = li_std_pair_extra.SIIPair(psi,1)
a = li_std_pair_extra.A()
b = li_std_pair_extra.B()
pab = li_std_pair_extra.ABPair(a,b);
pab.first = a
pab.first.val = 2
if pab.first.val != 2:
raise RuntimeError
pci = li_std_pair_extra.CIntPair(1,0)
a = li_std_pair_extra.A(5)
p1 = li_std_pair_extra.pairP1(1,a.this)
p2 = li_std_pair_extra.pairP2(a,1)
p3 = li_std_pair_extra.pairP3(a,a)
if a.val != li_std_pair_extra.p_identa(p1.this)[1].val:
raise RuntimeError
p = li_std_pair_extra.IntPair(1,10)
p.first = 1
p = li_std_pair_extra.paircA1(1,a)
p.first
p.second
p = li_std_pair_extra.paircA2(1,a)
pp = li_std_pair_extra.pairiiA(1,p)

View file

@ -1,59 +0,0 @@
import li_std_pair
p = (1,2)
p1 = li_std_pair.p_inout(p)
p2 = li_std_pair.p_inoutd(p1)
d1 = li_std_pair.d_inout(2)
i,d2 = li_std_pair.d_inout2(2)
i,p = li_std_pair.p_inout2(p)
p3,p4 = li_std_pair.p_inout3(p1,p1)
psi = li_std_pair.SIPair("hello",1)
pci = li_std_pair.CIPair(1,1)
#psi.first = "hi"
psi = li_std_pair.SIPair("hi",1)
if psi != ("hi",1):
raise RuntimeError
psii = li_std_pair.SIIPair(psi,1)
a = li_std_pair.A()
b = li_std_pair.B()
pab = li_std_pair.ABPair(a,b);
pab.first = a
pab.first.val = 2
if pab.first.val != 2:
raise RuntimeError
pci = li_std_pair.CIntPair(1,0)
a = li_std_pair.A(5)
p1 = li_std_pair.pairP1(1,a.this)
p2 = li_std_pair.pairP2(a,1)
p3 = li_std_pair.pairP3(a,a)
if a.val != li_std_pair.p_identa(p1.this)[1].val:
raise RuntimeError
p = li_std_pair.IntPair(1,10)
p.first = 1
p = li_std_pair.paircA1(1,a)
p.first
p.second
p = li_std_pair.paircA2(1,a)
pp = li_std_pair.pairiiA(1,p)

View file

@ -1,24 +1,24 @@
import li_std_string import li_std_string_extra
x="hello" x="hello"
if li_std_string.test_ccvalue(x) != x: if li_std_string_extra.test_ccvalue(x) != x:
raise RuntimeError, "bad string mapping" raise RuntimeError, "bad string mapping"
if li_std_string.test_cvalue(x) != x: if li_std_string_extra.test_cvalue(x) != x:
raise RuntimeError, "bad string mapping" raise RuntimeError, "bad string mapping"
if li_std_string.test_value(x) != x: if li_std_string_extra.test_value(x) != x:
print x, li_std_string.test_value(x) print x, li_std_string_extra.test_value(x)
raise RuntimeError, "bad string mapping" raise RuntimeError, "bad string mapping"
if li_std_string.test_const_reference(x) != x: if li_std_string_extra.test_const_reference(x) != x:
raise RuntimeError, "bad string mapping" raise RuntimeError, "bad string mapping"
s = li_std_string.string("he") s = li_std_string_extra.string("he")
#s += "ll" #s += "ll"
#s.append('o') #s.append('o')
s = s + "llo" s = s + "llo"
@ -30,21 +30,21 @@ if s != x:
if s[1:4] != x[1:4]: if s[1:4] != x[1:4]:
raise RuntimeError, "bad string mapping" raise RuntimeError, "bad string mapping"
if li_std_string.test_value(s) != x: if li_std_string_extra.test_value(s) != x:
raise RuntimeError, "bad string mapping" raise RuntimeError, "bad string mapping"
if li_std_string.test_const_reference(s) != x: if li_std_string_extra.test_const_reference(s) != x:
raise RuntimeError, "bad string mapping" raise RuntimeError, "bad string mapping"
a = li_std_string.A(s) a = li_std_string_extra.A(s)
if li_std_string.test_value(a) != x: if li_std_string_extra.test_value(a) != x:
raise RuntimeError, "bad string mapping" raise RuntimeError, "bad string mapping"
if li_std_string.test_const_reference(a) != x: if li_std_string_extra.test_const_reference(a) != x:
raise RuntimeError, "bad string mapping" raise RuntimeError, "bad string mapping"
b = li_std_string.string(" world") b = li_std_string_extra.string(" world")
s = a + b s = a + b
if a + b != "hello world": if a + b != "hello world":
@ -63,40 +63,40 @@ if c.find_last_of("l") != 9:
s = "hello world" s = "hello world"
b = li_std_string.B("hi") b = li_std_string_extra.B("hi")
b.name = li_std_string.string("hello") b.name = li_std_string_extra.string("hello")
if b.name != "hello": if b.name != "hello":
raise RuntimeError, "bad string mapping" raise RuntimeError, "bad string mapping"
b.a = li_std_string.A("hello") b.a = li_std_string_extra.A("hello")
if b.a != "hello": if b.a != "hello":
raise RuntimeError, "bad string mapping" raise RuntimeError, "bad string mapping"
if li_std_string.test_value_basic1(x) != x: if li_std_string_extra.test_value_basic1(x) != x:
raise RuntimeError, "bad string mapping" raise RuntimeError, "bad string mapping"
if li_std_string.test_value_basic2(x) != x: if li_std_string_extra.test_value_basic2(x) != x:
raise RuntimeError, "bad string mapping" raise RuntimeError, "bad string mapping"
if li_std_string.test_value_basic3(x) != x: if li_std_string_extra.test_value_basic3(x) != x:
raise RuntimeError, "bad string mapping" raise RuntimeError, "bad string mapping"
# Global variables # Global variables
s = "initial string" s = "initial string"
if li_std_string.cvar.GlobalString2 != "global string 2": if li_std_string_extra.cvar.GlobalString2 != "global string 2":
raise RuntimeError, "GlobalString2 test 1" raise RuntimeError, "GlobalString2 test 1"
li_std_string.cvar.GlobalString2 = s li_std_string_extra.cvar.GlobalString2 = s
if li_std_string.cvar.GlobalString2 != s: if li_std_string_extra.cvar.GlobalString2 != s:
raise RuntimeError, "GlobalString2 test 2" raise RuntimeError, "GlobalString2 test 2"
if li_std_string.cvar.ConstGlobalString != "const global string": if li_std_string_extra.cvar.ConstGlobalString != "const global string":
raise RuntimeError, "ConstGlobalString test" raise RuntimeError, "ConstGlobalString test"
# Member variables # Member variables
myStructure = li_std_string.Structure() myStructure = li_std_string_extra.Structure()
if myStructure.MemberString2 != "member string 2": if myStructure.MemberString2 != "member string 2":
raise RuntimeError, "MemberString2 test 1" raise RuntimeError, "MemberString2 test 1"
myStructure.MemberString2 = s myStructure.MemberString2 = s
@ -105,28 +105,28 @@ if myStructure.MemberString2 != s:
if myStructure.ConstMemberString != "const member string": if myStructure.ConstMemberString != "const member string":
raise RuntimeError, "ConstMemberString test" raise RuntimeError, "ConstMemberString test"
if li_std_string.cvar.Structure_StaticMemberString2 != "static member string 2": if li_std_string_extra.cvar.Structure_StaticMemberString2 != "static member string 2":
raise RuntimeError, "StaticMemberString2 test 1" raise RuntimeError, "StaticMemberString2 test 1"
li_std_string.cvar.Structure_StaticMemberString2 = s li_std_string_extra.cvar.Structure_StaticMemberString2 = s
if li_std_string.cvar.Structure_StaticMemberString2 != s: if li_std_string_extra.cvar.Structure_StaticMemberString2 != s:
raise RuntimeError, "StaticMemberString2 test 2" raise RuntimeError, "StaticMemberString2 test 2"
if li_std_string.cvar.Structure_ConstStaticMemberString != "const static member string": if li_std_string_extra.cvar.Structure_ConstStaticMemberString != "const static member string":
raise RuntimeError, "ConstStaticMemberString test" raise RuntimeError, "ConstStaticMemberString test"
if li_std_string.test_reference_input("hello") != "hello": if li_std_string_extra.test_reference_input("hello") != "hello":
raise RuntimeError raise RuntimeError
s = li_std_string.test_reference_inout("hello") s = li_std_string_extra.test_reference_inout("hello")
if s != "hellohello": if s != "hellohello":
raise RuntimeError raise RuntimeError
if li_std_string.stdstring_empty() != "": if li_std_string_extra.stdstring_empty() != "":
raise RuntimeError raise RuntimeError
if li_std_string.c_empty() != "": if li_std_string_extra.c_empty() != "":
raise RuntimeError raise RuntimeError
if li_std_string.c_null() != None: if li_std_string_extra.c_null() != None:
raise RuntimeError raise RuntimeError

View file

@ -10,8 +10,8 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
C_TEST_CASES = copy_struct simple_array legacy C_TEST_CASES = r_copy_struct r_legacy
CPP_TEST_CASES = double_delete CPP_TEST_CASES = r_double_delete
include $(srcdir)/../common.mk include $(srcdir)/../common.mk

View file

@ -1,12 +0,0 @@
# This file illustrates the proxy class C++ interface generated
# by SWIG.
dyn.load(paste("double_delete", .Platform$dynlib.ext, sep=""))
source("double_delete.R")
cacheMetaData(1)
# ----- Object creation -----
f <- Foo(2.0)
delete(f);
delete(f);

View file

@ -1,6 +1,6 @@
source("unittest.R") source("unittest.R")
dyn.load(paste("copy_struct", .Platform$dynlib.ext, sep="")) dyn.load(paste("r_copy_struct", .Platform$dynlib.ext, sep=""))
source("copy_struct.R") source("r_copy_struct.R")
cacheMetaData(1) cacheMetaData(1)
a <- getA() a <- getA()

View file

@ -0,0 +1,9 @@
dyn.load(paste("r_double_delete", .Platform$dynlib.ext, sep=""))
source("r_double_delete.R")
cacheMetaData(1)
# ----- Object creation -----
f <- Foo(2.0)
delete(f);
delete(f);

View file

@ -1,6 +1,6 @@
source("unittest.R") source("unittest.R")
dyn.load(paste("legacy", .Platform$dynlib.ext, sep="")) dyn.load(paste("r_legacy", .Platform$dynlib.ext, sep=""))
source("legacy.R") source("r_legacy.R")
cacheMetaData(1) cacheMetaData(1)
obj <- getObject(1,3) obj <- getObject(1,3)

View file

@ -1,4 +1,4 @@
%module copy_struct %module r_copy_struct
%feature("opaque", "yes") B; %feature("opaque", "yes") B;
%feature("opaque", "yes") C; %feature("opaque", "yes") C;

View file

@ -1,5 +1,4 @@
/* File : example.i */ %module r_double_delete
%module double_delete
%inline %{ %inline %{

View file

@ -1,4 +1,4 @@
%module legacy %module r_legacy
%inline %{ %inline %{
typedef char *String; typedef char *String;

View file

@ -10,7 +10,6 @@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
CPP_TEST_CASES = \ CPP_TEST_CASES = \
keywords \
li_cdata \ li_cdata \
li_cstring \ li_cstring \
li_factory \ li_factory \
@ -20,11 +19,14 @@ CPP_TEST_CASES = \
li_std_queue \ li_std_queue \
li_std_set \ li_std_set \
li_std_stack \ li_std_stack \
naming \
primitive_types \ primitive_types \
std_containers \ ruby_keywords \
track_objects \ ruby_naming \
track_objects_directors ruby_track_objects \
ruby_track_objects_directors \
std_containers
# ruby_li_std_speed
# stl_new
C_TEST_CASES += \ C_TEST_CASES += \
li_cdata \ li_cdata \
@ -39,7 +41,7 @@ SWIGOPT += -w801 -noautorename -features autodoc=4
# Rules for the different types of tests # Rules for the different types of tests
# make sure -autorename is true for the naming test # make sure -autorename is true for the naming test
naming.cpptest: SWIGOPT = -autorename ruby_naming.cpptest: SWIGOPT += -autorename
%.cpptest: %.cpptest:
$(setup) $(setup)

View file

@ -9,9 +9,9 @@
require 'swig_assert' require 'swig_assert'
require 'keywords' require 'ruby_keywords'
kw = Keywords::Keywords.new kw = Ruby_keywords::Keywords.new
if kw.alias != 'alias' then if kw.alias != 'alias' then
raise RuntimeError, 'Keyword method did not work: alias' raise RuntimeError, 'Keyword method did not work: alias'

View file

@ -10,8 +10,8 @@
require 'benchmark' require 'benchmark'
require 'mathn' require 'mathn'
require 'li_std_speed' require 'ruby_li_std_speed'
include Li_std_speed include Ruby_li_std_speed
def benchmark(f, phigh, sequences) def benchmark(f, phigh, sequences)

View file

@ -9,86 +9,86 @@
require 'swig_assert' require 'swig_assert'
require 'naming' require 'ruby_naming'
# Check class names # Check class names
if not Naming if not Ruby_naming
raise RuntimeError, 'Invalid module name for Naming' raise RuntimeError, 'Invalid module name for Ruby_naming'
end end
if not Naming::MyClass if not Ruby_naming::MyClass
raise RuntimeError, 'Invalid class name for MyClass' raise RuntimeError, 'Invalid class name for MyClass'
end end
# Check constant names / values # Check constant names / values
if Naming::CONSTANT1 != 1 if Ruby_naming::CONSTANT1 != 1
raise RuntimeError, "Incorrect value for CONSTANT1" raise RuntimeError, "Incorrect value for CONSTANT1"
end end
if Naming::CONSTANT2 != 2 if Ruby_naming::CONSTANT2 != 2
raise RuntimeError, "Incorrect value for CONSTANT2" raise RuntimeError, "Incorrect value for CONSTANT2"
end end
# Check constant names / values # Check constant names / values
if Naming::CONSTANT3 != 3 if Ruby_naming::CONSTANT3 != 3
raise RuntimeError, "Incorrect value for CONSTANT3" raise RuntimeError, "Incorrect value for CONSTANT3"
end end
if not Naming::methods.include?("constant4") if not Ruby_naming::methods.include?("constant4")
raise RuntimeError, "Incorrect mapping for constant4" raise RuntimeError, "Incorrect mapping for constant4"
end end
if not Naming::methods.include?("constant5") if not Ruby_naming::methods.include?("constant5")
raise RuntimeError, "Incorrect mapping for constant5" raise RuntimeError, "Incorrect mapping for constant5"
end end
if not Naming::methods.include?("constant6") if not Ruby_naming::methods.include?("constant6")
raise RuntimeError, "Incorrect mapping for constant6" raise RuntimeError, "Incorrect mapping for constant6"
end end
if not Naming::TestConstants.instance_methods.include?("constant7") if not Ruby_naming::TestConstants.instance_methods.include?("constant7")
raise RuntimeError, "Incorrect mapping for constant7" raise RuntimeError, "Incorrect mapping for constant7"
end end
if not Naming::TestConstants.methods.include?("constant8") if not Ruby_naming::TestConstants.methods.include?("constant8")
raise RuntimeError, "Incorrect mapping for constant8" raise RuntimeError, "Incorrect mapping for constant8"
end end
# There is no constant9 because it is illegal C++ # There is no constant9 because it is illegal C++
#if not Naming::TestConstants.instance_methods.include?("constant9") #if not Ruby_naming::TestConstants.instance_methods.include?("constant9")
# raise RuntimeError, "Incorrect mapping for constant9" # raise RuntimeError, "Incorrect mapping for constant9"
#end #end
if Naming::TestConstants::CONSTANT10 != 10 if Ruby_naming::TestConstants::CONSTANT10 != 10
raise RuntimeError, "Incorrect value for CONSTANT10" raise RuntimeError, "Incorrect value for CONSTANT10"
end end
if not Naming::methods.include?("constant11") if not Ruby_naming::methods.include?("constant11")
raise RuntimeError, "Incorrect mapping for constant11" raise RuntimeError, "Incorrect mapping for constant11"
end end
# Check enums # Check enums
if Naming::constants.include?("Color") if Ruby_naming::constants.include?("Color")
raise RuntimeError, "Color enum should not be exposed to Ruby" raise RuntimeError, "Color enum should not be exposed to Ruby"
end end
if Naming::Red != 0 if Ruby_naming::Red != 0
raise RuntimeError, "Incorrect value for enum RED" raise RuntimeError, "Incorrect value for enum RED"
end end
if Naming::Green != 1 if Ruby_naming::Green != 1
raise RuntimeError, "Incorrect value for enum GREEN" raise RuntimeError, "Incorrect value for enum GREEN"
end end
if Naming::Blue != 2 if Ruby_naming::Blue != 2
raise RuntimeError, "Incorrect value for enum BLUE" raise RuntimeError, "Incorrect value for enum BLUE"
end end
# Check method names # Check method names
my_class = Naming::MyClass.new() my_class = Ruby_naming::MyClass.new()
if my_class.method_one != 1 if my_class.method_one != 1
raise RuntimeError, "Incorrect value for method_one" raise RuntimeError, "Incorrect value for method_one"

View file

@ -9,9 +9,9 @@
require 'swig_assert' require 'swig_assert'
require 'track_objects_directors' require 'ruby_track_objects_directors'
class MyFoo < Track_objects_directors::Foo class MyFoo < Ruby_track_objects_directors::Foo
def ping def ping
"MyFoo::ping()" "MyFoo::ping()"
end end
@ -22,12 +22,12 @@ a = MyFoo.new
raise RuntimeError if a.ping != "MyFoo::ping()" raise RuntimeError if a.ping != "MyFoo::ping()"
raise RuntimeError if a.pong != "Foo::pong();MyFoo::ping()" raise RuntimeError if a.pong != "Foo::pong();MyFoo::ping()"
b = Track_objects_directors::Foo.new b = Ruby_track_objects_directors::Foo.new
raise RuntimeError if b.ping != "Foo::ping()" raise RuntimeError if b.ping != "Foo::ping()"
raise RuntimeError if b.pong != "Foo::pong();Foo::ping()" raise RuntimeError if b.pong != "Foo::pong();Foo::ping()"
container = Track_objects_directors::Container.new container = Ruby_track_objects_directors::Container.new
foo = MyFoo.new foo = MyFoo.new
container.set_foo(foo) container.set_foo(foo)

View file

@ -9,7 +9,7 @@
require 'swig_assert' require 'swig_assert'
require 'track_objects' require 'ruby_track_objects'
def test_same_ruby_object(foo1, foo2) def test_same_ruby_object(foo1, foo2)
if not foo1.equal?(foo2) if not foo1.equal?(foo2)
@ -23,12 +23,12 @@ def test_same_cpp_object(foo1, foo2)
end end
end end
bar = Track_objects::Bar.new bar = Ruby_track_objects::Bar.new
foo1 = Track_objects::Foo.new() foo1 = Ruby_track_objects::Foo.new()
bar.set_unowned_foo(foo1) bar.set_unowned_foo(foo1)
# test_simple_identity # test_simple_identity
foo2 = Track_objects::Foo.new() foo2 = Ruby_track_objects::Foo.new()
foo3 = foo2 foo3 = foo2
test_same_ruby_object(foo2, foo3) test_same_ruby_object(foo2, foo3)
@ -48,8 +48,8 @@ test_same_ruby_object(foo5, foo6)
test_same_cpp_object(foo5, foo6) test_same_cpp_object(foo5, foo6)
# test_new_foo_identity # test_new_foo_identity
foo7 = Track_objects::Bar.get_new_foo() foo7 = Ruby_track_objects::Bar.get_new_foo()
foo8 = Track_objects::Bar.get_new_foo() foo8 = Ruby_track_objects::Bar.get_new_foo()
if foo7.equal?(foo8) if foo7.equal?(foo8)
raise "Ruby objects should be different." raise "Ruby objects should be different."
@ -60,7 +60,7 @@ if foo7.cpp_equal(foo8)
end end
# test_set_owned_identity # test_set_owned_identity
foo9 = Track_objects::Foo.new foo9 = Ruby_track_objects::Foo.new
bar.set_owned_foo(foo9) bar.set_owned_foo(foo9)
foo10 = bar.get_owned_foo() foo10 = bar.get_owned_foo()
@ -69,7 +69,7 @@ test_same_cpp_object(foo9, foo10)
# test_set_owned_identity2 # test_set_owned_identity2
begin begin
foo11 = Track_objects::Foo.new foo11 = Ruby_track_objects::Foo.new
bar.set_owned_foo(foo11) bar.set_owned_foo(foo11)
foo11 = nil foo11 = nil
end end
@ -90,20 +90,20 @@ test_same_ruby_object(foo13, foo14)
test_same_cpp_object(foo13, foo14) test_same_cpp_object(foo13, foo14)
# Now create the factory # Now create the factory
factory = Track_objects::Factory.new factory = Ruby_track_objects::Factory.new
# Create itemA which is really an itemB # Create itemA which is really an itemB
itemA = factory.createItem itemA = factory.createItem
# Check class # Check class
if itemA.class != Track_objects::ItemA if itemA.class != Ruby_track_objects::ItemA
raise RuntimeError, 'Item should have an ItemA class' raise RuntimeError, 'Item should have an ItemA class'
end end
# Now downcast # Now downcast
itemB = Track_objects.downcast(itemA) itemB = Ruby_track_objects.downcast(itemA)
if itemB.class != Track_objects::ItemB if itemB.class != Ruby_track_objects::ItemB
raise RuntimeError, 'Item should have an ItemB class' raise RuntimeError, 'Item should have an ItemB class'
end end

View file

@ -1,4 +1,4 @@
%module keywords %module ruby_keywords
// fix up conflicts with C++ keywords // fix up conflicts with C++ keywords
%rename("and") Keywords::and_; %rename("and") Keywords::and_;

View file

@ -1,5 +1,5 @@
/** /**
* @file li_std_speed.i * @file ruby_li_std_speed.i
* @author gga * @author gga
* @date Fri May 18 18:03:15 2007 * @date Fri May 18 18:03:15 2007
* *
@ -8,7 +8,7 @@
* *
*/ */
%module li_std_speed %module ruby_li_std_speed
%include <std_list.i> %include <std_list.i>
%include <std_vector.i> %include <std_vector.i>

View file

@ -1,4 +1,4 @@
%module naming %module ruby_naming
%predicate predicateMethod(); %predicate predicateMethod();
%bang bangMethod(); %bang bangMethod();

View file

@ -1,4 +1,4 @@
%module track_objects %module ruby_track_objects
%include typemaps.i %include typemaps.i

View file

@ -1,4 +1,4 @@
%module(directors="1") track_objects_directors %module(directors="1") ruby_track_objects_directors
%{ %{
#include <string> #include <string>

View file

@ -11,15 +11,12 @@ top_builddir = @top_builddir@
CPP_TEST_CASES += \ CPP_TEST_CASES += \
primitive_types \ primitive_types \
li_cdata \
li_cstring \ li_cstring \
li_cwstring li_cwstring
C_TEST_CASES += \ C_TEST_CASES += \
li_cdata \
li_cstring \ li_cstring \
li_cwstring \ li_cwstring
union
include $(srcdir)/../common.mk include $(srcdir)/../common.mk

0
Examples/test-suite/tcl/union_runme.tcl Executable file → Normal file
View file