diff --git a/Examples/GIFPlot/Java/shadow/Makefile b/Examples/GIFPlot/Java/shadow/Makefile index e513b9b5a..8062c2700 100644 --- a/Examples/GIFPlot/Java/shadow/Makefile +++ b/Examples/GIFPlot/Java/shadow/Makefile @@ -1,8 +1,9 @@ TOP = ../../.. SWIG = $(TOP)/../swig -SWIGOPT = -I../../Interface +SWIGOPT = -outcurrentdir SRCS = TARGET = gifplot +INTERFACEDIR = ../../Interface/ INTERFACE = gifplot.i LIBS = -L../.. -lgifplot INCLUDES = -I../../Include @@ -10,7 +11,7 @@ INCLUDES = -I../../Include all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' java javac *.java clean:: diff --git a/Examples/GIFPlot/Perl5/shadow/Makefile b/Examples/GIFPlot/Perl5/shadow/Makefile index c5cb7aec4..c39eac52c 100644 --- a/Examples/GIFPlot/Perl5/shadow/Makefile +++ b/Examples/GIFPlot/Perl5/shadow/Makefile @@ -1,8 +1,9 @@ TOP = ../../.. SWIG = $(TOP)/../swig -SWIGOPT = -I../../Interface +SWIGOPT = -outcurrentdir SRCS = TARGET = gifplot +INTERFACEDIR = ../../Interface/ INTERFACE = gifplot.i LIBS = -L../.. -lgifplot -lm INCLUDES = -I../../Include @@ -10,12 +11,12 @@ INCLUDES = -I../../Include all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' perl5 + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' perl5 static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='myperl' INTERFACE='$(INTERFACE)' perl5_static + TARGET='myperl' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' perl5_static clean:: $(MAKE) -f $(TOP)/Makefile perl5_clean diff --git a/Examples/GIFPlot/Python/shadow/Makefile b/Examples/GIFPlot/Python/shadow/Makefile index 73fca9673..3ae9a9897 100644 --- a/Examples/GIFPlot/Python/shadow/Makefile +++ b/Examples/GIFPlot/Python/shadow/Makefile @@ -1,8 +1,9 @@ TOP = ../../.. SWIG = $(TOP)/../preinst-swig -SWIGOPT = -I../../Interface +SWIGOPT = -outcurrentdir SRCS = TARGET = gifplot +INTERFACEDIR = ../../Interface/ INTERFACE = gifplot.i LIBS = -L../.. -lgifplot INCLUDES = -I../../Include @@ -10,12 +11,12 @@ INCLUDES = -I../../Include all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' python static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='mypython' INTERFACE='$(INTERFACE)' python_static + TARGET='mypython' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' python_static clean:: $(MAKE) -f $(TOP)/Makefile python_clean diff --git a/Examples/GIFPlot/Ruby/shadow/Makefile b/Examples/GIFPlot/Ruby/shadow/Makefile index ea382ea88..8cbea2a57 100644 --- a/Examples/GIFPlot/Ruby/shadow/Makefile +++ b/Examples/GIFPlot/Ruby/shadow/Makefile @@ -1,8 +1,9 @@ TOP = ../../.. SWIG = $(TOP)/../swig -SWIGOPT = -I../../Interface +SWIGOPT = -outcurrentdir SRCS = TARGET = gifplot +INTERFACEDIR = ../../Interface/ INTERFACE = gifplot.i LIBS = -L../.. -lgifplot INCLUDES = -I../../Include @@ -10,12 +11,12 @@ INCLUDES = -I../../Include all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' ruby static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ INCLUDES='$(INCLUDES)' LIBS='$(LIBS)' SWIGOPT='$(SWIGOPT)' \ - TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static + TARGET='myruby' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' ruby_static clean:: $(MAKE) -f $(TOP)/Makefile ruby_clean diff --git a/Examples/Makefile.in b/Examples/Makefile.in index c0ced7022..5dbf8b6b7 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -12,11 +12,11 @@ # certain packages have been installed. Set the prefixes # accordingly. # -# 2. To use this makefile, simply set SRCS, INTERFACE, INCLUDES, LIBS, -# TARGET, and do a +# 2. To use this makefile, set required varibles, eg SRCS, INTERFACE, +# INTERFACEDIR, INCLUDES, LIBS, TARGET, and do a # $(MAKE) -f Makefile.template.in SRCS='$(SRCS)' \ # INCLUDES='$(INCLUDES) LIBS='$(LIBS)' INTERFACE='$(INTERFACE)' \ -# TARGET='$(TARGET)' method +# INTERFACEDIR='$(INTERFACEDIR)' TARGET='$(TARGET)' method # # 'method' describes what is being built. #--------------------------------------------------------------- @@ -31,6 +31,8 @@ SRCS = INCLUDES = LIBS = INTERFACE = +INTERFACEDIR = +INTERFACEPATH = $(INTERFACEDIR)$(INTERFACE) SWIGOPT = SWIG = swig @@ -105,12 +107,12 @@ TCLCXXSHARED = @TCLCXXSHARED@ 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) \ $(TCL_LIB) $(TCL_OPTS) $(LIBS) $(SYSLIBS) -o $(TARGET) 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) \ $(TCL_LIB) $(TCL_OPTS) $(LIBS) $(SYSLIBS) -o $(TARGET) @@ -119,13 +121,13 @@ tclsh_cpp: $(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) \ $(XINCLUDE) $(TCL_LIB) $(TK_OPTS) $(XLIB) $(LIBS) $(SYSLIBS) -o $(TARGET) 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) \ $(XINCLUDE) $(TCL_LIB) $(TK_OPTS) $(XLIB) $(LIBS) $(SYSLIBS) -o $(TARGET) @@ -134,7 +136,7 @@ wish_cpp: $(SRCS) # ----------------------------------------------------------- tcl: $(SRCS) - $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE) + $(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(TCL_INCLUDE) $(TCLLDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) @@ -143,7 +145,7 @@ tcl: $(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) $(TCLCXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) @@ -175,7 +177,7 @@ PERL5_CCFLAGS = @PERL5CCFLAGS@ # ---------------------------------------------------------------- perl5: $(SRCS) - $(SWIG) -perl5 $(SWIGOPT) $(INTERFACE) + $(SWIG) -perl5 $(SWIGOPT) $(INTERFACEPATH) $(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) @@ -184,7 +186,7 @@ perl5: $(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) $(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_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) 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) # ----------------------------------------------------------------- @@ -255,7 +257,7 @@ endif # ---------------------------------------------------------------- python: $(SRCS) - $(SWIGPYTHON) $(SWIGOPT) $(INTERFACE) + $(SWIGPYTHON) $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(PYTHON_INCLUDE) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PYTHON_DLNK) $(LIBS) -o $(LIBPREFIX)_$(TARGET)$(PYTHON_SO) @@ -264,7 +266,7 @@ python: $(SRCS) # ----------------------------------------------------------------- python_cpp: $(SRCS) - $(SWIGPYTHON) -c++ $(SWIGOPT) $(INTERFACE) + $(SWIGPYTHON) -c++ $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(PYTHON_INCLUDE) $(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_static: $(SRCS) - $(SWIGPYTHON) -lembed.i $(SWIGOPT) $(INTERFACE) + $(SWIGPYTHON) -lembed.i $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) @LINKFORSHARED@ $(ISRCS) $(SRCS) $(INCLUDES) \ $(PYTHON_INCLUDE) $(LIBS) -L$(PYTHON_LIB) $(PYTHON_LIBOPTS) -o $(TARGET) python_static_cpp: $(SRCS) - $(SWIGPYTHON) -c++ -lembed.i $(SWIGOPT) $(INTERFACE) + $(SWIGPYTHON) -c++ -lembed.i $(SWIGOPT) $(INTERFACEPATH) $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(PYTHON_INCLUDE) $(LIBS) -L$(PYTHON_LIB) $(PYTHON_LIBOPTS) -o $(TARGET) @@ -336,7 +338,7 @@ OCTAVE_SO = @OCTAVE_SO@ # ---------------------------------------------------------------- octave: $(SRCS) - $(SWIG) -octave $(SWIGOPT) $(INTERFACE) + $(SWIG) -octave $(SWIGOPT) $(INTERFACEPATH) $(CXX) -g -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(CXXSRCS) $(INCLUDES) -I$(OCTAVE_INCLUDE) $(CC) -g -c $(CCSHARED) $(CFLAGS) $(SRCS) $(INCLUDES) $(OCTAVE_INCLUDE) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(OCTAVE_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(OCTAVE_SO) @@ -346,7 +348,7 @@ octave: $(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) $(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 #------------------------------------------------------------------ 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) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) 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) $(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 #------------------------------------------------------------------ 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) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) 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) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) @@ -403,12 +405,12 @@ guile_gh_cpp: $(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) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) 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) $(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_static: $(SRCS) - $(SWIG) -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACE) + $(SWIG) -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) \ -DSWIGINIT="SCM scm_init_$(TARGET)_module(void); scm_init_$(TARGET)_module();" \ $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile 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) \ -DSWIGINIT="SCM scm_init_$(TARGET)_module(void); scm_init_$(TARGET)_module();" \ $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile guile_simple: $(SRCS) - $(SWIG) -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACE) + $(SWIG) -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) \ $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile 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) \ $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile @@ -471,7 +473,7 @@ JAVACFLAGS = @JAVACFLAGS@ # ---------------------------------------------------------------- java: $(SRCS) - $(SWIG) -java $(SWIGOPT) $(INTERFACE) + $(SWIG) -java $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(JAVACFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(JAVA_INCLUDE) $(JAVALDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO) @@ -480,7 +482,7 @@ java: $(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) $(JAVACXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO) @@ -504,12 +506,12 @@ MODULA3_INCLUDE= @MODULA3INC@ # ---------------------------------------------------------------- modula3: $(SRCS) - $(SWIG) -modula3 $(SWIGOPT) $(INTERFACE) + $(SWIG) -modula3 $(SWIGOPT) $(INTERFACEPATH) # $(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) \ # $(OBJS) $(IOBJS) $(LIBS) modula3_cpp: $(SRCS) - $(SWIG) -modula3 -c++ $(SWIGOPT) $(INTERFACE) + $(SWIG) -modula3 -c++ $(SWIGOPT) $(INTERFACEPATH) # ----------------------------------------------------------------- # Cleaning the modula3 examples @@ -533,12 +535,12 @@ MZSCHEME_SO = @MZSCHEME_SO@ # ---------------------------------------------------------------- mzscheme: $(SRCS) - $(SWIG) -mzscheme $(SWIGOPT) $(INTERFACE) + $(SWIG) -mzscheme $(SWIGOPT) $(INTERFACEPATH) $(MZC) `echo $(INCLUDES) | sed 's/-I/++ccf -I/g'` --cc $(ISRCS) $(SRCS) $(MZC) --ld $(TARGET)$(MZSCHEME_SO) $(OBJS) $(IOBJS) 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) $(CXXSHARED) $(CFLAGS) -o $(LIBPREFIX)$(TARGET)$(MZSCHEME_SO) $(OBJS) $(IOBJS) $(MZDYNOBJ) $(CPP_DLLIBS) @@ -573,7 +575,7 @@ OCAMLCORE=\ ocaml_static: $(SRCS) $(OCAMLCORE) - $(SWIG) -ocaml $(SWIGOPT) $(INTERFACE) + $(SWIG) -ocaml $(SWIGOPT) $(INTERFACEPATH) $(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS) $(OCC) -g -c $(INTERFACE:%.i=%.mli) $(OCC) -g -c $(INTERFACE:%.i=%.ml) @@ -587,7 +589,7 @@ ocaml_static: $(SRCS) ocaml_dynamic: $(SRCS) $(OCAMLCORE) - $(SWIG) -ocaml $(SWIGOPT) $(INTERFACE) + $(SWIG) -ocaml $(SWIGOPT) $(INTERFACEPATH) $(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS) $(CXXSHARED) $(CFLAGS) $(CCSHARED) $(CFLAGS) -o $(INTERFACE:%.i=%@SO@) \ $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) $(LIBS) @@ -606,7 +608,7 @@ ocaml_dynamic: $(SRCS) ocaml_static_toplevel: $(SRCS) $(OCAMLCORE) - $(SWIG) -ocaml $(SWIGOPT) $(INTERFACE) + $(SWIG) -ocaml $(SWIGOPT) $(INTERFACEPATH) $(OCC) -g -c -ccopt -g -ccopt "$(INCLUDES)" $(ISRCS) $(SRCS) $(OCC) -g -c $(INTERFACE:%.i=%.mli) $(OCC) -g -c $(INTERFACE:%.i=%.ml) @@ -621,7 +623,7 @@ ocaml_static_toplevel: $(SRCS) ocaml_static_cpp: $(SRCS) $(OCAMLCORE) - $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACE) + $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACEPATH) cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c) $(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \ $(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS) @@ -638,7 +640,7 @@ ocaml_static_cpp: $(SRCS) ocaml_static_cpp_toplevel: $(SRCS) $(OCAMLCORE) - $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACE) + $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACEPATH) cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c) $(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \ $(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS) @@ -656,7 +658,7 @@ ocaml_static_cpp_toplevel: $(SRCS) ocaml_dynamic_cpp: $(SRCS) $(OCAMLCORE) - $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACE) + $(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACEPATH) cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c) $(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \ $(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS) -ccopt -fPIC @@ -697,7 +699,7 @@ RUBY_DLNK = @RUBYDYNAMICLINKING@ # ---------------------------------------------------------------- ruby: $(SRCS) - $(SWIG) -ruby $(SWIGOPT) $(INTERFACE) + $(SWIG) -ruby $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(RUBY_CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(RUBY_INCLUDE) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(RUBY_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -706,7 +708,7 @@ ruby: $(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) $(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_static: $(SRCS) - $(SWIG) -ruby -lembed.i $(SWIGOPT) $(INTERFACE) + $(SWIG) -ruby -lembed.i $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) $(RUBY_CFLAGS) @LINKFORSHARED@ $(ISRCS) $(SRCS) $(INCLUDES) \ $(RUBY_INCLUDE) $(LIBS) -L$(RUBY_LIB) $(RUBY_LIBOPTS) -o $(TARGET) 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) \ $(RUBY_INCLUDE) $(LIBS) -L$(RUBY_LIB) $(RUBY_LIBOPTS) -o $(TARGET) @@ -751,7 +753,7 @@ PHP4_INCLUDE = @PHP4INC@ PHP4_SO = @PHP4_SO@ php4: $(SRCS) - $(SWIG) -php5 $(SWIGOPT) $(INTERFACE) + $(SWIG) -php5 $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PHP4_INCLUDE) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(PHP4_SO) @@ -760,7 +762,7 @@ php4: $(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) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(PHP4_SO) @@ -798,7 +800,7 @@ PIKE_DLNK = @PIKEDYNAMICLINKING@ # ---------------------------------------------------------------- pike: $(SRCS) - $(SWIG) -pike $(SWIGOPT) $(INTERFACE) + $(SWIG) -pike $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(PIKE_CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(PIKE_INCLUDE) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PIKE_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -807,7 +809,7 @@ pike: $(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) $(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_static: $(SRCS) - $(SWIG) -pike -lembed.i $(SWIGOPT) $(INTERFACE) + $(SWIG) -pike -lembed.i $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) $(PIKE_CFLAGS) @LINKFORSHARED@ $(ISRCS) $(SRCS) $(INCLUDES) \ $(PIKE_INCLUDE) $(LIBS) -L$(PIKE_LIB) $(PIKE_LIBOPTS) -o $(TARGET) 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) \ $(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 chicken_direct: $(SRCS) - $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) + $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH) $(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \ -dynamic -feature chicken-compile-shared \ -output-file $(CHICKEN_COMPILED_SCHEME) @@ -878,7 +880,7 @@ chicken_direct: $(SRCS) $(LIBS) $(CHICKEN_SHAREDLIBOPTS) -o $(LIBPREFIX)$(TARGET)$(SO) chicken_direct_cpp: $(CXXSRCS) $(CHICKSRCS) - $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) + $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH) $(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \ -dynamic -feature chicken-compile-shared \ -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 chicken_static: $(SRCS) $(CHICKSRCS) - $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) + $(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH) $(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \ -output-file $(CHICKEN_COMPILED_SCHEME) $(CHICKEN) $(CHICKEN_MAIN) $(CHICKENOPTS) \ @@ -905,7 +907,7 @@ chicken_static: $(SRCS) $(CHICKSRCS) $(OBJS) $(IOBJS) $(LIBS) $(CHICKEN_SHAREDLIBOPTS) -o $(TARGET) chicken_static_cpp: $(CXXSRCS) $(CHICKSRCS) - $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE) + $(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACEPATH) $(CHICKEN) $(CHICKEN_GENERATED_SCHEME) $(CHICKENOPTS) \ -output-file $(CHICKEN_COMPILED_SCHEME) $(CHICKEN) $(CHICKEN_MAIN) $(CHICKENOPTS) \ @@ -921,11 +923,11 @@ chicken_static_cpp: $(CXXSRCS) $(CHICKSRCS) # ---------------------------------------------------------------- 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) 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) chicken_externalhdr: @@ -953,7 +955,7 @@ CSHARPSO = @CSHARPSO@ # ---------------------------------------------------------------- csharp: $(SRCS) - $(SWIG) -csharp $(SWIGOPT) $(INTERFACE) + $(SWIG) -csharp $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(CSHARPCFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(CSHARP_DLNK) $(LIBS) -o $(CSHARP_LIBPREFIX)$(TARGET)$(CSHARPSO) @@ -962,7 +964,7 @@ csharp: $(SRCS) # ---------------------------------------------------------------- csharp_cpp: $(SRCS) - $(SWIG) -csharp -c++ $(SWIGOPT) $(INTERFACE) + $(SWIG) -csharp -c++ $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(CSHARPCFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(CSHARP_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(CSHARP_LIBPREFIX)$(TARGET)$(CSHARPSO) @@ -1002,7 +1004,7 @@ LUA_INTERP = ../lua.c # ---------------------------------------------------------------- lua: $(SRCS) - $(SWIG) -lua $(SWIGOPT) $(INTERFACE) + $(SWIG) -lua $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) $(LUA_INCLUDE) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(LUA_LIB) -o $(LIBPREFIX)$(TARGET)$(LUA_SO) @@ -1011,7 +1013,7 @@ lua: $(SRCS) # ----------------------------------------------------------------- lua_cpp: $(SRCS) - $(SWIG) -c++ -lua $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -lua $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(LUA_INCLUDE) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(LUA_LIB) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(LUA_SO) @@ -1020,12 +1022,12 @@ lua_cpp: $(SRCS) # ----------------------------------------------------------------- lua_static: $(SRCS) - $(SWIG) -lua -module example $(SWIGOPT) $(INTERFACE) + $(SWIG) -lua -module example $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(LUA_INTERP) $(INCLUDES) \ $(LUA_INCLUDE) $(LIBS) $(LUA_LIB) -o $(TARGET) 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) \ $(LUA_INCLUDE) $(LIBS) $(LUA_LIB) -o $(TARGET) @@ -1043,12 +1045,12 @@ lua_clean: ################################################################## allegrocl: $(SRCS) - $(SWIG) -allegrocl -cwrap $(SWIGOPT) $(INTERFACE) + $(SWIG) -allegrocl -cwrap $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) allegrocl_cpp: $(SRCS) - $(SWIG) -c++ -allegrocl $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -allegrocl $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -1062,10 +1064,10 @@ allegrocl_clean: ################################################################## clisp: $(SRCS) - $(SWIG) -clisp $(SWIGOPT) $(INTERFACE) + $(SWIG) -clisp $(SWIGOPT) $(INTERFACEPATH) clisp_cpp: $(SRCS) - $(SWIG) -c++ -clisp $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -clisp $(SWIGOPT) $(INTERFACEPATH) clisp_clean: rm -f *_wrap* *~ .~* @@ -1077,12 +1079,12 @@ clisp_clean: ################################################################## cffi: $(SRCS) - $(SWIG) -cffi $(SWIGOPT) $(INTERFACE) + $(SWIG) -cffi $(SWIGOPT) $(INTERFACEPATH) # $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS) # $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) cffi_cpp: $(SRCS) - $(SWIG) -c++ -cffi $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -cffi $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) @@ -1096,12 +1098,12 @@ cffi_clean: ################################################################## uffi: $(SRCS) - $(SWIG) -uffi $(SWIGOPT) $(INTERFACE) + $(SWIG) -uffi $(SWIGOPT) $(INTERFACEPATH) # $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS) # $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) uffi_cpp: $(SRCS) - $(SWIG) -c++ -uffi $(SWIGOPT) $(INTERFACE) + $(SWIG) -c++ -uffi $(SWIGOPT) $(INTERFACEPATH) # $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) # $(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) 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) ) 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) ) r_clean: diff --git a/Examples/test-suite/chicken/Makefile.in b/Examples/test-suite/chicken/Makefile.in index ef6d7056c..764518880 100644 --- a/Examples/test-suite/chicken/Makefile.in +++ b/Examples/test-suite/chicken/Makefile.in @@ -19,7 +19,7 @@ SKIP_CPP_STD_CASES = Yes CPP_TEST_CASES += li_std_string -EXTRA_TEST_CASES += ext_test.externaltest +EXTRA_TEST_CASES += chicken_ext_test.externaltest include $(srcdir)/../common.mk diff --git a/Examples/test-suite/chicken/ext_test_runme.ss b/Examples/test-suite/chicken/chicken_ext_test_runme.ss similarity index 57% rename from Examples/test-suite/chicken/ext_test_runme.ss rename to Examples/test-suite/chicken/chicken_ext_test_runme.ss index ea3eaa487..65fa4e085 100644 --- a/Examples/test-suite/chicken/ext_test_runme.ss +++ b/Examples/test-suite/chicken/chicken_ext_test_runme.ss @@ -1,4 +1,4 @@ -(load "ext_test.so") +(load "chicken_ext_test.so") (define a (test-create)) diff --git a/Examples/test-suite/chicken/ext_test.i b/Examples/test-suite/chicken_ext_test.i similarity index 94% rename from Examples/test-suite/chicken/ext_test.i rename to Examples/test-suite/chicken_ext_test.i index e8f5930df..b4f726cc7 100644 --- a/Examples/test-suite/chicken/ext_test.i +++ b/Examples/test-suite/chicken_ext_test.i @@ -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 */ %{ diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index 8e525d9ed..4bfd53aba 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -59,11 +59,12 @@ CXXSRCS = CSRCS = TARGETPREFIX = TARGETSUFFIX = -SWIGOPT = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$(LANGUAGE) -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) -DSWIG_NOEXTRA_QUALIFICATION -INCLUDES = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$(LANGUAGE) -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) +SWIGOPT = -outcurrentdir -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) +INCLUDES = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE) LIBS = -L. LIBPREFIX = lib ACTION = check +INTERFACEDIR = ../ # # Please keep test cases in alphabetical order. @@ -405,6 +406,7 @@ CPP_STD_TEST_CASES += \ template_typedef_fnc \ template_type_namespace \ template_opaque +# li_std_list ifndef SKIP_CPP_STD_CASES @@ -441,11 +443,13 @@ C_TEST_CASES += \ overload_extendc \ preproc \ ret_by_value \ + simple_array \ sizeof_pointer \ sneaky1 \ struct_rename \ typedef_struct \ typemap_subst \ + union \ unions @@ -491,14 +495,14 @@ swig_and_compile_cpp = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \ - TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACE="$*.i" \ + TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \ $(LANGUAGE)$(VARIANT)_cpp swig_and_compile_c = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CSRCS="$(CSRCS)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \ - TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACE="$*.i" \ + TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \ $(LANGUAGE)$(VARIANT) swig_and_compile_multi_cpp = \ @@ -506,7 +510,7 @@ swig_and_compile_multi_cpp = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBS='$(LIBS)' \ 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; \ done @@ -518,7 +522,7 @@ swig_and_compile_external = \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS) $*_external.cxx" \ SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \ INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \ - TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACE="$*.i" \ + TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \ $(LANGUAGE)$(VARIANT)_cpp swig_and_compile_runtime = \ diff --git a/Examples/test-suite/csharp/Makefile.in b/Examples/test-suite/csharp/Makefile.in index f269b3276..5fb547f3f 100644 --- a/Examples/test-suite/csharp/Makefile.in +++ b/Examples/test-suite/csharp/Makefile.in @@ -29,6 +29,7 @@ include $(srcdir)/../common.mk # Overridden variables here SWIGOPT += -namespace $*Namespace $(SWIGOPTSPECIAL) +INTERFACEDIR = ../../ CSHARPFLAGSSPECIAL = diff --git a/Examples/test-suite/guilescm/Makefile.in b/Examples/test-suite/guilescm/Makefile.in index 04de236db..501a387f7 100644 --- a/Examples/test-suite/guilescm/Makefile.in +++ b/Examples/test-suite/guilescm/Makefile.in @@ -2,7 +2,7 @@ # Makefile for guile test-suite (with SCM API) ####################################################################### -EXTRA_TEST_CASES += ext_test.externaltest +EXTRA_TEST_CASES += guilescm_ext_test.externaltest include ../guile/Makefile diff --git a/Examples/test-suite/guilescm/ext_test_runme.scm b/Examples/test-suite/guilescm/guilescm_ext_test_runme.scm similarity index 82% rename from Examples/test-suite/guilescm/ext_test_runme.scm rename to Examples/test-suite/guilescm/guilescm_ext_test_runme.scm index 67add849e..ff3df064b 100644 --- a/Examples/test-suite/guilescm/ext_test_runme.scm +++ b/Examples/test-suite/guilescm/guilescm_ext_test_runme.scm @@ -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 ; If IsPointer is called before TypeQuery, the test-is-pointer will fail diff --git a/Examples/test-suite/guilescm/ext_test.i b/Examples/test-suite/guilescm_ext_test.i similarity index 93% rename from Examples/test-suite/guilescm/ext_test.i rename to Examples/test-suite/guilescm_ext_test.i index 8b117bb5a..fd5655d4f 100644 --- a/Examples/test-suite/guilescm/ext_test.i +++ b/Examples/test-suite/guilescm_ext_test.i @@ -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 */ %{ diff --git a/Examples/test-suite/octave/implicittest.i b/Examples/test-suite/implicittest.i similarity index 100% rename from Examples/test-suite/octave/implicittest.i rename to Examples/test-suite/implicittest.i diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index ace8dee86..a2986258e 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -37,6 +37,7 @@ include $(srcdir)/../common.mk # Overridden variables here SWIGOPT += -package $* +INTERFACEDIR = ../../ # Rules for the different types of tests %.cpptest: @@ -72,7 +73,7 @@ run_testcase = \ (cd $* && $(COMPILETOOL) $(JAVAC) -classpath . *.java) && \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then ( \ $(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; # Clean: remove testcase directories diff --git a/Examples/test-suite/ruby/li_std_functors.i b/Examples/test-suite/li_std_functors.i similarity index 100% rename from Examples/test-suite/ruby/li_std_functors.i rename to Examples/test-suite/li_std_functors.i diff --git a/Examples/test-suite/perl5/li_std_list.i b/Examples/test-suite/li_std_list.i similarity index 100% rename from Examples/test-suite/perl5/li_std_list.i rename to Examples/test-suite/li_std_list.i diff --git a/Examples/test-suite/octave/li_std_pair.i b/Examples/test-suite/li_std_pair_extra.i similarity index 99% rename from Examples/test-suite/octave/li_std_pair.i rename to Examples/test-suite/li_std_pair_extra.i index 886bf1a4b..4e3b3a571 100644 --- a/Examples/test-suite/octave/li_std_pair.i +++ b/Examples/test-suite/li_std_pair_extra.i @@ -1,4 +1,4 @@ -%module li_std_pair +%module li_std_pair_extra // // activate the automatic comparison methods generation (==,!=,...) diff --git a/Examples/test-suite/ruby/li_std_pair_lang_object.i b/Examples/test-suite/li_std_pair_lang_object.i similarity index 100% rename from Examples/test-suite/ruby/li_std_pair_lang_object.i rename to Examples/test-suite/li_std_pair_lang_object.i diff --git a/Examples/test-suite/ruby/li_std_queue.i b/Examples/test-suite/li_std_queue.i similarity index 100% rename from Examples/test-suite/ruby/li_std_queue.i rename to Examples/test-suite/li_std_queue.i diff --git a/Examples/test-suite/ruby/li_std_stack.i b/Examples/test-suite/li_std_stack.i similarity index 100% rename from Examples/test-suite/ruby/li_std_stack.i rename to Examples/test-suite/li_std_stack.i diff --git a/Examples/test-suite/python/li_std_string.i b/Examples/test-suite/li_std_string_extra.i similarity index 93% rename from Examples/test-suite/python/li_std_string.i rename to Examples/test-suite/li_std_string_extra.i index 822d713c4..aa758532a 100644 --- a/Examples/test-suite/python/li_std_string.i +++ b/Examples/test-suite/li_std_string_extra.i @@ -1,4 +1,4 @@ -%module li_std_string +%module li_std_string_extra %naturalvar A; @@ -51,5 +51,5 @@ std::basic_string,std::allocator > test_value_ %} -%include ../li_std_string.i +%include "li_std_string.i" diff --git a/Examples/test-suite/octave/Makefile.in b/Examples/test-suite/octave/Makefile.in index 534da55c4..b12cf500a 100644 --- a/Examples/test-suite/octave/Makefile.in +++ b/Examples/test-suite/octave/Makefile.in @@ -10,7 +10,9 @@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ CPP_TEST_CASES += \ - cell_deref + li_std_pair_extra \ + li_std_string_extra \ + octave_cell_deref CPP_TEST_BROKEN += \ implicittest \ diff --git a/Examples/test-suite/octave/li_std_pair_extra_runme.m b/Examples/test-suite/octave/li_std_pair_extra_runme.m new file mode 100644 index 000000000..0f9e9a23d --- /dev/null +++ b/Examples/test-suite/octave/li_std_pair_extra_runme.m @@ -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()}); + diff --git a/Examples/test-suite/octave/li_std_pair_runme.m b/Examples/test-suite/octave/li_std_pair_runme.m deleted file mode 100644 index 83e9fe5b5..000000000 --- a/Examples/test-suite/octave/li_std_pair_runme.m +++ /dev/null @@ -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()}); - diff --git a/Examples/test-suite/octave/li_std_string.i b/Examples/test-suite/octave/li_std_string.i deleted file mode 100644 index 822d713c4..000000000 --- a/Examples/test-suite/octave/li_std_string.i +++ /dev/null @@ -1,55 +0,0 @@ -%module li_std_string - -%naturalvar A; - - -%include -%include - - -%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 test_value_basic1(std::basic_string x) { - return x; -} - -std::basic_string > test_value_basic2(std::basic_string > x) { - return x; -} - -std::basic_string,std::allocator > test_value_basic3(std::basic_string,std::allocator > x) { - return x; -} - -%} - -%include ../li_std_string.i - diff --git a/Examples/test-suite/octave/li_std_string_runme.m b/Examples/test-suite/octave/li_std_string_extra_runme.m similarity index 50% rename from Examples/test-suite/octave/li_std_string_runme.m rename to Examples/test-suite/octave/li_std_string_extra_runme.m index fa0e260e0..75cec17fe 100644 --- a/Examples/test-suite/octave/li_std_string_runme.m +++ b/Examples/test-suite/octave/li_std_string_extra_runme.m @@ -1,27 +1,27 @@ -li_std_string +li_std_string_extra x="hello"; -if (li_std_string.test_ccvalue(x) != x) +if (li_std_string_extra.test_ccvalue(x) != x) error("bad string mapping") endif -if (li_std_string.test_cvalue(x) != x) +if (li_std_string_extra.test_cvalue(x) != x) error("bad string mapping") endif -if (li_std_string.test_value(x) != x) - error("bad string mapping: %s, %s", x, li_std_string.test_value(x)) +if (li_std_string_extra.test_value(x) != x) + error("bad string mapping: %s, %s", x, li_std_string_extra.test_value(x)) endif -if (li_std_string.test_const_reference(x) != x) +if (li_std_string_extra.test_const_reference(x) != x) error("bad string mapping") endif -s = li_std_string.string("he"); +s = li_std_string_extra.string("he"); #s += "ll" #s.append('o') s = s + "llo"; @@ -34,25 +34,25 @@ if (s[1:4] != x[1:4]) error("bad string mapping") endif -if (li_std_string.test_value(s) != x) +if (li_std_string_extra.test_value(s) != x) error("bad string mapping") endif -if (li_std_string.test_const_reference(s) != x) +if (li_std_string_extra.test_const_reference(s) != x) error("bad string mapping") 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") endif -if (li_std_string.test_const_reference(a) != x) +if (li_std_string_extra.test_const_reference(a) != x) error("bad string mapping") endif -b = li_std_string.string(" world"); +b = li_std_string_extra.string(" world"); s = a + b; if (a + b != "hello world") @@ -74,48 +74,48 @@ endif 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") error("bad string mapping") endif -b.a = li_std_string.A("hello"); +b.a = li_std_string_extra.A("hello"); if (b.a != "hello") error("bad string mapping") endif -if (li_std_string.test_value_basic1(x) != x) +if (li_std_string_extra.test_value_basic1(x) != x) error("bad string mapping") endif -if (li_std_string.test_value_basic2(x) != x) +if (li_std_string_extra.test_value_basic2(x) != x) error("bad string mapping") endif -if (li_std_string.test_value_basic3(x) != x) +if (li_std_string_extra.test_value_basic3(x) != x) error("bad string mapping") endif # Global variables 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") endif -li_std_string.cvar.GlobalString2 = s; -if (li_std_string.cvar.GlobalString2 != s) +li_std_string_extra.cvar.GlobalString2 = s; +if (li_std_string_extra.cvar.GlobalString2 != s) error("GlobalString2 test 2") endif -if (li_std_string.cvar.ConstGlobalString != "const global string") +if (li_std_string_extra.cvar.ConstGlobalString != "const global string") error("ConstGlobalString test") endif # Member variables -myStructure = li_std_string.Structure(); +myStructure = li_std_string_extra.Structure(); if (myStructure.MemberString2 != "member string 2") error("MemberString2 test 1") endif @@ -127,36 +127,36 @@ if (myStructure.ConstMemberString != "const member string") error("ConstMemberString test") 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") endif -li_std_string.cvar.Structure_StaticMemberString2 = s; -if (li_std_string.cvar.Structure_StaticMemberString2 != s) +li_std_string_extra.cvar.Structure_StaticMemberString2 = s; +if (li_std_string_extra.cvar.Structure_StaticMemberString2 != s) error("StaticMemberString2 test 2") 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") endif -if (li_std_string.test_reference_input("hello") != "hello") +if (li_std_string_extra.test_reference_input("hello") != "hello") error endif -s = li_std_string.test_reference_inout("hello"); +s = li_std_string_extra.test_reference_inout("hello"); if (s != "hellohello") error endif -if (li_std_string.stdstring_empty() != "") +if (li_std_string_extra.stdstring_empty() != "") error endif -if (li_std_string.c_empty() != "") +if (li_std_string_extra.c_empty() != "") error endif -if (li_std_string.c_null() != None) +if (li_std_string_extra.c_null() != None) error endif diff --git a/Examples/test-suite/octave/cell_deref_runme.m b/Examples/test-suite/octave/octave_cell_deref_runme.m similarity index 85% rename from Examples/test-suite/octave/cell_deref_runme.m rename to Examples/test-suite/octave/octave_cell_deref_runme.m index 1c370fe85..5a98c0a3b 100644 --- a/Examples/test-suite/octave/cell_deref_runme.m +++ b/Examples/test-suite/octave/octave_cell_deref_runme.m @@ -1,4 +1,4 @@ -cell_deref; +octave_cell_deref; assert(func("hello")); assert(func({"hello"})); diff --git a/Examples/test-suite/octave/cell_deref.i b/Examples/test-suite/octave_cell_deref.i similarity index 86% rename from Examples/test-suite/octave/cell_deref.i rename to Examples/test-suite/octave_cell_deref.i index fddcd80ec..2e92ec4de 100644 --- a/Examples/test-suite/octave/cell_deref.i +++ b/Examples/test-suite/octave_cell_deref.i @@ -1,4 +1,4 @@ -%module cell_deref +%module octave_cell_deref %inline { bool func(const char* s) { diff --git a/Examples/test-suite/php/Makefile.in b/Examples/test-suite/php/Makefile.in index 8adb294ec..9f412bc56 100644 --- a/Examples/test-suite/php/Makefile.in +++ b/Examples/test-suite/php/Makefile.in @@ -8,6 +8,9 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ +#CPP_TEST_CASES += \ +# php_namewarn_rename \ + include $(srcdir)/../common.mk # Overridden variables here diff --git a/Examples/test-suite/php/namewarn_rename.i b/Examples/test-suite/php_namewarn_rename.i similarity index 81% rename from Examples/test-suite/php/namewarn_rename.i rename to Examples/test-suite/php_namewarn_rename.i index 98de311b9..87877c4f0 100644 --- a/Examples/test-suite/php/namewarn_rename.i +++ b/Examples/test-suite/php_namewarn_rename.i @@ -1,4 +1,4 @@ -%module namewarn_rename +%module php_namewarn_rename %inline %{ diff --git a/Examples/test-suite/python/Makefile.in b/Examples/test-suite/python/Makefile.in index 9026d0815..1fd2f4846 100644 --- a/Examples/test-suite/python/Makefile.in +++ b/Examples/test-suite/python/Makefile.in @@ -52,8 +52,10 @@ CPP_TEST_CASES += \ li_implicit \ li_std_vectora \ li_std_map \ + li_std_pair_extra \ li_std_set \ li_std_stream \ + li_std_string_extra \ li_std_wstream \ li_std_wstring \ nondynamic \ diff --git a/Examples/test-suite/python/implicittest.i b/Examples/test-suite/python/implicittest.i deleted file mode 100644 index 91205aafa..000000000 --- a/Examples/test-suite/python/implicittest.i +++ /dev/null @@ -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 - 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; diff --git a/Examples/test-suite/python/li_std_pair.i b/Examples/test-suite/python/li_std_pair.i deleted file mode 100644 index 886bf1a4b..000000000 --- a/Examples/test-suite/python/li_std_pair.i +++ /dev/null @@ -1,210 +0,0 @@ -%module li_std_pair - -// -// activate the automatic comparison methods generation (==,!=,...) -// - -%{ -#include // 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); - -namespace std { - %template(CIntPair) pair; - %template() pair; - %template(ShortPair) pair; - - %template(IntPair) pair; - %extend pair - { - %template(pair) pair; - } - - - - %template(SIPair) pair; - %template(CIPair) pair, int>; - %template(SIIPair) pair, int>; - %template(AIntPair) pair; - - %template(CCIntPair) pair >; - - %template(ABPair) pair; - %template(IntAPair) pair; - - %template(pairP1) pair; - %template(pairP2) pair; - %template(pairP3) pair; - %template(pairP4) pair; - %template(pairP5) pair; - %template(pairP6) pair; - -} -%std_comp_methods(std::pair, int>); - -%apply std::pair *INOUT {std::pair *INOUT2}; - -%inline %{ - -/* Test the "out" typemap for pair */ -std::pair 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 * makeIntPairPtr(int a, int b) { - static std::pair 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& makeIntPairRef(int a, int b) { - static std::pair 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 & makeIntPairConstRef(int a, int b) { - static std::pair p = std::make_pair(a, b); - return p; -} - -/* Test the "in" typemap for pair */ -int product1(std::pair p) { - return p.first*p.second; -} - -/* Test the "in" typemap for const pair& */ -int product2(const std::pair& p) { - return p.first*p.second; -} - -std::pair - p_ident(std::pair p, const std::pair& q) { - return p; -} - - -std::pair -p_identa(const std::pair& 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 *INOUT) { - std::swap(INOUT->first, INOUT->second); -} - -int -p_inout2(std::pair *INOUT) { - std::swap(INOUT->first, INOUT->second); - return 1; -} - -void - p_inout3(std::pair *INOUT, std::pair *INOUT2) { - std::swap(*INOUT, *INOUT2); -} - -void -p_inoutd(std::pair *INOUT) { - std::swap(INOUT->first, INOUT->second); -} - -std::string - s_ident(const std::string& s) { - return s; -} - -#if 0 -std::pair - p_ident(std::pair p, const std::pair& q) { - return p; -} - -/* Test the "in" typemap for const pair* */ -std::pair - p_ident(std::pair p, const std::pair& q) { - return q; -} - -/* Test the "in" typemap for const pair* */ -std::pair - p_ident(std::pair p, const std::pair& q) { - return p; -} - - -std::pair - p_ident(std::pair p, const std::pair& q) { - return p; -} - -std::pair - p_ident(std::pair p, const std::pair& q) { - return p; -} - - - -#endif -%} - - -namespace std -{ - %template(paircA1) pair; - %template(paircA2) pair; - %template(pairiiA) pair >; -} - diff --git a/Examples/test-suite/python/li_std_pair_extra_runme.py b/Examples/test-suite/python/li_std_pair_extra_runme.py new file mode 100644 index 000000000..dc6e31b76 --- /dev/null +++ b/Examples/test-suite/python/li_std_pair_extra_runme.py @@ -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) + diff --git a/Examples/test-suite/python/li_std_pair_runme.py b/Examples/test-suite/python/li_std_pair_runme.py deleted file mode 100644 index b301f0d24..000000000 --- a/Examples/test-suite/python/li_std_pair_runme.py +++ /dev/null @@ -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) - diff --git a/Examples/test-suite/python/li_std_string_runme.py b/Examples/test-suite/python/li_std_string_extra_runme.py similarity index 54% rename from Examples/test-suite/python/li_std_string_runme.py rename to Examples/test-suite/python/li_std_string_extra_runme.py index c0dae1e25..cef5921b0 100644 --- a/Examples/test-suite/python/li_std_string_runme.py +++ b/Examples/test-suite/python/li_std_string_extra_runme.py @@ -1,24 +1,24 @@ -import li_std_string +import li_std_string_extra x="hello" -if li_std_string.test_ccvalue(x) != x: +if li_std_string_extra.test_ccvalue(x) != x: 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" -if li_std_string.test_value(x) != x: - print x, li_std_string.test_value(x) +if li_std_string_extra.test_value(x) != x: + print x, li_std_string_extra.test_value(x) 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" -s = li_std_string.string("he") +s = li_std_string_extra.string("he") #s += "ll" #s.append('o') s = s + "llo" @@ -30,21 +30,21 @@ if s != x: if s[1:4] != x[1:4]: 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" -if li_std_string.test_const_reference(s) != x: +if li_std_string_extra.test_const_reference(s) != x: 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" -if li_std_string.test_const_reference(a) != x: +if li_std_string_extra.test_const_reference(a) != x: raise RuntimeError, "bad string mapping" -b = li_std_string.string(" world") +b = li_std_string_extra.string(" world") s = a + b if a + b != "hello world": @@ -63,40 +63,40 @@ if c.find_last_of("l") != 9: 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": raise RuntimeError, "bad string mapping" -b.a = li_std_string.A("hello") +b.a = li_std_string_extra.A("hello") if b.a != "hello": 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" -if li_std_string.test_value_basic2(x) != x: +if li_std_string_extra.test_value_basic2(x) != x: 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" # Global variables 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" -li_std_string.cvar.GlobalString2 = s -if li_std_string.cvar.GlobalString2 != s: +li_std_string_extra.cvar.GlobalString2 = s +if li_std_string_extra.cvar.GlobalString2 != s: 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" # Member variables -myStructure = li_std_string.Structure() +myStructure = li_std_string_extra.Structure() if myStructure.MemberString2 != "member string 2": raise RuntimeError, "MemberString2 test 1" myStructure.MemberString2 = s @@ -105,28 +105,28 @@ if myStructure.MemberString2 != s: if myStructure.ConstMemberString != "const member string": 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" -li_std_string.cvar.Structure_StaticMemberString2 = s -if li_std_string.cvar.Structure_StaticMemberString2 != s: +li_std_string_extra.cvar.Structure_StaticMemberString2 = s +if li_std_string_extra.cvar.Structure_StaticMemberString2 != s: 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" -if li_std_string.test_reference_input("hello") != "hello": +if li_std_string_extra.test_reference_input("hello") != "hello": raise RuntimeError -s = li_std_string.test_reference_inout("hello") +s = li_std_string_extra.test_reference_inout("hello") if s != "hellohello": raise RuntimeError -if li_std_string.stdstring_empty() != "": +if li_std_string_extra.stdstring_empty() != "": raise RuntimeError -if li_std_string.c_empty() != "": +if li_std_string_extra.c_empty() != "": raise RuntimeError -if li_std_string.c_null() != None: +if li_std_string_extra.c_null() != None: raise RuntimeError diff --git a/Examples/test-suite/r/Makefile.in b/Examples/test-suite/r/Makefile.in index 70dd62ec5..98d1f9571 100644 --- a/Examples/test-suite/r/Makefile.in +++ b/Examples/test-suite/r/Makefile.in @@ -10,8 +10,8 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ -C_TEST_CASES = copy_struct simple_array legacy -CPP_TEST_CASES = double_delete +C_TEST_CASES = r_copy_struct r_legacy +CPP_TEST_CASES = r_double_delete include $(srcdir)/../common.mk diff --git a/Examples/test-suite/r/double_delete_runme.R b/Examples/test-suite/r/double_delete_runme.R deleted file mode 100644 index 8ac6b4344..000000000 --- a/Examples/test-suite/r/double_delete_runme.R +++ /dev/null @@ -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); diff --git a/Examples/test-suite/r/copy_struct_runme.R b/Examples/test-suite/r/r_copy_struct_runme.R similarity index 89% rename from Examples/test-suite/r/copy_struct_runme.R rename to Examples/test-suite/r/r_copy_struct_runme.R index 523f1d680..ebf704004 100644 --- a/Examples/test-suite/r/copy_struct_runme.R +++ b/Examples/test-suite/r/r_copy_struct_runme.R @@ -1,6 +1,6 @@ source("unittest.R") -dyn.load(paste("copy_struct", .Platform$dynlib.ext, sep="")) -source("copy_struct.R") +dyn.load(paste("r_copy_struct", .Platform$dynlib.ext, sep="")) +source("r_copy_struct.R") cacheMetaData(1) a <- getA() diff --git a/Examples/test-suite/r/r_double_delete_runme.R b/Examples/test-suite/r/r_double_delete_runme.R new file mode 100644 index 000000000..7b6fdb77f --- /dev/null +++ b/Examples/test-suite/r/r_double_delete_runme.R @@ -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); diff --git a/Examples/test-suite/r/legacy_runme.R b/Examples/test-suite/r/r_legacy_runme.R similarity index 86% rename from Examples/test-suite/r/legacy_runme.R rename to Examples/test-suite/r/r_legacy_runme.R index a1466e4ce..7e5ade87f 100644 --- a/Examples/test-suite/r/legacy_runme.R +++ b/Examples/test-suite/r/r_legacy_runme.R @@ -1,6 +1,6 @@ source("unittest.R") -dyn.load(paste("legacy", .Platform$dynlib.ext, sep="")) -source("legacy.R") +dyn.load(paste("r_legacy", .Platform$dynlib.ext, sep="")) +source("r_legacy.R") cacheMetaData(1) obj <- getObject(1,3) diff --git a/Examples/test-suite/r/copy_struct.i b/Examples/test-suite/r_copy_struct.i similarity index 97% rename from Examples/test-suite/r/copy_struct.i rename to Examples/test-suite/r_copy_struct.i index db6223303..fda321afb 100644 --- a/Examples/test-suite/r/copy_struct.i +++ b/Examples/test-suite/r_copy_struct.i @@ -1,4 +1,4 @@ -%module copy_struct +%module r_copy_struct %feature("opaque", "yes") B; %feature("opaque", "yes") C; diff --git a/Examples/test-suite/r/double_delete.i b/Examples/test-suite/r_double_delete.i similarity index 67% rename from Examples/test-suite/r/double_delete.i rename to Examples/test-suite/r_double_delete.i index 4f2d1e0a2..9743d0454 100644 --- a/Examples/test-suite/r/double_delete.i +++ b/Examples/test-suite/r_double_delete.i @@ -1,5 +1,4 @@ -/* File : example.i */ -%module double_delete +%module r_double_delete %inline %{ diff --git a/Examples/test-suite/r/legacy.i b/Examples/test-suite/r_legacy.i similarity index 98% rename from Examples/test-suite/r/legacy.i rename to Examples/test-suite/r_legacy.i index 4e2080262..c89263082 100644 --- a/Examples/test-suite/r/legacy.i +++ b/Examples/test-suite/r_legacy.i @@ -1,4 +1,4 @@ -%module legacy +%module r_legacy %inline %{ typedef char *String; diff --git a/Examples/test-suite/ruby/Makefile.in b/Examples/test-suite/ruby/Makefile.in index 7339373fb..33395c006 100644 --- a/Examples/test-suite/ruby/Makefile.in +++ b/Examples/test-suite/ruby/Makefile.in @@ -10,7 +10,6 @@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ CPP_TEST_CASES = \ - keywords \ li_cdata \ li_cstring \ li_factory \ @@ -20,11 +19,14 @@ CPP_TEST_CASES = \ li_std_queue \ li_std_set \ li_std_stack \ - naming \ primitive_types \ - std_containers \ - track_objects \ - track_objects_directors + ruby_keywords \ + ruby_naming \ + ruby_track_objects \ + ruby_track_objects_directors \ + std_containers +# ruby_li_std_speed +# stl_new C_TEST_CASES += \ li_cdata \ @@ -39,7 +41,7 @@ SWIGOPT += -w801 -noautorename -features autodoc=4 # Rules for the different types of tests # make sure -autorename is true for the naming test -naming.cpptest: SWIGOPT = -autorename +ruby_naming.cpptest: SWIGOPT += -autorename %.cpptest: $(setup) diff --git a/Examples/test-suite/ruby/keywords_runme.rb b/Examples/test-suite/ruby/ruby_keywords_runme.rb similarity index 98% rename from Examples/test-suite/ruby/keywords_runme.rb rename to Examples/test-suite/ruby/ruby_keywords_runme.rb index cb8bd38bf..9b06ecf1d 100644 --- a/Examples/test-suite/ruby/keywords_runme.rb +++ b/Examples/test-suite/ruby/ruby_keywords_runme.rb @@ -9,9 +9,9 @@ require 'swig_assert' -require 'keywords' +require 'ruby_keywords' -kw = Keywords::Keywords.new +kw = Ruby_keywords::Keywords.new if kw.alias != 'alias' then raise RuntimeError, 'Keyword method did not work: alias' diff --git a/Examples/test-suite/ruby/li_std_speed_runme.rb b/Examples/test-suite/ruby/ruby_li_std_speed_runme.rb similarity index 97% rename from Examples/test-suite/ruby/li_std_speed_runme.rb rename to Examples/test-suite/ruby/ruby_li_std_speed_runme.rb index a67e618a3..825f3c593 100755 --- a/Examples/test-suite/ruby/li_std_speed_runme.rb +++ b/Examples/test-suite/ruby/ruby_li_std_speed_runme.rb @@ -10,8 +10,8 @@ require 'benchmark' require 'mathn' -require 'li_std_speed' -include Li_std_speed +require 'ruby_li_std_speed' +include Ruby_li_std_speed def benchmark(f, phigh, sequences) diff --git a/Examples/test-suite/ruby/naming_runme.rb b/Examples/test-suite/ruby/ruby_naming_runme.rb similarity index 68% rename from Examples/test-suite/ruby/naming_runme.rb rename to Examples/test-suite/ruby/ruby_naming_runme.rb index dab3a50b6..8ea5f13d3 100644 --- a/Examples/test-suite/ruby/naming_runme.rb +++ b/Examples/test-suite/ruby/ruby_naming_runme.rb @@ -9,86 +9,86 @@ require 'swig_assert' -require 'naming' +require 'ruby_naming' # Check class names -if not Naming - raise RuntimeError, 'Invalid module name for Naming' +if not Ruby_naming + raise RuntimeError, 'Invalid module name for Ruby_naming' end -if not Naming::MyClass +if not Ruby_naming::MyClass raise RuntimeError, 'Invalid class name for MyClass' end # Check constant names / values -if Naming::CONSTANT1 != 1 +if Ruby_naming::CONSTANT1 != 1 raise RuntimeError, "Incorrect value for CONSTANT1" end -if Naming::CONSTANT2 != 2 +if Ruby_naming::CONSTANT2 != 2 raise RuntimeError, "Incorrect value for CONSTANT2" end # Check constant names / values -if Naming::CONSTANT3 != 3 +if Ruby_naming::CONSTANT3 != 3 raise RuntimeError, "Incorrect value for CONSTANT3" end -if not Naming::methods.include?("constant4") +if not Ruby_naming::methods.include?("constant4") raise RuntimeError, "Incorrect mapping for constant4" end -if not Naming::methods.include?("constant5") +if not Ruby_naming::methods.include?("constant5") raise RuntimeError, "Incorrect mapping for constant5" end -if not Naming::methods.include?("constant6") +if not Ruby_naming::methods.include?("constant6") raise RuntimeError, "Incorrect mapping for constant6" end -if not Naming::TestConstants.instance_methods.include?("constant7") +if not Ruby_naming::TestConstants.instance_methods.include?("constant7") raise RuntimeError, "Incorrect mapping for constant7" end -if not Naming::TestConstants.methods.include?("constant8") +if not Ruby_naming::TestConstants.methods.include?("constant8") raise RuntimeError, "Incorrect mapping for constant8" end # 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" #end -if Naming::TestConstants::CONSTANT10 != 10 +if Ruby_naming::TestConstants::CONSTANT10 != 10 raise RuntimeError, "Incorrect value for CONSTANT10" end -if not Naming::methods.include?("constant11") +if not Ruby_naming::methods.include?("constant11") raise RuntimeError, "Incorrect mapping for constant11" end # Check enums -if Naming::constants.include?("Color") +if Ruby_naming::constants.include?("Color") raise RuntimeError, "Color enum should not be exposed to Ruby" end -if Naming::Red != 0 +if Ruby_naming::Red != 0 raise RuntimeError, "Incorrect value for enum RED" end -if Naming::Green != 1 +if Ruby_naming::Green != 1 raise RuntimeError, "Incorrect value for enum GREEN" end -if Naming::Blue != 2 +if Ruby_naming::Blue != 2 raise RuntimeError, "Incorrect value for enum BLUE" end # Check method names -my_class = Naming::MyClass.new() +my_class = Ruby_naming::MyClass.new() if my_class.method_one != 1 raise RuntimeError, "Incorrect value for method_one" diff --git a/Examples/test-suite/ruby/track_objects_directors_runme.rb b/Examples/test-suite/ruby/ruby_track_objects_directors_runme.rb similarity index 74% rename from Examples/test-suite/ruby/track_objects_directors_runme.rb rename to Examples/test-suite/ruby/ruby_track_objects_directors_runme.rb index 247d3e98b..fb55323a8 100644 --- a/Examples/test-suite/ruby/track_objects_directors_runme.rb +++ b/Examples/test-suite/ruby/ruby_track_objects_directors_runme.rb @@ -9,9 +9,9 @@ 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 "MyFoo::ping()" end @@ -22,12 +22,12 @@ a = MyFoo.new raise RuntimeError if a.ping != "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.pong != "Foo::pong();Foo::ping()" -container = Track_objects_directors::Container.new +container = Ruby_track_objects_directors::Container.new foo = MyFoo.new container.set_foo(foo) diff --git a/Examples/test-suite/ruby/track_objects_runme.rb b/Examples/test-suite/ruby/ruby_track_objects_runme.rb similarity index 78% rename from Examples/test-suite/ruby/track_objects_runme.rb rename to Examples/test-suite/ruby/ruby_track_objects_runme.rb index 27d8f6da7..7bc67a478 100644 --- a/Examples/test-suite/ruby/track_objects_runme.rb +++ b/Examples/test-suite/ruby/ruby_track_objects_runme.rb @@ -9,7 +9,7 @@ require 'swig_assert' -require 'track_objects' +require 'ruby_track_objects' def test_same_ruby_object(foo1, foo2) if not foo1.equal?(foo2) @@ -23,12 +23,12 @@ def test_same_cpp_object(foo1, foo2) end end -bar = Track_objects::Bar.new -foo1 = Track_objects::Foo.new() +bar = Ruby_track_objects::Bar.new +foo1 = Ruby_track_objects::Foo.new() bar.set_unowned_foo(foo1) # test_simple_identity -foo2 = Track_objects::Foo.new() +foo2 = Ruby_track_objects::Foo.new() foo3 = foo2 test_same_ruby_object(foo2, foo3) @@ -48,8 +48,8 @@ test_same_ruby_object(foo5, foo6) test_same_cpp_object(foo5, foo6) # test_new_foo_identity -foo7 = Track_objects::Bar.get_new_foo() -foo8 = Track_objects::Bar.get_new_foo() +foo7 = Ruby_track_objects::Bar.get_new_foo() +foo8 = Ruby_track_objects::Bar.get_new_foo() if foo7.equal?(foo8) raise "Ruby objects should be different." @@ -60,7 +60,7 @@ if foo7.cpp_equal(foo8) end # test_set_owned_identity -foo9 = Track_objects::Foo.new +foo9 = Ruby_track_objects::Foo.new bar.set_owned_foo(foo9) foo10 = bar.get_owned_foo() @@ -69,7 +69,7 @@ test_same_cpp_object(foo9, foo10) # test_set_owned_identity2 begin - foo11 = Track_objects::Foo.new + foo11 = Ruby_track_objects::Foo.new bar.set_owned_foo(foo11) foo11 = nil end @@ -90,20 +90,20 @@ test_same_ruby_object(foo13, foo14) test_same_cpp_object(foo13, foo14) # Now create the factory -factory = Track_objects::Factory.new +factory = Ruby_track_objects::Factory.new # Create itemA which is really an itemB itemA = factory.createItem # Check class -if itemA.class != Track_objects::ItemA +if itemA.class != Ruby_track_objects::ItemA raise RuntimeError, 'Item should have an ItemA class' end # 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' end diff --git a/Examples/test-suite/ruby/keywords.i b/Examples/test-suite/ruby_keywords.i similarity index 98% rename from Examples/test-suite/ruby/keywords.i rename to Examples/test-suite/ruby_keywords.i index eb91b4ffa..c87efab33 100644 --- a/Examples/test-suite/ruby/keywords.i +++ b/Examples/test-suite/ruby_keywords.i @@ -1,4 +1,4 @@ -%module keywords +%module ruby_keywords // fix up conflicts with C++ keywords %rename("and") Keywords::and_; diff --git a/Examples/test-suite/ruby/li_std_speed.i b/Examples/test-suite/ruby_li_std_speed.i similarity index 90% rename from Examples/test-suite/ruby/li_std_speed.i rename to Examples/test-suite/ruby_li_std_speed.i index 0dad81690..3c8e60643 100644 --- a/Examples/test-suite/ruby/li_std_speed.i +++ b/Examples/test-suite/ruby_li_std_speed.i @@ -1,5 +1,5 @@ /** - * @file li_std_speed.i + * @file ruby_li_std_speed.i * @author gga * @date Fri May 18 18:03:15 2007 * @@ -8,7 +8,7 @@ * */ -%module li_std_speed +%module ruby_li_std_speed %include %include diff --git a/Examples/test-suite/ruby/naming.i b/Examples/test-suite/ruby_naming.i similarity index 98% rename from Examples/test-suite/ruby/naming.i rename to Examples/test-suite/ruby_naming.i index 75500ae34..d8ef50ad3 100644 --- a/Examples/test-suite/ruby/naming.i +++ b/Examples/test-suite/ruby_naming.i @@ -1,4 +1,4 @@ -%module naming +%module ruby_naming %predicate predicateMethod(); %bang bangMethod(); diff --git a/Examples/test-suite/ruby/track_objects.i b/Examples/test-suite/ruby_track_objects.i similarity index 98% rename from Examples/test-suite/ruby/track_objects.i rename to Examples/test-suite/ruby_track_objects.i index 0a50e1fad..f4bbb37e7 100644 --- a/Examples/test-suite/ruby/track_objects.i +++ b/Examples/test-suite/ruby_track_objects.i @@ -1,4 +1,4 @@ -%module track_objects +%module ruby_track_objects %include typemaps.i diff --git a/Examples/test-suite/ruby/track_objects_directors.i b/Examples/test-suite/ruby_track_objects_directors.i similarity index 88% rename from Examples/test-suite/ruby/track_objects_directors.i rename to Examples/test-suite/ruby_track_objects_directors.i index adac8ae4d..131209828 100644 --- a/Examples/test-suite/ruby/track_objects_directors.i +++ b/Examples/test-suite/ruby_track_objects_directors.i @@ -1,4 +1,4 @@ -%module(directors="1") track_objects_directors +%module(directors="1") ruby_track_objects_directors %{ #include diff --git a/Examples/test-suite/r/simple_array.i b/Examples/test-suite/simple_array.i similarity index 100% rename from Examples/test-suite/r/simple_array.i rename to Examples/test-suite/simple_array.i diff --git a/Examples/test-suite/ruby/stl_new.i b/Examples/test-suite/stl_new.i similarity index 100% rename from Examples/test-suite/ruby/stl_new.i rename to Examples/test-suite/stl_new.i diff --git a/Examples/test-suite/tcl/Makefile.in b/Examples/test-suite/tcl/Makefile.in index e26d77582..7c4b7ed61 100644 --- a/Examples/test-suite/tcl/Makefile.in +++ b/Examples/test-suite/tcl/Makefile.in @@ -11,15 +11,12 @@ top_builddir = @top_builddir@ CPP_TEST_CASES += \ primitive_types \ - li_cdata \ li_cstring \ li_cwstring C_TEST_CASES += \ - li_cdata \ li_cstring \ - li_cwstring \ - union + li_cwstring include $(srcdir)/../common.mk diff --git a/Examples/test-suite/tcl/union_runme.tcl b/Examples/test-suite/tcl/union_runme.tcl old mode 100755 new mode 100644 diff --git a/Examples/test-suite/tcl/union.i b/Examples/test-suite/union.i similarity index 100% rename from Examples/test-suite/tcl/union.i rename to Examples/test-suite/union.i